Removed all the silk_ prefixes in source file names (not symbols)

silk/A2NLSF.c

@@ -35,8 +35,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
-#include "silk_tables.h"
+#include "SigProc_FIX.h"
+#include "tables.h"
 
 /* Number of binary divisions, when not in low complexity mode */
 #define BIN_DIV_STEPS_A2NLSF_FIX      3 /* must be no higher than 16 - log2( LSF_COS_TAB_SZ_FIX ) */

silk/API.h

@@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_API_H
 #define SILK_API_H
 
-#include "silk_control.h"
-#include "silk_typedef.h"
-#include "silk_errors.h"
+#include "control.h"
+#include "typedef.h"
+#include "errors.h"
 #include "entenc.h"
 #include "entdec.h"
 

silk/CNG.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Generates excitation for CNG LPC synthesis */
 static inline void silk_CNG_exc(

silk/HP_variable_cutoff.c

@@ -29,11 +29,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 #ifdef FIXED_POINT
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 #else
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 #endif
-#include "silk_tuning_parameters.h"
+#include "tuning_parameters.h"
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
 void silk_HP_variable_cutoff(

silk/LPC_analysis_filter.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /*******************************************/
 /* LPC analysis filter                     */

silk/LPC_inv_pred_gain.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 #define QA          16
 #define A_LIMIT     SILK_FIX_CONST( 0.99975, QA )

silk/LP_variable_cutoff.c

@@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         [0.95 : 0.15 : 0.35] normalized cut off frequencies.
 
 */
-#include "silk_main.h"
+#include "main.h"
 
 /* Helper function, interpolates the filter taps */
 static inline void silk_LP_interpolate_filter_taps(

silk/NLSF2A.c

@@ -35,8 +35,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* therefore the result is not accurate LSFs, but the two       */
 /* functions are accurate inverses of each other                */
 
-#include "silk_SigProc_FIX.h"
-#include "silk_tables.h"
+#include "SigProc_FIX.h"
+#include "tables.h"
 
 #define QA      16
 

silk/NLSF_VQ.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
 void silk_NLSF_VQ(

silk/NLSF_VQ_weights_laroia.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_define.h"
-#include "silk_SigProc_FIX.h"
+#include "define.h"
+#include "SigProc_FIX.h"
 
 /*
 R. Laroia, N. Phamdo and N. Farvardin, "Robust and Efficient Quantization of Speech LSP

silk/NLSF_decode.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Predictive dequantizer for NLSF residuals */
 void silk_NLSF_residual_dequant(                            /* O    Returns RD value in Q30                     */

silk/NLSF_del_dec_quant.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Delayed-decision quantizer for NLSF residuals */
 opus_int32 silk_NLSF_del_dec_quant(                      /* O    Returns RD value in Q25                     */

silk/NLSF_encode.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 #define STORE_LSF_DATA_FOR_TRAINING          0
 

silk/NLSF_stabilize.c

@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* - Output are sorted NLSF coefficients                    */
 /*                                                          */
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Constant Definitions */
 #define MAX_LOOPS        20

silk/NLSF_unpack.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Unpack predictor values and indices for entropy coding tables */
 void silk_NLSF_unpack(

silk/NSQ.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 static inline void silk_nsq_scale_states(
     const silk_encoder_state *psEncC,       /* I    Encoder State                   */

silk/NSQ_del_dec.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 typedef struct {
     opus_int32 sLPC_Q14[ MAX_FRAME_LENGTH / MAX_NB_SUBFR + NSQ_LPC_BUF_LENGTH ];

silk/PLC.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
-#include "silk_PLC.h"
+#include "main.h"
+#include "PLC.h"
 
 #define NB_ATT 2
 static const opus_int16 HARM_ATT_Q15[NB_ATT]              = { 32440, 31130 }; /* 0.99, 0.95 */

silk/PLC.h

@@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_PLC_FIX_H
 #define SILK_PLC_FIX_H
 
-#include "silk_main.h"
+#include "main.h"
 
 #define BWE_COEF                        0.99
 #define V_PITCH_GAIN_START_MIN_Q14      11469           /* 0.7 in Q14                       */

silk/SigProc_FIX.h

@@ -39,9 +39,9 @@ extern "C"
 
 #include <stdlib.h>                                             /* for abs() */
 #include <string.h>                                             /* for memset(), memcpy(), memmove() */
-#include "silk_typedef.h"
-#include "silk_resampler_structs.h"
-#include "silk_macros.h"
+#include "typedef.h"
+#include "resampler_structs.h"
+#include "macros.h"
 
 
 /********************************************************************/
@@ -609,9 +609,9 @@ static inline opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
 /* the following seems faster on x86 */
 #define silk_SMMUL(a32, b32)              (opus_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32)
 
-#include "silk_Inlines.h"
-#include "silk_MacroCount.h"
-#include "silk_MacroDebug.h"
+#include "Inlines.h"
+#include "MacroCount.h"
+#include "MacroDebug.h"
 
 #ifdef  __cplusplus
 }

silk/VAD.c

@@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <stdlib.h>
-#include "silk_main.h"
+#include "main.h"
 
 /**********************************/
 /* Initialization of the Silk VAD */

silk/VQ_WMat_EC.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
 void silk_VQ_WMat_EC(

silk/ana_filt_bank_1.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Coefficients for 2-band filter bank based on first-order allpass filters */
 /* old*/

silk/apply_sine_window.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Apply sine window to signal vector.                                      */
 /* Window types:                                                            */

silk/array_maxabs.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Function that returns the maximum absolut value of the input vector */
 opus_int16 silk_int16_array_maxabs(          /* O    Maximum absolute value, max: 2^15-1   */

silk/autocorr.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Compute autocorrelation */
 void silk_autocorr(

silk/biquad_alt.c

@@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 
 /* Second order ARMA filter, alternative implementation */

silk/burg_modified.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 #define MAX_FRAME_SIZE              384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/
 #define MAX_NB_SUBFR                4

silk/bwexpander.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander(

silk/bwexpander_32.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander_32(

silk/check_control_input.c

@@ -29,9 +29,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
-#include "silk_control.h"
-#include "silk_errors.h"
+#include "main.h"
+#include "control.h"
+#include "errors.h"
 
 /* Check encoder control struct */
 opus_int check_control_input(

silk/code_signs.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /*#define silk_enc_map(a)                ((a) > 0 ? 1 : 0)*/
 /*#define silk_dec_map(a)                ((a) > 0 ? 1 : -1)*/

silk/control.h

@@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_CONTROL_H
 #define SILK_CONTROL_H
 
-#include "silk_typedef.h"
+#include "typedef.h"
 
 #ifdef __cplusplus
 extern "C"

silk/control_SNR.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
-#include "silk_tuning_parameters.h"
+#include "main.h"
+#include "tuning_parameters.h"
 
 /* Control SNR of redidual quantizer */
 opus_int silk_control_SNR(

silk/control_audio_bandwidth.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
-#include "silk_tuning_parameters.h"
+#include "main.h"
+#include "tuning_parameters.h"
 
 /* Control internal sampling rate */
 opus_int silk_control_audio_bandwidth(

silk/control_codec.c

@@ -29,13 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 #ifdef FIXED_POINT
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 #define silk_encoder_state_Fxx      silk_encoder_state_FIX
 #else
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 #define silk_encoder_state_Fxx      silk_encoder_state_FLP
 #endif
-#include "silk_tuning_parameters.h"
+#include "tuning_parameters.h"
 
 opus_int silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */

silk/create_init_destroy.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 
 /************************/

silk/debug.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_debug.h"
-#include "silk_SigProc_FIX.h"
+#include "debug.h"
+#include "SigProc_FIX.h"
 
 #if SILK_TIC_TOC
 

silk/debug.h

@@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define _CRT_SECURE_NO_DEPRECATE    1
 #endif
 
-#include "silk_typedef.h"
+#include "typedef.h"
 #include <stdio.h>      /* file writing */
 #include <string.h>     /* strcpy, strcmp */
 

silk/dec_API.c

@@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "silk_API.h"
-#include "silk_main.h"
+#include "API.h"
+#include "main.h"
 
 /************************/
 /* Decoder Super Struct */

silk/decode_core.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /**********************************************************/
 /* Core decoder. Performs inverse NSQ operation LTP + LPC */

silk/decode_frame.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
-#include "silk_PLC.h"
+#include "main.h"
+#include "PLC.h"
 
 /****************/
 /* Decode frame */

silk/decode_indices.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Decode side-information parameters from payload */
 void silk_decode_indices(

silk/decode_parameters.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Decode parameters from payload */
 void silk_decode_parameters(

silk/decode_pitch.c

@@ -32,8 +32,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /***********************************************************
 * Pitch analyser function
 ********************************************************** */
-#include "silk_SigProc_FIX.h"
-#include "silk_pitch_est_defines.h"
+#include "SigProc_FIX.h"
+#include "pitch_est_defines.h"
 
 void silk_decode_pitch(
     opus_int16       lagIndex,                        /* I                             */

silk/decode_pulses.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /*********************************************/
 /* Decode quantization indices of excitation */

silk/decoder_set_fs.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Set decoder sampling rate */
 void silk_decoder_set_fs(

silk/define.h

@@ -28,8 +28,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_DEFINE_H
 #define SILK_DEFINE_H
 
-#include "silk_errors.h"
-#include "silk_typedef.h"
+#include "errors.h"
+#include "typedef.h"
 
 #ifdef __cplusplus
 extern "C"

silk/enc_API.c

@@ -28,16 +28,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "silk_define.h"
-#include "silk_API.h"
-#include "silk_control.h"
-#include "silk_typedef.h"
-#include "silk_structs.h"
-#include "silk_tuning_parameters.h"
+#include "define.h"
+#include "API.h"
+#include "control.h"
+#include "typedef.h"
+#include "structs.h"
+#include "tuning_parameters.h"
 #ifdef FIXED_POINT
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 #else
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 #endif
 
 /****************************************/

silk/encode_indices.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /* Encode side-information parameters to payload */
 void silk_encode_indices(

silk/encode_pulses.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main.h"
+#include "main.h"
 
 /*********************************************/
 /* Encode quantization indices of excitation */

silk/fixed/LTP_analysis_filter_FIX.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 void silk_LTP_analysis_filter_FIX(
     opus_int16       *LTP_res,                               /* O:   LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */

silk/fixed/LTP_scale_ctrl_FIX.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 void silk_LTP_scale_ctrl_FIX(
     silk_encoder_state_FIX      *psEnc,     /* I/O  encoder state FIX                           */

silk/fixed/corrMatrix_FIX.c

@@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Correlation Matrix Computations for LS estimate.
  **********************************************************************/
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FIX(

silk/fixed/encode_frame_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /****************/
 /* Encode frame */

silk/fixed/find_LPC_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* Finds LPC vector from correlations, and converts to NLSF */
 void silk_find_LPC_FIX(

silk/fixed/find_LTP_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* Head room for correlations                           */
 #define LTP_CORRS_HEAD_ROOM                             2

silk/fixed/find_pitch_lags_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* Find pitch lags */
 void silk_find_pitch_lags_FIX(

silk/fixed/find_pred_coefs_FIX.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 void silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,         /* I/O  encoder state                               */

silk/fixed/main_FIX.h

@@ -28,12 +28,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_MAIN_FIX_H
 #define SILK_MAIN_FIX_H
 
-#include "silk_SigProc_FIX.h"
-#include "silk_structs_FIX.h"
-#include "silk_control.h"
-#include "silk_main.h"
-#include "silk_PLC.h"
-#include "silk_debug.h"
+#include "SigProc_FIX.h"
+#include "structs_FIX.h"
+#include "control.h"
+#include "main.h"
+#include "PLC.h"
+#include "debug.h"
 #include "entenc.h"
 
 #ifndef FORCE_CPP_BUILD

silk/fixed/noise_shape_analysis_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a     */
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.)   */

silk/fixed/prefilter_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* silk_prefilter. Prefilter for finding Quantizer input signal */
 static inline void silk_prefilt_FIX(

silk/fixed/process_gains_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /* Processing of gains */
 void silk_process_gains_FIX(

silk/fixed/regularize_correlations_FIX.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 /* Add noise to matrix diagonal */
 void silk_regularize_correlations_FIX(

silk/fixed/residual_energy16_FIX.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
 opus_int32 silk_residual_energy16_covar_FIX(

silk/fixed/residual_energy_FIX.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceeding samples                                                                */

silk/fixed/silk_fixed.vcxproj

@@ -86,28 +86,28 @@
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="silk_corrMatrix_FIX.c" />
-    <ClCompile Include="silk_encode_frame_FIX.c" />
-    <ClCompile Include="silk_find_LPC_FIX.c" />
-    <ClCompile Include="silk_find_LTP_FIX.c" />
-    <ClCompile Include="silk_find_pitch_lags_FIX.c" />
-    <ClCompile Include="silk_find_pred_coefs_FIX.c" />
-    <ClCompile Include="silk_LTP_analysis_filter_FIX.c" />
-    <ClCompile Include="silk_LTP_scale_ctrl_FIX.c" />
-    <ClCompile Include="silk_noise_shape_analysis_FIX.c" />
-    <ClCompile Include="silk_prefilter_FIX.c" />
-    <ClCompile Include="silk_process_gains_FIX.c" />
-    <ClCompile Include="silk_regularize_correlations_FIX.c" />
-    <ClCompile Include="silk_residual_energy16_FIX.c" />
-    <ClCompile Include="silk_residual_energy_FIX.c" />
-    <ClCompile Include="silk_solve_LS_FIX.c" />
-    <ClCompile Include="silk_warped_autocorrelation_FIX.c" />
+    <ClCompile Include="corrMatrix_FIX.c" />
+    <ClCompile Include="encode_frame_FIX.c" />
+    <ClCompile Include="find_LPC_FIX.c" />
+    <ClCompile Include="find_LTP_FIX.c" />
+    <ClCompile Include="find_pitch_lags_FIX.c" />
+    <ClCompile Include="find_pred_coefs_FIX.c" />
+    <ClCompile Include="LTP_analysis_filter_FIX.c" />
+    <ClCompile Include="LTP_scale_ctrl_FIX.c" />
+    <ClCompile Include="noise_shape_analysis_FIX.c" />
+    <ClCompile Include="prefilter_FIX.c" />
+    <ClCompile Include="process_gains_FIX.c" />
+    <ClCompile Include="regularize_correlations_FIX.c" />
+    <ClCompile Include="residual_energy16_FIX.c" />
+    <ClCompile Include="residual_energy_FIX.c" />
+    <ClCompile Include="solve_LS_FIX.c" />
+    <ClCompile Include="warped_autocorrelation_FIX.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\win32\config.h" />
-    <ClInclude Include="..\silk_SigProc_FIX.h" />
-    <ClInclude Include="silk_main_FIX.h" />
-    <ClInclude Include="silk_structs_FIX.h" />
+    <ClInclude Include="..\SigProc_FIX.h" />
+    <ClInclude Include="main_FIX.h" />
+    <ClInclude Include="structs_FIX.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

silk/fixed/silk_fixed.vcxproj.filters

@@ -18,52 +18,52 @@
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="silk_corrMatrix_FIX.c">
+    <ClCompile Include="corrMatrix_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_encode_frame_FIX.c">
+    <ClCompile Include="encode_frame_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_find_LPC_FIX.c">
+    <ClCompile Include="find_LPC_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_find_LTP_FIX.c">
+    <ClCompile Include="find_LTP_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_find_pitch_lags_FIX.c">
+    <ClCompile Include="find_pitch_lags_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_find_pred_coefs_FIX.c">
+    <ClCompile Include="find_pred_coefs_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_LTP_analysis_filter_FIX.c">
+    <ClCompile Include="LTP_analysis_filter_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_LTP_scale_ctrl_FIX.c">
+    <ClCompile Include="LTP_scale_ctrl_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_noise_shape_analysis_FIX.c">
+    <ClCompile Include="noise_shape_analysis_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_prefilter_FIX.c">
+    <ClCompile Include="prefilter_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_process_gains_FIX.c">
+    <ClCompile Include="process_gains_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_regularize_correlations_FIX.c">
+    <ClCompile Include="regularize_correlations_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_residual_energy16_FIX.c">
+    <ClCompile Include="residual_energy16_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_residual_energy_FIX.c">
+    <ClCompile Include="residual_energy_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_solve_LS_FIX.c">
+    <ClCompile Include="solve_LS_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="silk_warped_autocorrelation_FIX.c">
+    <ClCompile Include="warped_autocorrelation_FIX.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -71,13 +71,13 @@
     <ClInclude Include="..\..\win32\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="silk_main_FIX.h">
+    <ClInclude Include="main_FIX.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\silk_SigProc_FIX.h">
+    <ClInclude Include="..\SigProc_FIX.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="silk_structs_FIX.h">
+    <ClInclude Include="structs_FIX.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

silk/fixed/solve_LS_FIX.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
-#include "silk_tuning_parameters.h"
+#include "main_FIX.h"
+#include "tuning_parameters.h"
 
 /*****************************/
 /* Internal function headers */

silk/fixed/structs_FIX.h

@@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_STRUCTS_FIX_H
 #define SILK_STRUCTS_FIX_H
 
-#include "silk_typedef.h"
-#include "silk_main.h"
-#include "silk_structs.h"
+#include "typedef.h"
+#include "main.h"
+#include "structs.h"
 
 #ifdef __cplusplus
 extern "C"

silk/fixed/warped_autocorrelation_FIX.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FIX.h"
+#include "main_FIX.h"
 
 #define QC  10
 #define QS  14

silk/float/LPC_analysis_filter_FLP.c

@@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <stdlib.h>
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 
 /************************************************/
 /* LPC analysis filter                          */

silk/float/LPC_inv_pred_gain_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FIX.h"
-#include "silk_SigProc_FLP.h"
+#include "SigProc_FIX.h"
+#include "SigProc_FLP.h"
 
 #define RC_THRESHOLD        0.9999f
 

silk/float/LTP_analysis_filter_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 
 void silk_LTP_analysis_filter_FLP(
           silk_float         *LTP_res,                       /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */

silk/float/LTP_scale_ctrl_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 
 void silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP      *psEnc,             /* I/O  Encoder state FLP                       */

silk/float/SigProc_FLP.h

@@ -28,7 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _SILK_SIGPROC_FLP_H_
 #define _SILK_SIGPROC_FLP_H_
 
-#include "silk_SigProc_FIX.h"
+#include "SigProc_FIX.h"
 #include <math.h>
 
 #ifdef  __cplusplus

silk/float/apply_sine_window_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 
 /* Apply sine window to signal vector.                                                                  */
 /* Window types:                                                                                        */

silk/float/autocorrelation_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_typedef.h"
-#include "silk_SigProc_FLP.h"
+#include "typedef.h"
+#include "SigProc_FLP.h"
 
 /* compute autocorrelation */
 void silk_autocorrelation_FLP(

silk/float/burg_modified_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FLP.h"
+#include "SigProc_FLP.h"
 
 #define MAX_FRAME_SIZE              384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/
 #define MAX_NB_SUBFR                4

silk/float/bwexpander_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FLP.h"
+#include "SigProc_FLP.h"
 
 
 /* Chirp (bw expand) LP AR filter */

silk/float/corrMatrix_FLP.c

@@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Correlation matrix computations for LS estimate.
  **********************************************************************/
 
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FLP(

silk/float/encode_frame_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
-#include "silk_tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /****************/
 /* Encode frame */

silk/float/energy_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FLP.h"
+#include "SigProc_FLP.h"
 
 /* sum of squares of a silk_float array, with result as double */
 double silk_energy_FLP(

silk/float/find_LPC_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
-#include "silk_tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 void silk_find_LPC_FLP(
           opus_int16                 NLSF_Q15[],             /* O    NLSFs                                   */

silk/float/find_LTP_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
-#include "silk_tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 void silk_find_LTP_FLP(
           silk_float b[ MAX_NB_SUBFR * LTP_ORDER ],          /* O    LTP coefs                               */

silk/float/find_pitch_lags_FLP.c

@@ -30,8 +30,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <stdlib.h>
-#include "silk_main_FLP.h"
-#include "silk_tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 void silk_find_pitch_lags_FLP(
     silk_encoder_state_FLP          *psEnc,             /* I/O  Encoder state FLP                       */

silk/float/find_pred_coefs_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 
 
 void silk_find_pred_coefs_FLP(

silk/float/inner_product_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FLP.h"
+#include "SigProc_FLP.h"
 
 /* inner product of two silk_float arrays, with result as double     */
 double silk_inner_product_FLP(      /* O    result              */

silk/float/k2a_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FLP.h"
+#include "SigProc_FLP.h"
 
 /* step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a_FLP(

silk/float/levinsondurbin_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_SigProc_FLP.h"
+#include "SigProc_FLP.h"
 
 /* Solve the normal equations using the Levinson-Durbin recursion */
 silk_float silk_levinsondurbin_FLP(    /* O    prediction error energy                     */

silk/float/main_FLP.h

@@ -28,12 +28,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_MAIN_FLP_H
 #define SILK_MAIN_FLP_H
 
-#include "silk_SigProc_FLP.h"
-#include "silk_SigProc_FIX.h"
-#include "silk_structs_FLP.h"
-#include "silk_main.h"
-#include "silk_define.h"
-#include "silk_debug.h"
+#include "SigProc_FLP.h"
+#include "SigProc_FIX.h"
+#include "structs_FLP.h"
+#include "main.h"
+#include "define.h"
+#include "debug.h"
 #include "entenc.h"
 
 #ifdef __cplusplus

silk/float/noise_shape_analysis_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
-#include "silk_tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /* Compute gain to make warped filter coefficients have a zero mean log frequency response on a     */
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.)   */

silk/float/pitch_analysis_core_FLP.c

@@ -34,9 +34,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * Pitch analyser function
 *
 ******************************************************************************/
-#include "silk_SigProc_FLP.h"
-#include "silk_SigProc_FIX.h"
-#include "silk_pitch_est_defines.h"
+#include "SigProc_FLP.h"
+#include "SigProc_FIX.h"
+#include "pitch_est_defines.h"
 
 #define SCRATCH_SIZE    22
 

silk/float/prefilter_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
-#include "silk_tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /*
 * silk_prefilter. Prefilter for finding Quantizer input signal

silk/float/process_gains_FLP.c

@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
-#include "silk_tuning_parameters.h"
+#include "main_FLP.h"
+#include "tuning_parameters.h"
 
 /* Processing of gains */
 void silk_process_gains_FLP(

silk/float/regularize_correlations_FLP.c

@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "silk_main_FLP.h"
+#include "main_FLP.h"
 
 void silk_regularize_correlations_FLP(
           silk_float                 *XX,                /* I/O  Correlation matrices                    */