diff --git a/SMP/libfdk-aac.vcxproj b/SMP/libfdk-aac.vcxproj
index 07715de59..7dc6bc082 100644
--- a/SMP/libfdk-aac.vcxproj
+++ b/SMP/libfdk-aac.vcxproj
@@ -84,7 +84,7 @@
     <ClInclude Include="..\libAACdec\src\channelinfo.h" />
     <ClInclude Include="..\libAACdec\src\conceal.h" />
     <ClInclude Include="..\libAACdec\src\conceal_types.h" />
-    <ClInclude Include="..\libAACdec\src\debug.h" />
+    <ClInclude Include="..\libAACdec\src\FDK_delay.h" />
     <ClInclude Include="..\libAACdec\src\ldfiltbank.h" />
     <ClInclude Include="..\libAACdec\src\overlapadd.h" />
     <ClInclude Include="..\libAACdec\src\pulsedata.h" />
@@ -93,6 +93,14 @@
     <ClInclude Include="..\libAACdec\src\rvlcconceal.h" />
     <ClInclude Include="..\libAACdec\src\rvlc_info.h" />
     <ClInclude Include="..\libAACdec\src\stereo.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_acelp.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_ace_d4t64.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_ace_ltp.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_const.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_fac.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_lpc.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_lpd.h" />
+    <ClInclude Include="..\libAACdec\src\usacdec_rom.h" />
     <ClInclude Include="..\libAACenc\include\aacenc_lib.h" />
     <ClInclude Include="..\libAACenc\src\aacenc.h" />
     <ClInclude Include="..\libAACenc\src\aacenc_pns.h" />
@@ -115,6 +123,7 @@
     <ClInclude Include="..\libAACenc\src\line_pe.h" />
     <ClInclude Include="..\libAACenc\src\metadata_compressor.h" />
     <ClInclude Include="..\libAACenc\src\metadata_main.h" />
+    <ClInclude Include="..\libAACenc\src\mps_main.h" />
     <ClInclude Include="..\libAACenc\src\ms_stereo.h" />
     <ClInclude Include="..\libAACenc\src\noisedet.h" />
     <ClInclude Include="..\libAACenc\src\pnsparam.h" />
@@ -132,6 +141,18 @@
     <ClInclude Include="..\libAACenc\src\tns_func.h" />
     <ClInclude Include="..\libAACenc\src\tonality.h" />
     <ClInclude Include="..\libAACenc\src\transform.h" />
+    <ClInclude Include="..\libArithCoding\include\ac_arith_coder.h" />
+    <ClInclude Include="..\libDRCdec\include\FDK_drcDecLib.h" />
+    <ClInclude Include="..\libDRCdec\src\drcDecoder.h" />
+    <ClInclude Include="..\libDRCdec\src\drcDec_gainDecoder.h" />
+    <ClInclude Include="..\libDRCdec\src\drcDec_reader.h" />
+    <ClInclude Include="..\libDRCdec\src\drcDec_rom.h" />
+    <ClInclude Include="..\libDRCdec\src\drcDec_selectionProcess.h" />
+    <ClInclude Include="..\libDRCdec\src\drcDec_tools.h" />
+    <ClInclude Include="..\libDRCdec\src\drcDec_types.h" />
+    <ClInclude Include="..\libDRCdec\src\drcGainDec_init.h" />
+    <ClInclude Include="..\libDRCdec\src\drcGainDec_preprocess.h" />
+    <ClInclude Include="..\libDRCdec\src\drcGainDec_process.h" />
     <ClInclude Include="..\libFDK\include\abs.h" />
     <ClInclude Include="..\libFDK\include\autocorr2nd.h" />
     <ClInclude Include="..\libFDK\include\clz.h" />
@@ -143,7 +164,11 @@
     <ClInclude Include="..\libFDK\include\FDK_bitstream.h" />
     <ClInclude Include="..\libFDK\include\FDK_core.h" />
     <ClInclude Include="..\libFDK\include\FDK_crc.h" />
+    <ClInclude Include="..\libFDK\include\FDK_decorrelate.h" />
     <ClInclude Include="..\libFDK\include\FDK_hybrid.h" />
+    <ClInclude Include="..\libFDK\include\FDK_lpc.h" />
+    <ClInclude Include="..\libFDK\include\FDK_matrixCalloc.h" />
+    <ClInclude Include="..\libFDK\include\FDK_qmf_domain.h" />
     <ClInclude Include="..\libFDK\include\FDK_tools_rom.h" />
     <ClInclude Include="..\libFDK\include\FDK_trigFcts.h" />
     <ClInclude Include="..\libFDK\include\fft.h" />
@@ -152,39 +177,76 @@
     <ClInclude Include="..\libFDK\include\fixminmax.h" />
     <ClInclude Include="..\libFDK\include\fixmul.h" />
     <ClInclude Include="..\libFDK\include\fixpoint_math.h" />
