diff --git a/silk/CNG.c b/silk/CNG.c
index 701b36a38a3105dfa48dcbc54e881e49be199ff6..d140db7d47309333f2461d4eb068508e48d81967 100644
--- a/silk/CNG.c
+++ b/silk/CNG.c
@@ -138,7 +138,7 @@ void silk_CNG(
             gain_Q16 = silk_LSHIFT32( silk_SQRT_APPROX( gain_Q16 ), 8 );
         }
         gain_Q10 = silk_RSHIFT( gain_Q16, 6 );
-        
+
         silk_CNG_exc( CNG_sig_Q14 + MAX_LPC_ORDER, psCNG->CNG_exc_buf_Q14, length, &psCNG->rand_seed );
 
         /* Convert CNG NLSF to filter representation */
@@ -171,10 +171,10 @@ void silk_CNG(
 
             /* Update states */
             CNG_sig_Q14[ MAX_LPC_ORDER + i ] = silk_ADD_SAT32( CNG_sig_Q14[ MAX_LPC_ORDER + i ], silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ) );
-            
+
             /* Scale with Gain and add to input signal */
             frame[ i ] = (opus_int16)silk_ADD_SAT16( frame[ i ], silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( CNG_sig_Q14[ MAX_LPC_ORDER + i ], gain_Q10 ), 8 ) ) );
-            
+
         }
         silk_memcpy( psCNG->CNG_synth_state, &CNG_sig_Q14[ length ], MAX_LPC_ORDER * sizeof( opus_int32 ) );
     } else {
diff --git a/silk/fixed/noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c
index 5d48458214978e2943cce781df69c0faae8cc0f5..8fe23777f6d60f50b4ed8b061c15fff9083c887d 100644
--- a/silk/fixed/noise_shape_analysis_FIX.c
+++ b/silk/fixed/noise_shape_analysis_FIX.c
@@ -299,7 +299,7 @@ void silk_noise_shape_analysis_FIX(
             gain_mult_Q16 = warped_gain( AR_Q24, warping_Q16, psEnc->sCmn.shapingLPCOrder );
             silk_assert( psEncCtrl->Gains_Q16[ k ] > 0 );
             if( psEncCtrl->Gains_Q16[ k ] < SILK_FIX_CONST( 0.25, 16 ) ) {
-                psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( psEncCtrl->Gains_Q16[ k ], gain_mult_Q16 ); 
+                psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( psEncCtrl->Gains_Q16[ k ], gain_mult_Q16 );
             } else {
                 psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( silk_RSHIFT_ROUND( psEncCtrl->Gains_Q16[ k ], 1 ), gain_mult_Q16 );
                 if ( psEncCtrl->Gains_Q16[ k ] >= ( silk_int32_MAX >> 1 ) ) {
diff --git a/tests/opus_encode_regressions.c b/tests/opus_encode_regressions.c
index aaeaf1e85465f9024eb33a75ee6ea41d17728eb5..aad9bf575aae6b8d6878bcad514f5645d9762072 100644
--- a/tests/opus_encode_regressions.c
+++ b/tests/opus_encode_regressions.c
@@ -66,7 +66,7 @@ static int celt_ec_internal_error(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(0));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(OPUS_AUTO));
     {
-        static const short pcm[320] = 
+        static const short pcm[320] =
         {
                  0,     0,     0,     0,     0,     0,     0,     0,     0,
                  0,     0,     0,     0,     0,     0,  1792,  1799,  1799,
@@ -122,7 +122,7 @@ static int celt_ec_internal_error(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
     {
-        static const short pcm[160] = 
+        static const short pcm[160] =
         {
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
              -9510, -9510, -9510, -9510, -9510, -9510, -9526, -9510, -9510,
@@ -160,7 +160,7 @@ static int celt_ec_internal_error(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
     {
-        static const short pcm[160] = 
+        static const short pcm[160] =
         {
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
@@ -198,7 +198,7 @@ static int celt_ec_internal_error(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
     {
-        static const short pcm[160] = 
+        static const short pcm[160] =
         {
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
@@ -236,7 +236,7 @@ static int celt_ec_internal_error(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
     {
-        static const short pcm[160] = 
+        static const short pcm[160] =
         {
              -9510, -9510,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
               1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,     0,
@@ -272,7 +272,7 @@ static int celt_ec_internal_error(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(41));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(21425));
     {
-        static const short pcm[40] = 
+        static const short pcm[40] =
         {
              10459, -6474, 10204, -6539, 11601, -6824, 13385, -7142, 13872,
             -11553, 13670, -7725, 13463, -6887, 12482, -5580, 12600, -4964,
@@ -329,7 +329,7 @@ static int mscbr_encode_fail10(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(57));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(3642675));
     {
-        static const short pcm[20*255] = 
+        static const short pcm[20*255] =
         {
                  0
         };
@@ -379,7 +379,7 @@ static int mscbr_encode_fail(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(0));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(15360));
     {
-        static const short pcm[20*192] = 
+        static const short pcm[20*192] =
         {
                  0
         };
@@ -416,7 +416,7 @@ static int surround_analysis_uninit(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(84315));
     {
-        static const short pcm[960*3] = 
+        static const short pcm[960*3] =
         {
              -6896,  4901, -6158,  4120, -5164,  3631, -4442,  3153, -4070,
               3349, -4577,  4474, -5541,  5058, -6701,  3881, -7933,  1863,
@@ -757,7 +757,7 @@ static int surround_analysis_uninit(void)
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(5));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(775410));
     {
-        static const short pcm[1440*3] = 
+        static const short pcm[1440*3] =
         {
              30449, 15083, 14088, 31205,-18678,-12830, 14090,-26138,-25337,
             -11541, -3254, 27628,-22270, 30953,-16136,-30745, 20991,-17406,
@@ -898,7 +898,7 @@ static int ec_enc_shrink_assert(void)
     int data_len;
     unsigned char data[2000];
     static const short pcm1[960] = { 5140 };
-    static const short pcm2[2880] = 
+    static const short pcm2[2880] =
     {
           -256,-12033,     0, -2817,  6912,     0, -5359,  5200,  3061,
              0, -2903,  5652, -1281,-24656,-14433,-24678,    32,-29793,