diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1dcdb28..154a203 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,9 +30,9 @@ 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)
-#endforeach()
+foreach(CODEC2_FILE IN LISTS codec2_import_srcs)
+    set_source_files_properties(${CODEC2_FILE} PROPERTIES COMPILE_FLAGS -fvisibility=hidden)
+endforeach()
 
 add_library(lpcnetfreedv SHARED ${lpcnet_freedv_srcs} ${codec2_import_srcs})
 set_target_properties(lpcnetfreedv PROPERTIES
diff --git a/src/codec2_pitch.c b/src/codec2_pitch.c
index beeb0d9..0792915 100644
--- a/src/codec2_pitch.c
+++ b/src/codec2_pitch.c
@@ -14,13 +14,13 @@
 #include <string.h>
 #include <math.h>
 
+#include "from_codec2/codec2_renames.h"
+
 #include "codec2_pitch.h"
 #include "codec2_kiss_fft.h"
 
-#pragma GCC visibility push(hidden)
 #include "from_codec2/sine.h"
 #include "from_codec2/nlp.h"
-#pragma GCC visibility pop
 
 #define FFT_ENC    512		/* size of FFT used for encoder         */
 #define P_MAX_S    0.0200	/* maximum pitch period in s            */
diff --git a/src/from_codec2/codec2_fft.c b/src/from_codec2/codec2_fft.c
index 841b913..efa2fe5 100644
--- a/src/from_codec2/codec2_fft.c
+++ b/src/from_codec2/codec2_fft.c
@@ -5,6 +5,7 @@
  *      Author: danilo
  */
 
+#include "codec2_renames.h"
 #include "codec2_fft.h"
 
 #include "debug_alloc.h"
diff --git a/src/from_codec2/kiss_fft.c b/src/from_codec2/kiss_fft.c
index a996095..b2404f7 100644
--- a/src/from_codec2/kiss_fft.c
+++ b/src/from_codec2/kiss_fft.c
@@ -12,7 +12,7 @@ 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.
diff --git a/src/from_codec2/kiss_fftr.c b/src/from_codec2/kiss_fftr.c
index 7cc0286..4674089 100644
--- a/src/from_codec2/kiss_fftr.c
+++ b/src/from_codec2/kiss_fftr.c
@@ -12,6 +12,7 @@ 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"
diff --git a/src/from_codec2/nlp.c b/src/from_codec2/nlp.c
index 036f6be..50764c9 100644
--- a/src/from_codec2/nlp.c
+++ b/src/from_codec2/nlp.c
@@ -25,6 +25,7 @@
   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"
diff --git a/src/from_codec2/sine.c b/src/from_codec2/sine.c
index a5295a7..49ed15f 100644
--- a/src/from_codec2/sine.c
+++ b/src/from_codec2/sine.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <math.h>
 
+#include "codec2_renames.h"
 #include "defines.h"
 #include "sine.h"
 #include "kiss_fft.h"