+    <ClInclude Include="..\libFDK\include\huff_nodes.h" />
     <ClInclude Include="..\libFDK\include\mdct.h" />
+    <ClInclude Include="..\libFDK\include\nlc_dec.h" />
     <ClInclude Include="..\libFDK\include\qmf.h" />
+    <ClInclude Include="..\libFDK\include\qmf_pcm.h" />
     <ClInclude Include="..\libFDK\include\scale.h" />
     <ClInclude Include="..\libFDK\include\scramble.h" />
     <ClInclude Include="..\libFDK\include\x86\abs_x86.h" />
     <ClInclude Include="..\libFDK\include\x86\clz_x86.h" />
     <ClInclude Include="..\libFDK\include\x86\fixmul_x86.h" />
-    <ClInclude Include="..\libMpegTPDec\include\mpegFileRead.h" />
+    <ClInclude Include="..\libFDK\include\x86\fixpoint_math_x86.h" />
     <ClInclude Include="..\libMpegTPDec\include\tpdec_lib.h" />
     <ClInclude Include="..\libMpegTPDec\include\tp_data.h" />
-    <ClInclude Include="..\libMpegTPDec\src\mpegFileFormat.h" />
     <ClInclude Include="..\libMpegTPDec\src\tpdec_adif.h" />
     <ClInclude Include="..\libMpegTPDec\src\tpdec_adts.h" />
     <ClInclude Include="..\libMpegTPDec\src\tpdec_drm.h" />
     <ClInclude Include="..\libMpegTPDec\src\tpdec_latm.h" />
-    <ClInclude Include="..\libMpegTPEnc\include\mpegFileWrite.h" />
+    <ClInclude Include="..\libMpegTPDec\src\tp_version.h" />
     <ClInclude Include="..\libMpegTPEnc\include\tpenc_lib.h" />
     <ClInclude Include="..\libMpegTPEnc\include\tp_data.h" />
     <ClInclude Include="..\libMpegTPEnc\src\tpenc_adif.h" />
     <ClInclude Include="..\libMpegTPEnc\src\tpenc_adts.h" />
     <ClInclude Include="..\libMpegTPEnc\src\tpenc_asc.h" />
     <ClInclude Include="..\libMpegTPEnc\src\tpenc_latm.h" />
+    <ClInclude Include="..\libMpegTPEnc\src\tp_version.h" />
     <ClInclude Include="..\libPCMutils\include\limiter.h" />
-    <ClInclude Include="..\libPCMutils\include\pcmutils_lib.h" />
+    <ClInclude Include="..\libPCMutils\include\pcmdmx_lib.h" />
+    <ClInclude Include="..\libPCMutils\include\pcm_utils.h" />
+    <ClInclude Include="..\libPCMutils\src\version.h" />
+    <ClInclude Include="..\libSACdec\include\sac_dec_errorcodes.h" />
+    <ClInclude Include="..\libSACdec\include\sac_dec_lib.h" />
+    <ClInclude Include="..\libSACdec\src\sac_bitdec.h" />
+    <ClInclude Include="..\libSACdec\src\sac_calcM1andM2.h" />
+    <ClInclude Include="..\libSACdec\src\sac_dec.h" />
+    <ClInclude Include="..\libSACdec\src\sac_dec_conceal.h" />
+    <ClInclude Include="..\libSACdec\src\sac_dec_interface.h" />
+    <ClInclude Include="..\libSACdec\src\sac_dec_ssc_struct.h" />
+    <ClInclude Include="..\libSACdec\src\sac_process.h" />
+    <ClInclude Include="..\libSACdec\src\sac_qmf.h" />
+    <ClInclude Include="..\libSACdec\src\sac_reshapeBBEnv.h" />
+    <ClInclude Include="..\libSACdec\src\sac_rom.h" />
+    <ClInclude Include="..\libSACdec\src\sac_smoothing.h" />
+    <ClInclude Include="..\libSACdec\src\sac_stp.h" />
+    <ClInclude Include="..\libSACdec\src\sac_tsd.h" />
+    <ClInclude Include="..\libSACenc\include\sacenc_lib.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_bitstream.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_const.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_delay.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_dmx_tdom_enh.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_filter.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_framewindowing.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_huff_tab.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_nlc_enc.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_onsetdetect.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_paramextract.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_staticgain.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_tree.h" />
+    <ClInclude Include="..\libSACenc\src\sacenc_vectorfunctions.h" />
     <ClInclude Include="..\libSBRdec\include\sbrdecoder.h" />
     <ClInclude Include="..\libSBRdec\src\env_calc.h" />
     <ClInclude Include="..\libSBRdec\src\env_dec.h" />
     <ClInclude Include="..\libSBRdec\src\env_extr.h" />
