diff --git a/apps/decoder.c b/apps/decoder.c
index abe1788de16d61dc209a7089917454c7fba9294a..dc1cc25b35998a1f38f62f7481e0d28083441758 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -54,7 +54,7 @@
  * Local constants
  *------------------------------------------------------------------------------------------*/
 
-#if !defined( WMOPS_FLT )
+#if !defined( DEBUGGING ) && !defined( WMOPS_FLT )
 static
 #endif
     int32_t frame = 0; /* Counter of frames */
diff --git a/apps/encoder.c b/apps/encoder.c
index c8e6f32d6ae201196a0fe7e9deb3d9e45f672d77..283f1626a57fbfd0f2c159cf7fb73616e39eddbf 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -48,7 +48,7 @@
  * Local constants, enums
  *------------------------------------------------------------------------------------------*/
 
-#if !defined( WMOPS )
+#if !defined( DEBUGGING ) && !defined( WMOPS )
 static
 #endif
     int32_t frame = 0; /* Counter of frames */
diff --git a/apps/renderer.c b/apps/renderer.c
index 5f39dc4e60c663e70d440993ed4ce94560933b75..1cc4c1a321cc59149a23d78cdd4a426f84826df9 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -67,7 +67,7 @@
 #define IVAS_MIN16B_FLT ( -32768.0f )
 #define IVAS_MAX16B_FX  32767
 #define IVAS_MIN16B_FX  ( -32768 )
-#if !defined( WMOPS )
+#if !defined( DEBUGGING ) && !defined( WMOPS )
 static
 #endif
     int32_t frame = 0;
diff --git a/lib_com/bits_alloc_fx.c b/lib_com/bits_alloc_fx.c
index 514a9f894b77eb32b33951070a88e105c4019ad8..c8d9fc7e2615a6b037b00d66ab4e08619a8feba6 100644
--- a/lib_com/bits_alloc_fx.c
+++ b/lib_com/bits_alloc_fx.c
@@ -615,6 +615,7 @@ ivas_error config_acelp1(
     Word32 core_brate_inpI = core_brate_inp;
 #ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) active_cnt;
+    (void) core_brate_inpI;
 #endif
 #endif
     ivas_error error;
diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c
index b678a90f8de331f2117d8884cfe9ee4aa51fced3..3f345bc5f2affdf9e4d050b84f1b87c90e64a5ec 100644
--- a/lib_rend/ivas_crend.c
+++ b/lib_rend/ivas_crend.c
@@ -3161,7 +3161,7 @@ static ivas_error ivas_rend_crendConvolver(
 
 
             ivas_mdft_fx( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
             dbgwrite_txt( pFreq_buf_re, subframe_length, "Fixed_pFreq_buf_re_mdft.txt", NULL );
             dbgwrite_txt( pFreq_buf_im, subframe_length, "Fixed_pFreq_buf_im_mdft.txt", NULL );
 #endif
@@ -3223,7 +3223,7 @@ static ivas_error ivas_rend_crendConvolver(
 
         ivas_imdft_fx( tmp_out_re, tmp_out_im, pOut, subframe_length );
 
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
         dbgwrite_txt( pOut, subframe_length << 1, "Fixed_imdft_out.txt", NULL );
 #endif
         pFreq_buf_re = &pcm_out[j][i_ts * subframe_length];
diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c
index be96d186f7f3f3b7066d72dadf67451847eba28f..23290c3de048b188456206998552c12da163f2bc 100644
--- a/lib_rend/ivas_rotation.c
+++ b/lib_rend/ivas_rotation.c
@@ -1385,7 +1385,7 @@ void rotateFrame_shd_cldfb(
     /* calculate Ambisonics rotation matrix from the quaternion */
     SHrotmatgen_fx( SHrotmat, Rmat, shd_rot_max_order );
 
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
     dbgwrite_txt( SHrotmat, HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM, "Fixed_SHrotmat.txt", NULL );
 #endif
     /* rotation by mtx multiplication */
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index 63c64149ec63cb078c493ba215a5348f1fe8d44b..e0c8abd7606cad2d9bf0ff86b9b972e6a1c3ba09 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -8775,7 +8775,7 @@ static ivas_error rotateFrameSba_fx(
         /* calculate ambisonics rotation matrices for the previous and current frames */
         SHrotmatgen_fx( gains, Rmat, shd_rot_max_order );
 
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
         dbgwrite_txt( gains, HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM, "Fixed_code_gains.txt", NULL );
         dbgwrite_txt( Rmat, 3 * 3, "Fixed_code_Rmat.txt", NULL );
 #endif