Include the renames at the CMake level.

src/CMakeLists.txt

@@ -31,7 +31,7 @@ set(lpcnet_freedv_srcs
 # Set visibility of files brought in from Codec2 so that they're not visible to 
 # users (such as Codec2 itself).
 foreach(CODEC2_FILE IN LISTS codec2_import_srcs)
-    set_source_files_properties(${CODEC2_FILE} PROPERTIES COMPILE_FLAGS -fvisibility=hidden)
+    set_source_files_properties(${CODEC2_FILE} PROPERTIES COMPILE_FLAGS "-fvisibility=hidden -include ${CMAKE_CURRENT_SOURCE_DIR}/from_codec2/codec2_renames.h")
 endforeach()
 
 add_library(lpcnetfreedv SHARED ${lpcnet_freedv_srcs} ${codec2_import_srcs})

src/from_codec2/codec2_fft.c

@@ -5,7 +5,6 @@
  *      Author: danilo
  */
 
-#include "codec2_renames.h"
 #include "codec2_fft.h"
 
 #include "debug_alloc.h"

src/from_codec2/codec2_renames.h

@@ -49,4 +49,4 @@
 #define synthesise __codec2__synthesise
 #define codec2_rand __codec2__codec2_rand
 
-#endif /* CODEC2_RENAMES_H */
+#endif /* CODEC2_RENAMES_H */

src/from_codec2/kiss_fft.c

@@ -12,7 +12,6 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "codec2_renames.h"
 #include "_kiss_fft_guts.h"
 /* The guts header contains all the multiplication and addition macros that are defined for
  fixed or floating point complex numbers.  It also declares the kf_ internal functions.

src/from_codec2/kiss_fftr.c

@@ -12,7 +12,6 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "codec2_renames.h"
 #include "kiss_fftr.h"
 #include "_kiss_fft_guts.h"
 #include "assert.h"

src/from_codec2/nlp.c

@@ -25,7 +25,6 @@
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "codec2_renames.h"
 #include "defines.h"
 #include "nlp.h"
 #include "dump.h"

src/from_codec2/sine.c

@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "codec2_renames.h"
 #include "defines.h"
 #include "sine.h"
 #include "kiss_fft.h"