+    <ClInclude Include="..\libSBRdec\src\hbe.h" />
+    <ClInclude Include="..\libSBRdec\src\HFgen_preFlat.h" />
     <ClInclude Include="..\libSBRdec\src\huff_dec.h" />
     <ClInclude Include="..\libSBRdec\src\lpp_tran.h" />
     <ClInclude Include="..\libSBRdec\src\psbitdec.h" />
     <ClInclude Include="..\libSBRdec\src\psdec.h" />
-    <ClInclude Include="..\libSBRdec\src\psdec_hybrid.h" />
+    <ClInclude Include="..\libSBRdec\src\psdec_drm.h" />
+    <ClInclude Include="..\libSBRdec\src\pvc_dec.h" />
     <ClInclude Include="..\libSBRdec\src\sbrdec_drc.h" />
     <ClInclude Include="..\libSBRdec\src\sbrdec_freq_sca.h" />
     <ClInclude Include="..\libSBRdec\src\sbr_crc.h" />
@@ -192,7 +254,6 @@
     <ClInclude Include="..\libSBRdec\src\sbr_dec.h" />
     <ClInclude Include="..\libSBRdec\src\sbr_ram.h" />
     <ClInclude Include="..\libSBRdec\src\sbr_rom.h" />
-    <ClInclude Include="..\libSBRdec\src\sbr_scale.h" />
     <ClInclude Include="..\libSBRdec\src\transcendent.h" />
     <ClInclude Include="..\libSBRenc\include\sbr_encoder.h" />
     <ClInclude Include="..\libSBRenc\src\bit_sbr.h" />
@@ -211,18 +272,16 @@
     <ClInclude Include="..\libSBRenc\src\resampler.h" />
     <ClInclude Include="..\libSBRenc\src\sbr.h" />
     <ClInclude Include="..\libSBRenc\src\sbrenc_freq_sca.h" />
+    <ClInclude Include="..\libSBRenc\src\sbrenc_ram.h" />
+    <ClInclude Include="..\libSBRenc\src\sbrenc_rom.h" />
     <ClInclude Include="..\libSBRenc\src\sbr_def.h" />
     <ClInclude Include="..\libSBRenc\src\sbr_misc.h" />
-    <ClInclude Include="..\libSBRenc\src\sbr_ram.h" />
-    <ClInclude Include="..\libSBRenc\src\sbr_rom.h" />
     <ClInclude Include="..\libSBRenc\src\ton_corr.h" />
     <ClInclude Include="..\libSBRenc\src\tran_det.h" />
-    <ClInclude Include="..\libSYS\include\audio.h" />
-    <ClInclude Include="..\libSYS\include\conv_string.h" />
     <ClInclude Include="..\libSYS\include\FDK_audio.h" />
     <ClInclude Include="..\libSYS\include\genericStds.h" />
     <ClInclude Include="..\libSYS\include\machine_type.h" />
-    <ClInclude Include="..\libSYS\include\wav_file.h" />
+    <ClInclude Include="..\libSYS\include\syslib_channelMapDescr.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libAACdec\src\aacdecoder.cpp" />
@@ -239,12 +298,20 @@
     <ClCompile Include="..\libAACdec\src\channel.cpp" />
     <ClCompile Include="..\libAACdec\src\channelinfo.cpp" />
     <ClCompile Include="..\libAACdec\src\conceal.cpp" />
+    <ClCompile Include="..\libAACdec\src\FDK_delay.cpp" />
     <ClCompile Include="..\libAACdec\src\ldfiltbank.cpp" />
     <ClCompile Include="..\libAACdec\src\pulsedata.cpp" />
     <ClCompile Include="..\libAACdec\src\rvlc.cpp" />
     <ClCompile Include="..\libAACdec\src\rvlcbit.cpp" />
     <ClCompile Include="..\libAACdec\src\rvlcconceal.cpp" />
     <ClCompile Include="..\libAACdec\src\stereo.cpp" />
+    <ClCompile Include="..\libAACdec\src\usacdec_acelp.cpp" />
+    <ClCompile Include="..\libAACdec\src\usacdec_ace_d4t64.cpp" />
+    <ClCompile Include="..\libAACdec\src\usacdec_ace_ltp.cpp" />
+    <ClCompile Include="..\libAACdec\src\usacdec_fac.cpp" />
+    <ClCompile Include="..\libAACdec\src\usacdec_lpc.cpp" />
+    <ClCompile Include="..\libAACdec\src\usacdec_lpd.cpp" />
+    <ClCompile Include="..\libAACdec\src\usacdec_rom.cpp" />
     <ClCompile Include="..\libAACenc\src\aacenc.cpp" />
     <ClCompile Include="..\libAACenc\src\aacenc_lib.cpp" />
     <ClCompile Include="..\libAACenc\src\aacenc_pns.cpp" />
