diff --git a/libs/spandsp/src/libspandsp.vcproj b/libs/spandsp/src/libspandsp.vcproj
index 160d7b980e..cc7f9420ff 100644
--- a/libs/spandsp/src/libspandsp.vcproj
+++ b/libs/spandsp/src/libspandsp.vcproj
@@ -64,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-				ModuleDefinitionFile="src/msvc/spandsp.def"
+				ModuleDefinitionFile="./msvc/spandsp.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -138,7 +138,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				ModuleDefinitionFile="src/msvc/spandsp.def"
+				ModuleDefinitionFile="./msvc/spandsp.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -178,208 +178,814 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-<File RelativePath="adsi.c"></File>
-<File RelativePath="async.c"></File>
-<File RelativePath="at_interpreter.c"></File>
-<File RelativePath="awgn.c"></File>
-<File RelativePath="bell_r2_mf.c"></File>
-<File RelativePath="bert.c"></File>
-<File RelativePath="bit_operations.c"></File>
-<File RelativePath="bitstream.c"></File>
-<File RelativePath="complex_filters.c"></File>
-<File RelativePath="complex_vector_float.c"></File>
-<File RelativePath="complex_vector_int.c"></File>
-<File RelativePath="crc.c"></File>
-<File RelativePath="dds_float.c"></File>
-<File RelativePath="dds_int.c"></File>
-<File RelativePath="dtmf.c"></File>
-<File RelativePath="echo.c"></File>
-<File RelativePath="fax.c"></File>
-<File RelativePath="fsk.c"></File>
-<File RelativePath="g711.c"></File>
-<File RelativePath="g722.c"></File>
-<File RelativePath="g726.c"></File>
-<File RelativePath="gsm0610_decode.c"></File>
-<File RelativePath="gsm0610_encode.c"></File>
-<File RelativePath="gsm0610_long_term.c"></File>
-<File RelativePath="gsm0610_lpc.c"></File>
-<File RelativePath="gsm0610_preprocess.c"></File>
-<File RelativePath="gsm0610_rpe.c"></File>
-<File RelativePath="gsm0610_short_term.c"></File>
-<File RelativePath="hdlc.c"></File>
-<File RelativePath="ima_adpcm.c"></File>
-<File RelativePath="logging.c"></File>
-<File RelativePath="lpc10_analyse.c"></File>
-<File RelativePath="lpc10_decode.c"></File>
-<File RelativePath="lpc10_encode.c"></File>
-<File RelativePath="lpc10_placev.c"></File>
-<File RelativePath="lpc10_voicing.c"></File>
-<File RelativePath="modem_echo.c"></File>
-<File RelativePath="modem_connect_tones.c"></File>
-<File RelativePath="noise.c"></File>
-<File RelativePath="oki_adpcm.c"></File>
-<File RelativePath="playout.c"></File>
-<File RelativePath="plc.c"></File>
-<File RelativePath="power_meter.c"></File>
-<File RelativePath="queue.c"></File>
-<File RelativePath="schedule.c"></File>
-<File RelativePath="sig_tone.c"></File>
-<File RelativePath="silence_gen.c"></File>
-<File RelativePath="super_tone_rx.c"></File>
-<File RelativePath="super_tone_tx.c"></File>
-<File RelativePath="t4.c"></File>
-<File RelativePath="t30.c"></File>
-<File RelativePath="t30_api.c"></File>
-<File RelativePath="t30_logging.c"></File>
-<File RelativePath="t31.c"></File>
-<File RelativePath="t35.c"></File>
-<File RelativePath="t38_core.c"></File>
-<File RelativePath="t38_gateway.c"></File>
-<File RelativePath="t38_non_ecm_buffer.c"></File>
-<File RelativePath="t38_terminal.c"></File>
-<File RelativePath="testcpuid.c"></File>
-<File RelativePath="time_scale.c"></File>
-<File RelativePath="tone_detect.c"></File>
-<File RelativePath="tone_generate.c"></File>
-<File RelativePath="v17rx.c"></File>
-<File RelativePath="v17tx.c"></File>
-<File RelativePath="v22bis_rx.c"></File>
-<File RelativePath="v22bis_tx.c"></File>
-<File RelativePath="v27ter_rx.c"></File>
-<File RelativePath="v27ter_tx.c"></File>
-<File RelativePath="v29rx.c"></File>
-<File RelativePath="v29tx.c"></File>
-<File RelativePath="v42.c"></File>
-<File RelativePath="v42bis.c"></File>
-<File RelativePath="v8.c"></File>
-<File RelativePath="vector_float.c"></File>
-<File RelativePath="vector_int.c"></File>
-<File RelativePath="msvc/gettimeofday.c"></File>
-</Filter><Filter  Name="Header Files">
-<File RelativePath="spandsp/adsi.h"></File>
-<File RelativePath="spandsp/async.h"></File>
-<File RelativePath="spandsp/arctan2.h"></File>
-<File RelativePath="spandsp/at_interpreter.h"></File>
-<File RelativePath="spandsp/awgn.h"></File>
-<File RelativePath="spandsp/bell_r2_mf.h"></File>
-<File RelativePath="spandsp/bert.h"></File>
-<File RelativePath="spandsp/biquad.h"></File>
-<File RelativePath="spandsp/bit_operations.h"></File>
-<File RelativePath="spandsp/bitstream.h"></File>
-<File RelativePath="spandsp/crc.h"></File>
-<File RelativePath="spandsp/complex.h"></File>
-<File RelativePath="spandsp/complex_filters.h"></File>
-<File RelativePath="spandsp/complex_vector_float.h"></File>
-<File RelativePath="spandsp/complex_vector_int.h"></File>
-<File RelativePath="spandsp/dc_restore.h"></File>
-<File RelativePath="spandsp/dds.h"></File>
-<File RelativePath="spandsp/dtmf.h"></File>
-<File RelativePath="spandsp/echo.h"></File>
-<File RelativePath="spandsp/fax.h"></File>
-<File RelativePath="spandsp/fax_modems.h"></File>
-<File RelativePath="spandsp/fir.h"></File>
-<File RelativePath="spandsp/fsk.h"></File>
-<File RelativePath="spandsp/g168models.h"></File>
-<File RelativePath="spandsp/g711.h"></File>
-<File RelativePath="spandsp/g722.h"></File>
-<File RelativePath="spandsp/g726.h"></File>
-<File RelativePath="spandsp/gsm0610.h"></File>
-<File RelativePath="spandsp/hdlc.h"></File>
-<File RelativePath="spandsp/ima_adpcm.h"></File>
-<File RelativePath="spandsp/logging.h"></File>
-<File RelativePath="spandsp/lpc10.h"></File>
-<File RelativePath="spandsp/modem_echo.h"></File>
-<File RelativePath="spandsp/modem_connect_tones.h"></File>
-<File RelativePath="spandsp/noise.h"></File>
-<File RelativePath="spandsp/oki_adpcm.h"></File>
-<File RelativePath="spandsp/playout.h"></File>
-<File RelativePath="spandsp/plc.h"></File>
-<File RelativePath="spandsp/power_meter.h"></File>
-<File RelativePath="spandsp/queue.h"></File>
-<File RelativePath="spandsp/saturated.h"></File>
-<File RelativePath="spandsp/schedule.h"></File>
-<File RelativePath="spandsp/sig_tone.h"></File>
-<File RelativePath="spandsp/silence_gen.h"></File>
-<File RelativePath="spandsp/super_tone_rx.h"></File>
-<File RelativePath="spandsp/super_tone_tx.h"></File>
-<File RelativePath="spandsp/t4.h"></File>
-<File RelativePath="spandsp/t30.h"></File>
-<File RelativePath="spandsp/t30_api.h"></File>
-<File RelativePath="spandsp/t30_fcf.h"></File>
-<File RelativePath="spandsp/t30_logging.h"></File>
-<File RelativePath="spandsp/t31.h"></File>
-<File RelativePath="spandsp/t35.h"></File>
-<File RelativePath="spandsp/t38_core.h"></File>
-<File RelativePath="spandsp/t38_gateway.h"></File>
-<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File>
-<File RelativePath="spandsp/t38_terminal.h"></File>
-<File RelativePath="spandsp/telephony.h"></File>
-<File RelativePath="spandsp/time_scale.h"></File>
-<File RelativePath="spandsp/timing.h"></File>
-<File RelativePath="spandsp/tone_detect.h"></File>
-<File RelativePath="spandsp/tone_generate.h"></File>
-<File RelativePath="spandsp/v17rx.h"></File>
-<File RelativePath="spandsp/v17tx.h"></File>
-<File RelativePath="spandsp/v22bis.h"></File>
-<File RelativePath="spandsp/v27ter_rx.h"></File>
-<File RelativePath="spandsp/v27ter_tx.h"></File>
-<File RelativePath="spandsp/v29rx.h"></File>
-<File RelativePath="spandsp/v29tx.h"></File>
-<File RelativePath="spandsp/v42.h"></File>
-<File RelativePath="spandsp/v42bis.h"></File>
-<File RelativePath="spandsp/v8.h"></File>
-<File RelativePath="spandsp/vector_float.h"></File>
-<File RelativePath="spandsp/vector_int.h"></File>
-<File RelativePath="spandsp/version.h"></File>
-<File RelativePath="spandsp/private/adsi.h"></File>
-<File RelativePath="spandsp/private/async.h"></File>
-<File RelativePath="spandsp/private/at_interpreter.h"></File>
-<File RelativePath="spandsp/private/awgn.h"></File>
-<File RelativePath="spandsp/private/bell_r2_mf.h"></File>
-<File RelativePath="spandsp/private/bert.h"></File>
-<File RelativePath="spandsp/private/bitstream.h"></File>
-<File RelativePath="spandsp/private/dtmf.h"></File>
-<File RelativePath="spandsp/private/fax.h"></File>
-<File RelativePath="spandsp/private/fax_modems.h"></File>
-<File RelativePath="spandsp/private/fsk.h"></File>
-<File RelativePath="spandsp/private/g711.h"></File>
-<File RelativePath="spandsp/private/g722.h"></File>
-<File RelativePath="spandsp/private/g726.h"></File>
-<File RelativePath="spandsp/private/gsm0610.h"></File>
-<File RelativePath="spandsp/private/hdlc.h"></File>
-<File RelativePath="spandsp/private/ima_adpcm.h"></File>
-<File RelativePath="spandsp/private/logging.h"></File>
-<File RelativePath="spandsp/private/lpc10.h"></File>
-<File RelativePath="spandsp/private/modem_connect_tones.h"></File>
-<File RelativePath="spandsp/private/noise.h"></File>
-<File RelativePath="spandsp/private/oki_adpcm.h"></File>
-<File RelativePath="spandsp/private/queue.h"></File>
-<File RelativePath="spandsp/private/schedule.h"></File>
-<File RelativePath="spandsp/private/sig_tone.h"></File>
-<File RelativePath="spandsp/private/super_tone_rx.h"></File>
-<File RelativePath="spandsp/private/super_tone_tx.h"></File>
-<File RelativePath="spandsp/private/t30.h"></File>
-<File RelativePath="spandsp/private/t31.h"></File>
-<File RelativePath="spandsp/private/t38_core.h"></File>
-<File RelativePath="spandsp/private/t38_gateway.h"></File>
-<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File>
-<File RelativePath="spandsp/private/t38_terminal.h"></File>
-<File RelativePath="spandsp/private/t4.h"></File>
-<File RelativePath="spandsp/private/time_scale.h"></File>
-<File RelativePath="spandsp/private/tone_detect.h"></File>
-<File RelativePath="spandsp/private/tone_generate.h"></File>
-<File RelativePath="spandsp/private/v17rx.h"></File>
-<File RelativePath="spandsp/private/v17tx.h"></File>
-<File RelativePath="spandsp/private/v22bis.h"></File>
-<File RelativePath="spandsp/private/v27ter_rx.h"></File>
-<File RelativePath="spandsp/private/v27ter_tx.h"></File>
-<File RelativePath="spandsp/private/v29rx.h"></File>
-<File RelativePath="spandsp/private/v29tx.h"></File>
-<File RelativePath="spandsp/private/v42.h"></File>
-<File RelativePath="spandsp/private/v42bis.h"></File>
-<File RelativePath="spandsp/private/v8.h"></File>
-<File RelativePath="spandsp/expose.h"></File>
-<File RelativePath="spandsp.h"></File>
+			<File
+				RelativePath="adsi.c"
+				>
+			</File>
+			<File
+				RelativePath="async.c"
+				>
+			</File>
+			<File
+				RelativePath="at_interpreter.c"
+				>
+			</File>
+			<File
+				RelativePath="awgn.c"
+				>
+			</File>
+			<File
+				RelativePath="bell_r2_mf.c"
+				>
+			</File>
+			<File
+				RelativePath="bert.c"
+				>
+			</File>
+			<File
+				RelativePath="bit_operations.c"
+				>
+			</File>
+			<File
+				RelativePath="bitstream.c"
+				>
+			</File>
+			<File
+				RelativePath="complex_filters.c"
+				>
+			</File>
+			<File
+				RelativePath="complex_vector_float.c"
+				>
+			</File>
+			<File
+				RelativePath="complex_vector_int.c"
+				>
+			</File>
+			<File
+				RelativePath="crc.c"
+				>
+			</File>
+			<File
+				RelativePath="dds_float.c"
+				>
+			</File>
+			<File
+				RelativePath="dds_int.c"
+				>
+			</File>
+			<File
+				RelativePath="dtmf.c"
+				>
+			</File>
+			<File
+				RelativePath="echo.c"
+				>
+			</File>
+			<File
+				RelativePath="fax.c"
+				>
+			</File>
+			<File
+				RelativePath="fsk.c"
+				>
+			</File>
+			<File
+				RelativePath="g711.c"
+				>
+			</File>
+			<File
+				RelativePath="g722.c"
+				>
+			</File>
+			<File
+				RelativePath="g726.c"
+				>
+			</File>
+			<File
+				RelativePath=".\msvc\gettimeofday.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_decode.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_encode.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_long_term.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_lpc.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_preprocess.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_rpe.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_short_term.c"
+				>
+			</File>
+			<File
+				RelativePath="hdlc.c"
+				>
+			</File>
+			<File
+				RelativePath="ima_adpcm.c"
+				>
+			</File>
+			<File
+				RelativePath="logging.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_analyse.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_decode.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_encode.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_placev.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_voicing.c"
+				>
+			</File>
+			<File
+				RelativePath="modem_connect_tones.c"
+				>
+			</File>
+			<File
+				RelativePath="modem_echo.c"
+				>
+			</File>
+			<File
+				RelativePath="noise.c"
+				>
+			</File>
+			<File
+				RelativePath="oki_adpcm.c"
+				>
+			</File>
+			<File
+				RelativePath="playout.c"
+				>
+			</File>
+			<File
+				RelativePath="plc.c"
+				>
+			</File>
+			<File
+				RelativePath="power_meter.c"
+				>
+			</File>
+			<File
+				RelativePath="queue.c"
+				>
+			</File>
+			<File
+				RelativePath="schedule.c"
+				>
+			</File>
+			<File
+				RelativePath="sig_tone.c"
+				>
+			</File>
+			<File
+				RelativePath="silence_gen.c"
+				>
+			</File>
+			<File
+				RelativePath="super_tone_rx.c"
+				>
+			</File>
+			<File
+				RelativePath="super_tone_tx.c"
+				>
+			</File>
+			<File
+				RelativePath="t30.c"
+				>
+			</File>
+			<File
+				RelativePath="t30_api.c"
+				>
+			</File>
+			<File
+				RelativePath="t30_logging.c"
+				>
+			</File>
+			<File
+				RelativePath="t31.c"
+				>
+			</File>
+			<File
+				RelativePath="t35.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_core.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_gateway.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_non_ecm_buffer.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_terminal.c"
+				>
+			</File>
+			<File
+				RelativePath="t4.c"
+				>
+			</File>
+			<File
+				RelativePath="testcpuid.c"
+				>
+			</File>
+			<File
+				RelativePath="time_scale.c"
+				>
+			</File>
+			<File
+				RelativePath="tone_detect.c"
+				>
+			</File>
+			<File
+				RelativePath="tone_generate.c"
+				>
+			</File>
+			<File
+				RelativePath="v17rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v17tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v22bis_rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v22bis_tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v27ter_rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v27ter_tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v29rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v29tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v42.c"
+				>
+			</File>
+			<File
+				RelativePath="v42bis.c"
+				>
+			</File>
+			<File
+				RelativePath="v8.c"
+				>
+			</File>
+			<File
+				RelativePath="vector_float.c"
+				>
+			</File>
+			<File
+				RelativePath="vector_int.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="spandsp.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/adsi.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/arctan2.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/async.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/at_interpreter.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/awgn.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bell_r2_mf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bert.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/biquad.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bit_operations.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bitstream.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex_filters.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex_vector_float.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex_vector_int.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/crc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/dc_restore.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/dds.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/dtmf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/echo.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/expose.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fax.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fax_modems.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fir.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fsk.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g168models.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g711.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g722.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g726.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/gsm0610.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/hdlc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/ima_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/logging.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/lpc10.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/modem_connect_tones.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/modem_echo.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/noise.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/oki_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/playout.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/plc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/power_meter.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/adsi.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/async.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/at_interpreter.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/awgn.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/bell_r2_mf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/bert.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/bitstream.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/dtmf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/fax.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/fax_modems.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/fsk.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/g711.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/g722.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/g726.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/gsm0610.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/hdlc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/ima_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/logging.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/lpc10.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/modem_connect_tones.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/noise.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/oki_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/queue.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/schedule.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/sig_tone.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/super_tone_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/super_tone_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t30.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t31.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_core.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_gateway.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_non_ecm_buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_terminal.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t4.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/time_scale.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/tone_detect.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/tone_generate.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v17rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v17tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v22bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v27ter_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v27ter_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v29rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v29tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v42.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v42bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v8.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/queue.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/saturated.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/schedule.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/sig_tone.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/silence_gen.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/super_tone_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/super_tone_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30_api.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30_fcf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30_logging.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t31.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t35.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_core.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_gateway.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_non_ecm_buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_terminal.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t4.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/telephony.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/time_scale.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/timing.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/tone_detect.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/tone_generate.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v17rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v17tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v22bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v27ter_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v27ter_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v29rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v29tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v42.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v42bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v8.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/vector_float.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/vector_int.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/version.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -388,7 +994,7 @@
 			>
 		</Filter>
 		<File
-			RelativePath=".\src\msvc\spandsp.def"
+			RelativePath=".\msvc\spandsp.def"
 			>
 		</File>
 	</Files>