@@ -265,6 +332,7 @@
     <ClCompile Include="..\libAACenc\src\line_pe.cpp" />
     <ClCompile Include="..\libAACenc\src\metadata_compressor.cpp" />
     <ClCompile Include="..\libAACenc\src\metadata_main.cpp" />
+    <ClCompile Include="..\libAACenc\src\mps_main.cpp" />
     <ClCompile Include="..\libAACenc\src\ms_stereo.cpp" />
     <ClCompile Include="..\libAACenc\src\noisedet.cpp" />
     <ClCompile Include="..\libAACenc\src\pnsparam.cpp" />
@@ -277,18 +345,34 @@
     <ClCompile Include="..\libAACenc\src\spreading.cpp" />
     <ClCompile Include="..\libAACenc\src\tonality.cpp" />
     <ClCompile Include="..\libAACenc\src\transform.cpp" />
+    <ClCompile Include="..\libArithCoding\src\ac_arith_coder.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcDec_gainDecoder.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcDec_reader.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcDec_rom.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcDec_selectionProcess.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcDec_tools.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcGainDec_init.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcGainDec_preprocess.cpp" />
+    <ClCompile Include="..\libDRCdec\src\drcGainDec_process.cpp" />
+    <ClCompile Include="..\libDRCdec\src\FDK_drcDecLib.cpp" />
     <ClCompile Include="..\libFDK\src\autocorr2nd.cpp" />
     <ClCompile Include="..\libFDK\src\dct.cpp" />
     <ClCompile Include="..\libFDK\src\FDK_bitbuffer.cpp" />
     <ClCompile Include="..\libFDK\src\FDK_core.cpp" />
     <ClCompile Include="..\libFDK\src\FDK_crc.cpp" />
+    <ClCompile Include="..\libFDK\src\FDK_decorrelate.cpp" />
     <ClCompile Include="..\libFDK\src\FDK_hybrid.cpp" />
+    <ClCompile Include="..\libFDK\src\FDK_lpc.cpp" />
+    <ClCompile Include="..\libFDK\src\FDK_matrixCalloc.cpp" />
+    <ClCompile Include="..\libFDK\src\FDK_qmf_domain.cpp" />
     <ClCompile Include="..\libFDK\src\FDK_tools_rom.cpp" />
     <ClCompile Include="..\libFDK\src\FDK_trigFcts.cpp" />
     <ClCompile Include="..\libFDK\src\fft.cpp" />
     <ClCompile Include="..\libFDK\src\fft_rad2.cpp" />
     <ClCompile Include="..\libFDK\src\fixpoint_math.cpp" />
+    <ClCompile Include="..\libFDK\src\huff_nodes.cpp" />
     <ClCompile Include="..\libFDK\src\mdct.cpp" />
+    <ClCompile Include="..\libFDK\src\nlc_dec.cpp" />
     <ClCompile Include="..\libFDK\src\qmf.cpp" />
     <ClCompile Include="..\libFDK\src\scale.cpp" />
     <ClCompile Include="..\libMpegTPDec\src\tpdec_adif.cpp" />
@@ -303,15 +387,45 @@
     <ClCompile Include="..\libMpegTPEnc\src\tpenc_latm.cpp" />
     <ClCompile Include="..\libMpegTPEnc\src\tpenc_lib.cpp" />
     <ClCompile Include="..\libPCMutils\src\limiter.cpp" />
-    <ClCompile Include="..\libPCMutils\src\pcmutils_lib.cpp" />
+    <ClCompile Include="..\libPCMutils\src\pcmdmx_lib.cpp" />
+    <ClCompile Include="..\libPCMutils\src\pcm_utils.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_bitdec.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_calcM1andM2.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_dec.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_dec_conceal.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_dec_lib.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_process.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_qmf.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_reshapeBBEnv.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_rom.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_smoothing.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_stp.cpp" />
+    <ClCompile Include="..\libSACdec\src\sac_tsd.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_bitstream.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_delay.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_dmx_tdom_enh.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_filter.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_framewindowing.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_huff_tab.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_lib.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_nlc_enc.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_onsetdetect.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_paramextract.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_staticgain.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_tree.cpp" />
+    <ClCompile Include="..\libSACenc\src\sacenc_vectorfunctions.cpp" />
     <ClCompile Include="..\libSBRdec\src\env_calc.cpp" />
     <ClCompile Include="..\libSBRdec\src\env_dec.cpp" />
     <ClCompile Include="..\libSBRdec\src\env_extr.cpp" />
+    <ClCompile Include="..\libSBRdec\src\hbe.cpp" />
+    <ClCompile Include="..\libSBRdec\src\HFgen_preFlat.cpp" />
     <ClCompile Include="..\libSBRdec\src\huff_dec.cpp" />
     <ClCompile Include="..\libSBRdec\src\lpp_tran.cpp" />
     <ClCompile Include="..\libSBRdec\src\psbitdec.cpp" />
     <ClCompile Include="..\libSBRdec\src\psdec.cpp" />
-    <ClCompile Include="..\libSBRdec\src\psdec_hybrid.cpp" />
+    <ClCompile Include="..\libSBRdec\src\psdecrom_drm.cpp" />
+    <ClCompile Include="..\libSBRdec\src\psdec_drm.cpp" />
+    <ClCompile Include="..\libSBRdec\src\pvc_dec.cpp" />
     <ClCompile Include="..\libSBRdec\src\sbrdecoder.cpp" />
     <ClCompile Include="..\libSBRdec\src\sbrdec_drc.cpp" />
     <ClCompile Include="..\libSBRdec\src\sbrdec_freq_sca.cpp" />
@@ -337,15 +451,14 @@
     <ClCompile Include="..\libSBRenc\src\ps_main.cpp" />
     <ClCompile Include="..\libSBRenc\src\resampler.cpp" />
     <ClCompile Include="..\libSBRenc\src\sbrenc_freq_sca.cpp" />
+    <ClCompile Include="..\libSBRenc\src\sbrenc_ram.cpp" />
+    <ClCompile Include="..\libSBRenc\src\sbrenc_rom.cpp" />
     <ClCompile Include="..\libSBRenc\src\sbr_encoder.cpp" />
     <ClCompile Include="..\libSBRenc\src\sbr_misc.cpp" />
-    <ClCompile Include="..\libSBRenc\src\sbr_ram.cpp" />
-    <ClCompile Include="..\libSBRenc\src\sbr_rom.cpp" />
     <ClCompile Include="..\libSBRenc\src\ton_corr.cpp" />
     <ClCompile Include="..\libSBRenc\src\tran_det.cpp" />
-    <ClCompile Include="..\libSYS\src\conv_string.cpp" />
     <ClCompile Include="..\libSYS\src\genericStds.cpp" />
-    <ClCompile Include="..\libSYS\src\wav_file.cpp" />
+    <ClCompile Include="..\libSYS\src\syslib_channelMapDescr.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="libfdk-aac.def" />
@@ -731,7 +844,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0502;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -779,7 +892,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -829,7 +942,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;_DEBUG;_LIB;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -877,7 +990,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -927,7 +1040,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WIN32_WINNT=0x0502;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -981,7 +1094,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -1039,7 +1152,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;_DEBUG;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -1092,7 +1205,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <MinimalRebuild>false</MinimalRebuild>
@@ -1156,7 +1269,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0502;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
@@ -1211,7 +1324,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
@@ -1268,7 +1381,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;NDEBUG;_LIB;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
@@ -1323,7 +1436,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
@@ -1380,7 +1493,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WIN32_WINNT=0x0502;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
@@ -1442,7 +1555,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -1508,7 +1621,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;NDEBUG;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
@@ -1569,7 +1682,7 @@ del /f /q $(OutDir)\licenses\fdk-aac.txt
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
-      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;../libaacenc/include;../libaacdec/include;../libFDK/include;../libMpegTPEnc/include;../libMpegTPDec/include;../libPCMutils/include;../libSBRenc/include;../libSBRdec/include;../libSYS/include;../libSACdec/include;../libSACenc/include;../libArithCoding/include;../libDRCdec/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;__x86_64__;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/SMP/libfdk-aac.vcxproj.filters b/SMP/libfdk-aac.vcxproj.filters
index e088add70..6e46bb42a 100644
--- a/SMP/libfdk-aac.vcxproj.filters
+++ b/SMP/libfdk-aac.vcxproj.filters
@@ -88,6 +88,42 @@
     <Filter Include="Header Files\libFDK\x86">
       <UniqueIdentifier>{f58dba1c-c30c-42a6-a0de-12c302c1755c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\libArithCoding">
+      <UniqueIdentifier>{28849d05-05b8-4bd0-bcf0-23cc9274aaef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libArithCoding">
+      <UniqueIdentifier>{0588cf25-699c-44b8-9c3f-d5904df260b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libDRCdec">
+      <UniqueIdentifier>{107d5254-0955-48d3-8158-3ed2305c0346}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\libDRCdec">
+      <UniqueIdentifier>{0ebe75e0-b541-402f-afc6-ecdf602cf6d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\libDRCdec\src">
+      <UniqueIdentifier>{9be7e27a-4a9e-4b69-a3a0-963a74048b3d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\libPCMutils\src">
+      <UniqueIdentifier>{71764774-379e-4be4-b53e-2165ba1619c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\libSACdec">
+      <UniqueIdentifier>{0f3ef86e-f843-4af1-bb3d-d6e593678cba}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libSACdec">
+      <UniqueIdentifier>{4ab984a4-6985-4d91-a8cc-8b9a8b94d360}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\libSACdec\src">
+      <UniqueIdentifier>{427455a3-c71c-49bf-ae26-ebad0af6acc1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\libSACenc">
+      <UniqueIdentifier>{ccbdfb02-a915-42a4-9529-89e4fec14353}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libSACenc">
+      <UniqueIdentifier>{33da1401-226a-49a6-9a7a-2d049d1393a6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\libSACenc\src">
+      <UniqueIdentifier>{4da83866-06a4-462a-bc17-9fdba4803188}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libAACdec\include\aacdecoder_lib.h">
@@ -144,9 +180,6 @@
     <ClInclude Include="..\libAACdec\src\conceal_types.h">
       <Filter>Header Files\libAACdec\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\libAACdec\src\debug.h">
-      <Filter>Header Files\libAACdec\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\libAACdec\src\ldfiltbank.h">
       <Filter>Header Files\libAACdec\src</Filter>
     </ClInclude>
@@ -366,9 +399,6 @@
     <ClInclude Include="..\libFDK\include\x86\abs_x86.h">
       <Filter>Header Files\libFDK\x86</Filter>
     </ClInclude>
-    <ClInclude Include="..\libMpegTPDec\src\mpegFileFormat.h">
-      <Filter>Header Files\libMpegTPDec\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\libMpegTPDec\src\tpdec_adif.h">
       <Filter>Header Files\libMpegTPDec\src</Filter>
     </ClInclude>
@@ -384,9 +414,6 @@
     <ClInclude Include="..\libMpegTPDec\include\tpdec_lib.h">
       <Filter>Header Files\libMpegTPDec</Filter>
     </ClInclude>
-    <ClInclude Include="..\libMpegTPDec\include\mpegFileRead.h">
-      <Filter>Header Files\libMpegTPDec</Filter>
-    </ClInclude>
     <ClInclude Include="..\libMpegTPEnc\src\tpenc_adif.h">
       <Filter>Header Files\libMpegTPEnc\src</Filter>
     </ClInclude>
@@ -405,12 +432,6 @@
     <ClInclude Include="..\libMpegTPEnc\include\tpenc_lib.h">
       <Filter>Header Files\libMpegTPEnc</Filter>
     </ClInclude>
-    <ClInclude Include="..\libMpegTPEnc\include\mpegFileWrite.h">
-      <Filter>Header Files\libMpegTPEnc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\libPCMutils\include\pcmutils_lib.h">
-      <Filter>Header Files\libPCMutils</Filter>
-    </ClInclude>
     <ClInclude Include="..\libSBRdec\include\sbrdecoder.h">
       <Filter>Header Files\libSBRdec</Filter>
     </ClInclude>
@@ -435,9 +456,6 @@
     <ClInclude Include="..\libSBRdec\src\psdec.h">
       <Filter>Header Files\libSBRdec\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\libSBRdec\src\psdec_hybrid.h">
-      <Filter>Header Files\libSBRdec\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\libSBRdec\src\sbr_crc.h">
       <Filter>Header Files\libSBRdec\src</Filter>
     </ClInclude>
@@ -453,9 +471,6 @@
     <ClInclude Include="..\libSBRdec\src\sbr_rom.h">
       <Filter>Header Files\libSBRdec\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\libSBRdec\src\sbr_scale.h">
-      <Filter>Header Files\libSBRdec\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\libSBRdec\src\sbrdec_drc.h">
       <Filter>Header Files\libSBRdec\src</Filter>
     </ClInclude>
@@ -510,12 +525,6 @@
     <ClInclude Include="..\libSBRenc\src\sbr_misc.h">
       <Filter>Header Files\libSBRenc\src</Filter>
     </ClInclude>
-    <ClInclude Include="..\libSBRenc\src\sbr_ram.h">
-      <Filter>Header Files\libSBRenc\src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\libSBRenc\src\sbr_rom.h">
-      <Filter>Header Files\libSBRenc\src</Filter>
-    </ClInclude>
     <ClInclude Include="..\libSBRenc\src\sbrenc_freq_sca.h">
       <Filter>Header Files\libSBRenc\src</Filter>
     </ClInclude>
@@ -540,15 +549,6 @@
     <ClInclude Include="..\libSYS\include\machine_type.h">
       <Filter>Header Files\libSYS</Filter>
     </ClInclude>
-    <ClInclude Include="..\libSYS\include\wav_file.h">
-      <Filter>Header Files\libSYS</Filter>
-    </ClInclude>
-    <ClInclude Include="..\libSYS\include\audio.h">
-      <Filter>Header Files\libSYS</Filter>
-    </ClInclude>
-    <ClInclude Include="..\libSYS\include\conv_string.h">
-      <Filter>Header Files\libSYS</Filter>
-    </ClInclude>
     <ClInclude Include="..\libSYS\include\FDK_audio.h">
       <Filter>Header Files\libSYS</Filter>
     </ClInclude>
@@ -558,6 +558,219 @@
     <ClInclude Include="..\libMpegTPDec\src\tpdec_drm.h">
       <Filter>Header Files\libMpegTPDec\src</Filter>
     </ClInclude>
+    <ClInclude Include="..\libAACdec\src\FDK_delay.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_ace_d4t64.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_ace_ltp.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_acelp.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_const.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_fac.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_lpc.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_lpd.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACdec\src\usacdec_rom.h">
+      <Filter>Header Files\libAACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libAACenc\src\mps_main.h">
+      <Filter>Header Files\libAACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libArithCoding\include\ac_arith_coder.h">
+      <Filter>Header Files\libArithCoding</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\include\FDK_drcDecLib.h">
+      <Filter>Header Files\libDRCdec</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcDec_gainDecoder.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcDec_reader.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcDec_rom.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcDec_selectionProcess.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcDec_tools.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcDec_types.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcDecoder.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcGainDec_init.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcGainDec_preprocess.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libDRCdec\src\drcGainDec_process.h">
+      <Filter>Header Files\libDRCdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\FDK_decorrelate.h">
+      <Filter>Header Files\libFDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\FDK_lpc.h">
+      <Filter>Header Files\libFDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\FDK_matrixCalloc.h">
+      <Filter>Header Files\libFDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\FDK_qmf_domain.h">
+      <Filter>Header Files\libFDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\huff_nodes.h">
+      <Filter>Header Files\libFDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\nlc_dec.h">
+      <Filter>Header Files\libFDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\qmf_pcm.h">
+      <Filter>Header Files\libFDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libFDK\include\x86\fixpoint_math_x86.h">
+      <Filter>Header Files\libFDK\x86</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libMpegTPDec\src\tp_version.h">
+      <Filter>Header Files\libMpegTPDec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libMpegTPEnc\src\tp_version.h">
+      <Filter>Header Files\libMpegTPEnc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libPCMutils\include\pcm_utils.h">
+      <Filter>Header Files\libPCMutils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libPCMutils\include\pcmdmx_lib.h">
+      <Filter>Header Files\libPCMutils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libPCMutils\src\version.h">
+      <Filter>Header Files\libPCMutils\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\include\sac_dec_errorcodes.h">
+      <Filter>Header Files\libSACdec</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\include\sac_dec_lib.h">
+      <Filter>Header Files\libSACdec</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_tsd.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_stp.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_smoothing.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_rom.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_reshapeBBEnv.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_qmf.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_process.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_dec_ssc_struct.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_dec_interface.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_dec_conceal.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_dec.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_calcM1andM2.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACdec\src\sac_bitdec.h">
+      <Filter>Header Files\libSACdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\include\sacenc_lib.h">
+      <Filter>Header Files\libSACenc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_vectorfunctions.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_tree.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_staticgain.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_paramextract.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_onsetdetect.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_nlc_enc.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_huff_tab.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_framewindowing.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_filter.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_dmx_tdom_enh.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_delay.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_const.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSACenc\src\sacenc_bitstream.h">
+      <Filter>Header Files\libSACenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSBRdec\src\hbe.h">
+      <Filter>Header Files\libSBRdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSBRdec\src\psdec_drm.h">
+      <Filter>Header Files\libSBRdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSBRdec\src\pvc_dec.h">
+      <Filter>Header Files\libSBRdec\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSBRenc\src\sbrenc_ram.h">
+      <Filter>Header Files\libSBRenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSBRenc\src\sbrenc_rom.h">
+      <Filter>Header Files\libSBRenc\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSYS\include\syslib_channelMapDescr.h">
+      <Filter>Header Files\libSYS</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libSBRdec\src\HFgen_preFlat.h">
+      <Filter>Header Files\libSBRdec\src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\libAACdec\src\aac_ram.cpp">
@@ -788,9 +1001,6 @@
     <ClCompile Include="..\libMpegTPEnc\src\tpenc_asc.cpp">
       <Filter>Source Files\libMpegTPEnc</Filter>
     </ClCompile>
-    <ClCompile Include="..\libPCMutils\src\pcmutils_lib.cpp">
-      <Filter>Source Files\libPCMutils</Filter>
-    </ClCompile>
     <ClCompile Include="..\libSBRdec\src\env_calc.cpp">
       <Filter>Source Files\libSBRdec</Filter>
     </ClCompile>
@@ -812,9 +1022,6 @@
     <ClCompile Include="..\libSBRdec\src\psdec.cpp">
       <Filter>Source Files\libSBRdec</Filter>
     </ClCompile>
-    <ClCompile Include="..\libSBRdec\src\psdec_hybrid.cpp">
-      <Filter>Source Files\libSBRdec</Filter>
-    </ClCompile>
     <ClCompile Include="..\libSBRdec\src\sbr_crc.cpp">
       <Filter>Source Files\libSBRdec</Filter>
     </ClCompile>
@@ -851,12 +1058,6 @@
     <ClCompile Include="..\libSBRenc\src\sbr_misc.cpp">
       <Filter>Source Files\libSBRenc</Filter>
     </ClCompile>
-    <ClCompile Include="..\libSBRenc\src\sbr_ram.cpp">
-      <Filter>Source Files\libSBRenc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libSBRenc\src\sbr_rom.cpp">
-      <Filter>Source Files\libSBRenc</Filter>
-    </ClCompile>
     <ClCompile Include="..\libSBRenc\src\sbrenc_freq_sca.cpp">
       <Filter>Source Files\libSBRenc</Filter>
     </ClCompile>
@@ -896,21 +1097,195 @@
     <ClCompile Include="..\libSBRenc\src\ps_encode.cpp">
       <Filter>Source Files\libSBRenc</Filter>
     </ClCompile>
-    <ClCompile Include="..\libSYS\src\conv_string.cpp">
-      <Filter>Source Files\libSYS</Filter>
-    </ClCompile>
     <ClCompile Include="..\libSYS\src\genericStds.cpp">
       <Filter>Source Files\libSYS</Filter>
     </ClCompile>
-    <ClCompile Include="..\libSYS\src\wav_file.cpp">
-      <Filter>Source Files\libSYS</Filter>
-    </ClCompile>
     <ClCompile Include="..\libPCMutils\src\limiter.cpp">
       <Filter>Source Files\libPCMutils</Filter>
     </ClCompile>
     <ClCompile Include="..\libMpegTPDec\src\tpdec_drm.cpp">
       <Filter>Source Files\libMpegTPDec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libAACdec\src\FDK_delay.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACdec\src\usacdec_ace_d4t64.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACdec\src\usacdec_ace_ltp.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACdec\src\usacdec_acelp.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACdec\src\usacdec_fac.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACdec\src\usacdec_lpc.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACdec\src\usacdec_lpd.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACdec\src\usacdec_rom.cpp">
+      <Filter>Source Files\libAACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libAACenc\src\mps_main.cpp">
+      <Filter>Source Files\libAACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libArithCoding\src\ac_arith_coder.cpp">
+      <Filter>Source Files\libArithCoding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcDec_gainDecoder.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcDec_reader.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcDec_rom.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcDec_selectionProcess.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcDec_tools.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcGainDec_init.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcGainDec_preprocess.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\drcGainDec_process.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libDRCdec\src\FDK_drcDecLib.cpp">
+      <Filter>Source Files\libDRCdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libFDK\src\FDK_decorrelate.cpp">
+      <Filter>Source Files\libFDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libFDK\src\FDK_lpc.cpp">
+      <Filter>Source Files\libFDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libFDK\src\FDK_matrixCalloc.cpp">
+      <Filter>Source Files\libFDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libFDK\src\FDK_qmf_domain.cpp">
+      <Filter>Source Files\libFDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libFDK\src\huff_nodes.cpp">
+      <Filter>Source Files\libFDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libFDK\src\nlc_dec.cpp">
+      <Filter>Source Files\libFDK</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libPCMutils\src\pcm_utils.cpp">
+      <Filter>Source Files\libPCMutils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libPCMutils\src\pcmdmx_lib.cpp">
+      <Filter>Source Files\libPCMutils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_tsd.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_stp.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_smoothing.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_rom.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_reshapeBBEnv.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_qmf.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_process.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_dec_lib.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_dec_conceal.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_dec.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_calcM1andM2.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACdec\src\sac_bitdec.cpp">
+      <Filter>Source Files\libSACdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_vectorfunctions.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_tree.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_staticgain.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_paramextract.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_onsetdetect.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_nlc_enc.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_lib.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_huff_tab.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_framewindowing.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_filter.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_dmx_tdom_enh.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_delay.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSACenc\src\sacenc_bitstream.cpp">
+      <Filter>Source Files\libSACenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSBRdec\src\hbe.cpp">
+      <Filter>Source Files\libSBRdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSBRdec\src\psdec_drm.cpp">
+      <Filter>Source Files\libSBRdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSBRdec\src\psdecrom_drm.cpp">
+      <Filter>Source Files\libSBRdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSBRdec\src\pvc_dec.cpp">
+      <Filter>Source Files\libSBRdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSBRenc\src\sbrenc_ram.cpp">
+      <Filter>Source Files\libSBRenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSBRenc\src\sbrenc_rom.cpp">
+      <Filter>Source Files\libSBRenc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSYS\src\syslib_channelMapDescr.cpp">
+      <Filter>Source Files\libSYS</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libSBRdec\src\HFgen_preFlat.cpp">
+      <Filter>Source Files\libSBRdec</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="libfdk-aac.def">