From d3078c60ec0acb635887a8fecbd78e440ddcbde3 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Tue, 13 Mar 2012 22:56:02 -0500
Subject: [PATCH] update flite to 1.5.4 fixes win64 and kal rate problem

---
 libs/win32/Download FLITE.2008.vcproj         |   8 +-
 libs/win32/Download FLITE.2010.vcxproj        |  10 +-
 libs/win32/flite/flite.2008.vcproj            | 770 ++++++++++--------
 libs/win32/flite/flite.2010.vcxproj           | 405 ++++-----
 libs/win32/flite/flite.2010.vcxproj.filters   | 561 ++++++++-----
 src/mod/asr_tts/mod_flite/Makefile            |   2 +-
 .../asr_tts/mod_flite/mod_flite.2008.vcproj   |  16 +-
 .../asr_tts/mod_flite/mod_flite.2010.vcxproj  |  17 +-
 src/mod/asr_tts/mod_flite/mod_flite.c         |  16 +-
 9 files changed, 1051 insertions(+), 754 deletions(-)

diff --git a/libs/win32/Download FLITE.2008.vcproj b/libs/win32/Download FLITE.2008.vcproj
index 9c2d88a4c2..ebdbf99b89 100644
--- a/libs/win32/Download FLITE.2008.vcproj	
+++ b/libs/win32/Download FLITE.2008.vcproj	
@@ -76,8 +76,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading Flite."
-					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
-					Outputs="$(ProjectDir)..\flite-1.3.99"
+					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.5.4&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;&#x0A;if exist &quot;$(ProjectDir)..\flite-1.5.4-current&quot; move &quot;$(ProjectDir)..\flite-1.5.4-current&quot; &quot;$(ProjectDir)..\flite-1.5.4&quot;&#x0A;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)..\flite-1.5.4"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -86,8 +86,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading Flite."
-					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
-					Outputs="$(ProjectDir)..\flite-1.3.99"
+					CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.5.4&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;&#x0A;if exist &quot;$(ProjectDir)..\flite-1.5.4-current&quot; move &quot;$(ProjectDir)..\flite-1.5.4-current&quot; &quot;$(ProjectDir)..\flite-1.5.4&quot;&#x0A;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)..\flite-1.5.4"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/libs/win32/Download FLITE.2010.vcxproj b/libs/win32/Download FLITE.2010.vcxproj
index d88acb941f..bb63d1f00b 100644
--- a/libs/win32/Download FLITE.2010.vcxproj	
+++ b/libs/win32/Download FLITE.2010.vcxproj	
@@ -66,13 +66,15 @@
     <CustomBuild Include="cleancount">
       <FileType>Document</FileType>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Flite.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-1.5.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 "$(ProjectDir).."
+if exist "$(ProjectDir)..\flite-1.5.4-current" move "$(ProjectDir)..\flite-1.5.4-current" "$(ProjectDir)..\flite-1.5.4"
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-1.3.99;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Flite.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-1.5.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 "$(ProjectDir).."
+if exist "$(ProjectDir)..\flite-1.5.4-current" move "$(ProjectDir)..\flite-1.5.4-current" "$(ProjectDir)..\flite-1.5.4"
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-1.3.99;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/libs/win32/flite/flite.2008.vcproj b/libs/win32/flite/flite.2008.vcproj
index 92c9984d42..22e97211ca 100644
--- a/libs/win32/flite/flite.2008.vcproj
+++ b/libs/win32/flite/flite.2008.vcproj
@@ -4,7 +4,7 @@
 	Version="9.00"
 	Name="flite"
 	ProjectGUID="{0AD1177E-1FD8-4643-9391-431467A11084}"
-	RootNamespace="flite-1.3-current"
+	RootNamespace="flite-1.5.4"
 	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\flite-1.5.4\include&quot;;&quot;..\..\flite-1.5.4\lang\usenglish&quot;;&quot;..\..\flite-1.5.4\lang\cmulex&quot;"
 				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -106,7 +106,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\flite-1.5.4\include&quot;;&quot;..\..\flite-1.5.4\lang\usenglish&quot;;&quot;..\..\flite-1.5.4\lang\cmulex&quot;"
 				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -170,7 +170,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\flite-1.5.4\include&quot;;&quot;..\..\flite-1.5.4\lang\usenglish&quot;;&quot;..\..\flite-1.5.4\lang\cmulex&quot;"
 				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				RuntimeLibrary="2"
@@ -235,7 +235,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\flite-1.3.99\include&quot;;&quot;..\..\flite-1.3.99\lang\usenglish&quot;;&quot;..\..\flite-1.3.99\lang\cmulex&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\flite-1.5.4\include&quot;;&quot;..\..\flite-1.5.4\lang\usenglish&quot;;&quot;..\..\flite-1.5.4\lang\cmulex&quot;"
 				PreprocessorDefinitions="CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				RuntimeLibrary="2"
@@ -282,387 +282,351 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\audio\au_command.c"
+				RelativePath="..\..\flite-1.5.4\src\audio\au_command.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\audio\au_none.c"
+				RelativePath="..\..\flite-1.5.4\src\audio\au_none.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\audio\au_streaming.c"
+				RelativePath="..\..\flite-1.5.4\src\audio\au_streaming.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\audio\au_wince.c"
+				RelativePath="..\..\flite-1.5.4\src\audio\audio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\audio\audio.c"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_lex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\audio\auserver.c"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_lex_data.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_lex.c"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_lex_entries.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_lex_data.c"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_lex_entries.c"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_lts_rules.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_lts_model.c"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_postlex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_lts_rules.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_alloc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_postlex.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_args.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb.c"
+				RelativePath="..\..\flite-1.5.4\src\stats\cst_cart.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="include;lang/usenglish"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="include;lang/usenglish"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="include;lang/usenglish"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="include;lang/usenglish"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_cart.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_cg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_clunits.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_cg_dump_voice.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_lex_entry.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_cg_load_voice.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_lpc.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_cg_map.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_mcep.c"
+				RelativePath="..\..\flite-1.5.4\src\wavesynth\cst_clunits.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal.c"
+				RelativePath="..\..\flite-1.5.4\src\wavesynth\cst_diphone.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_diphone.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_endian.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_lpc.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_error.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_res.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_features.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_residx.c"
+				RelativePath="..\..\flite-1.5.4\src\hrg\cst_ffeature.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_alloc.c"
+				RelativePath="..\..\flite-1.5.4\src\synth\cst_ffeatures.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_args.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_file_stdio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\stats\cst_cart.c"
+				RelativePath="..\..\flite-1.5.4\src\hrg\cst_item.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\cg\cst_cg.c"
+				RelativePath="..\..\flite-1.5.4\src\lexicon\cst_lexicon.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_clunits.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\cst_lpcres.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_diphone.c"
+				RelativePath="..\..\flite-1.5.4\src\lexicon\cst_lts.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_endian.c"
+				RelativePath="..\..\flite-1.5.4\src\lexicon\cst_lts_rewrites.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_error.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_mlpg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_features.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_mlsa.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\hrg\cst_ffeature.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_mmap_win32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\synth\cst_ffeatures.c"
+				RelativePath="..\..\flite-1.5.4\src\synth\cst_phoneset.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_file_stdio.c"
+				RelativePath="..\..\flite-1.5.4\src\wavesynth\cst_reflpc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\hrg\cst_item.c"
+				RelativePath="..\..\flite-1.5.4\src\regex\cst_regex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\lexicon\cst_lexicon.c"
+				RelativePath="..\..\flite-1.5.4\src\hrg\cst_rel_io.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\speech\cst_lpcres.c"
+				RelativePath="..\..\flite-1.5.4\src\hrg\cst_relation.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\lexicon\cst_lts.c"
+				RelativePath="..\..\flite-1.5.4\src\wavesynth\cst_sigpr.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\lexicon\cst_lts_rewrites.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_socket.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlpg.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_spamf0.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlsa.c"
+				RelativePath="..\..\flite-1.5.4\src\stats\cst_ss.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_mmap_win32.c"
+				RelativePath="..\..\flite-1.5.4\src\synth\cst_ssml.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\synth\cst_phoneset.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_string.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_reflpc.c"
+				RelativePath="..\..\flite-1.5.4\src\wavesynth\cst_sts.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\regex\cst_regex.c"
+				RelativePath="..\..\flite-1.5.4\src\synth\cst_synth.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\hrg\cst_rel_io.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_tokenstream.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\hrg\cst_relation.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\cst_track.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_sigpr.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\cst_track_io.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_socket.c"
+				RelativePath="..\..\flite-1.5.4\src\wavesynth\cst_units.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\stats\cst_ss.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_url.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_string.c"
+				RelativePath="..\..\flite-1.5.4\src\synth\cst_utt_utils.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_sts.c"
+				RelativePath="..\..\flite-1.5.4\src\hrg\cst_utterance.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\synth\cst_synth.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_val.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_tokenstream.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_val_const.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\speech\cst_track.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_val_user.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\speech\cst_track_io.c"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_vc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\wavesynth\cst_units.c"
+				RelativePath="..\..\flite-1.5.4\src\stats\cst_viterbi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\synth\cst_utt_utils.c"
+				RelativePath="..\..\flite-1.5.4\src\synth\cst_voice.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\hrg\cst_utterance.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\cst_wave.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_val.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\cst_wave_io.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_val_const.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\cst_wave_utils.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\utils\cst_val_user.c"
+				RelativePath="..\..\flite-1.5.4\src\utils\cst_wchar.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\cg\cst_vc.c"
+				RelativePath="..\..\flite-1.5.4\src\synth\flite.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\stats\cst_viterbi.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\g721.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\synth\cst_voice.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\g723_24.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\speech\cst_wave.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\g723_40.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\speech\cst_wave_io.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\g72x.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\speech\cst_wave_utils.c"
+				RelativePath="..\..\flite-1.5.4\src\speech\rateconv.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\synth\flite.c"
+				RelativePath="..\..\flite-1.5.4\src\regex\regexp.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\speech\rateconv.c"
+				RelativePath="..\..\flite-1.5.4\src\regex\regsub.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\regex\regexp.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_aswd.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\regex\regsub.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_dur_stats.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_aswd.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_dur_stats.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_expand.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_durz_cart.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_f0_model.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_expand.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_f0lr.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_f0_model.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_f0lr.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_gpos.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_ffeatures.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_gpos.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_int_accent_cart.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_int_tone_cart.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_phoneset.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_nums_cart.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_phoneset.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_phrasing_cart.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_text.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_text.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\usenglish.c"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\usenglish.c"
 				>
 			</File>
 		</Filter>
@@ -672,223 +636,231 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmu_lts_model.h"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_lex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmulex\cmulex.h"
+				RelativePath="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_alloc.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_alloc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_args.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_args.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_audio.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_audio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_cart.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_cart.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_cg.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_cg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_clunits.h"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_cg_map.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_diphone.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_clunits.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_endian.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_diphone.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_error.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_endian.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_features.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_error.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_file.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_features.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_hrg.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_ffeatures.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_item.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_file.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_lexicon.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_hrg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_lts.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_item.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_lts_rewrites.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_lexicon.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_math.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_lts.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlpg.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_lts_rewrites.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\cg\cst_mlsa.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_math.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_phoneset.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_phoneset.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_regex.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_regex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_relation.h"
+				RelativePath="..\..\flite-1.5.4\src\regex\cst_regex_defs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_sigpr.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_relation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_socket.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_sigpr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_ss.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_socket.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_string.h"
+				RelativePath="..\..\flite-1.5.4\src\cg\cst_spamf0.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_sts.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_ss.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_synth.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_string.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_tokenstream.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_sts.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_track.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_synth.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_units.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_tokenstream.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_utt_utils.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_track.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_utterance.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_units.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_val.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_utt_utils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_val_const.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_utterance.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_val_defs.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_val.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\cg\cst_vc.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_val_const.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_viterbi.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_val_defs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_voice.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_viterbi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\cst_wave.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_voice.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\include\flite.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_wave.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\src\audio\native_audio.h"
+				RelativePath="..\..\flite-1.5.4\include\cst_wchar.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_durz_cart.h"
+				RelativePath="..\..\flite-1.5.4\include\flite.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_f0.h"
+				RelativePath="..\..\flite-1.5.4\src\speech\g72x.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_ffeatures.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_int_accent_cart.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_f0.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_int_tone_cart.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_nums_cart.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_phrasing_cart.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\us_text.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\usenglish\usenglish.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_time_awb\voxdefs.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h"
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_regexes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\us_text.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\flite-1.5.4\lang\usenglish\usenglish.h"
 				>
 			</File>
 		</Filter>
@@ -899,148 +871,308 @@
 			>
 		</Filter>
 		<Filter
-			Name="sltvoice"
+			Name="voices"
 			>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt.c"
+			<Filter
+				Name="awb"
 				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg.c"
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_cart.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_clunits.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lex_entry.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lpc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_mcep.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_params.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent_params.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_time_awb\voxdefs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_awb\voxdefs.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="kal"
 				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c"
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_diphone.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_lpc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_res.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_residx.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_ressize.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal\voxdefs.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="kal16"
 				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h"
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_diphone.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_lpc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_res.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_residx.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_kal16\voxdefs.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="rms"
 				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c"
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_params.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_voice.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\stdafx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_rms\voxdefs.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="slt"
 				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_params.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_slt\voxdefs.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="awbvoice"
-			>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_params.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_awb\voxdefs.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="rmsvoice"
-			>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_params.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flite-1.3.99\lang\cmu_us_rms\voxdefs.h"
-				>
-			</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_params.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\flite-1.5.4\lang\cmu_us_slt\voxdefs.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/libs/win32/flite/flite.2010.vcxproj b/libs/win32/flite/flite.2010.vcxproj
index f6b0be5e27..aff892f095 100644
--- a/libs/win32/flite/flite.2010.vcxproj
+++ b/libs/win32/flite/flite.2010.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectName>flite</ProjectName>
     <ProjectGuid>{0AD1177E-1FD8-4643-9391-431467A11084}</ProjectGuid>
-    <RootNamespace>flite-1.3-current</RootNamespace>
+    <RootNamespace>flite-1.5.4</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\flite-1.3.99\include;..\..\flite-1.3.99\lang\usenglish;..\..\flite-1.3.99\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\flite-1.5.4\include;..\..\flite-1.5.4\lang\usenglish;..\..\flite-1.5.4\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -83,7 +83,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\flite-1.3.99\include;..\..\flite-1.3.99\lang\usenglish;..\..\flite-1.3.99\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\flite-1.5.4\include;..\..\flite-1.5.4\lang\usenglish;..\..\flite-1.5.4\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\flite-1.3.99\include;..\..\flite-1.3.99\lang\usenglish;..\..\flite-1.3.99\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\flite-1.5.4\include;..\..\flite-1.5.4\lang\usenglish;..\..\flite-1.5.4\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\flite-1.3.99\include;..\..\flite-1.3.99\lang\usenglish;..\..\flite-1.3.99\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\flite-1.5.4\include;..\..\flite-1.5.4\lang\usenglish;..\..\flite-1.5.4\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -122,189 +122,222 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_command.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_none.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_streaming.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_wince.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\audio.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\auserver.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lex.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lex_data.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lex_entries.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lts_model.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lts_rules.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_postlex.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">include;lang/usenglish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">include;lang/usenglish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">include;lang/usenglish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">include;lang/usenglish;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_cart.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_clunits.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_lex_entry.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_lpc.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_mcep.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_diphone.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_lpc.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_res.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_residx.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_alloc.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_args.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\stats\cst_cart.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_cg.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_clunits.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_diphone.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_endian.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_error.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_features.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_ffeature.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_ffeatures.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_file_stdio.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_item.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\lexicon\cst_lexicon.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_lpcres.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\lexicon\cst_lts.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\lexicon\cst_lts_rewrites.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_mlpg.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_mlsa.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_mmap_win32.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_phoneset.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_reflpc.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\regex\cst_regex.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_rel_io.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_relation.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_sigpr.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_socket.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\stats\cst_ss.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_string.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_sts.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_synth.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_tokenstream.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_track.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_track_io.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_units.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_utt_utils.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_utterance.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_val.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_val_const.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_val_user.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_vc.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\stats\cst_viterbi.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_voice.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_wave.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_wave_io.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_wave_utils.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\flite.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\rateconv.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\regex\regexp.c" />
-    <ClCompile Include="..\..\flite-1.3.99\src\regex\regsub.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_aswd.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_dur_stats.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_durz_cart.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_expand.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_f0_model.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_f0lr.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_ffeatures.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_gpos.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_int_accent_cart.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_int_tone_cart.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_nums_cart.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_phoneset.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_phrasing_cart.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_text.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\usenglish.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_params.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_params.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_params.c" />
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_data.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_entries.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_rules.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_postlex.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_clunits.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lex_entry.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lpc.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_mcep.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_diphone.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_lpc.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_res.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_residx.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_diphone.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_lpc.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_res.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_residx.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_ressize.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_voice.cpp" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\usenglish.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_aswd.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_dur_stats.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_expand.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0lr.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0_model.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_gpos.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phoneset.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_text.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\audio.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_command.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_none.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_streaming.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_dump_voice.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_load_voice.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_map.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlpg.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlsa.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_spamf0.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_vc.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_ffeature.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_item.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_relation.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_rel_io.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_utterance.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lexicon.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts_rewrites.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\regex\cst_regex.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\regex\regexp.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\regex\regsub.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_lpcres.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track_io.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_io.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_utils.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g721.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_24.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_40.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g72x.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\rateconv.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_cart.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_ss.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_viterbi.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ffeatures.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_phoneset.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ssml.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_synth.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_utt_utils.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_voice.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\flite.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_alloc.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_args.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_endian.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_error.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_features.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_file_stdio.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_mmap_win32.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_socket.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_string.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_tokenstream.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_url.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_const.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_user.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_wchar.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_clunits.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_diphone.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_reflpc.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_sigpr.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_sts.c" />
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_units.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmulex\cmu_lts_model.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmulex\cmulex.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_alloc.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_args.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_audio.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_cart.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_cg.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_clunits.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_diphone.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_endian.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_error.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_features.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_file.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_hrg.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_item.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_lexicon.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_lts.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_lts_rewrites.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_math.h" />
-    <ClInclude Include="..\..\flite-1.3.99\src\cg\cst_mlpg.h" />
-    <ClInclude Include="..\..\flite-1.3.99\src\cg\cst_mlsa.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_phoneset.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_regex.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_relation.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_sigpr.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_socket.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_ss.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_string.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_sts.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_synth.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_tokenstream.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_track.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_units.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_utt_utils.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_utterance.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_val.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_val_const.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_val_defs.h" />
-    <ClInclude Include="..\..\flite-1.3.99\src\cg\cst_vc.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_viterbi.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_voice.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_wave.h" />
-    <ClInclude Include="..\..\flite-1.3.99\include\flite.h" />
-    <ClInclude Include="..\..\flite-1.3.99\src\audio\native_audio.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_durz_cart.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_f0.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_ffeatures.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_int_accent_cart.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_int_tone_cart.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_nums_cart.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_phrasing_cart.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_text.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\usenglish.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_time_awb\voxdefs.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\voxdefs.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\voxdefs.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.h" />
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\voxdefs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_alloc.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_args.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_audio.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_cart.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_cg.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_clunits.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_diphone.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_endian.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_error.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_features.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_ffeatures.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_file.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_hrg.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_item.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_lexicon.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts_rewrites.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_math.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_phoneset.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_regex.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_relation.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_sigpr.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_socket.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_ss.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_string.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_sts.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_synth.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_tokenstream.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_track.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_units.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_utterance.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_utt_utils.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_val.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_val_const.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_val_defs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_viterbi.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_voice.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_wave.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_wchar.h" />
+    <ClInclude Include="..\..\flite-1.5.4\include\flite.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_time_awb\voxdefs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\voxdefs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal16\voxdefs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal\voxdefs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\stdafx.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\voxdefs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\voxdefs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\usenglish.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_f0.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_regexes.h" />
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_text.h" />
+    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_cg_map.h" />
+    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_spamf0.h" />
+    <ClInclude Include="..\..\flite-1.5.4\src\regex\cst_regex_defs.h" />
+    <ClInclude Include="..\..\flite-1.5.4\src\speech\g72x.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Download FLITE.2010.vcxproj">
diff --git a/libs/win32/flite/flite.2010.vcxproj.filters b/libs/win32/flite/flite.2010.vcxproj.filters
index 6194dbb1d6..979f772242 100644
--- a/libs/win32/flite/flite.2010.vcxproj.filters
+++ b/libs/win32/flite/flite.2010.vcxproj.filters
@@ -1,558 +1,677 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="sltvoice">
-      <UniqueIdentifier>{2e2fca2e-fc24-48cd-bfa0-42ceb5aa5331}</UniqueIdentifier>
+    <Filter Include="voices">
+      <UniqueIdentifier>{8a9db04d-0a7b-47f2-97ed-73acecd51688}</UniqueIdentifier>
     </Filter>
-    <Filter Include="awbvoice">
+    <Filter Include="voices\kal">
+      <UniqueIdentifier>{f4b8438d-32d6-4e75-926b-b3950baf2282}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="voices\awb">
       <UniqueIdentifier>{58f041f5-13f9-4986-aa26-ab41db21c3b1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="rmsvoice">
+    <Filter Include="voices\rms">
       <UniqueIdentifier>{f4db3d58-e9d3-415a-ae41-cc3dd1012fc2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="voices\slt">
+      <UniqueIdentifier>{2e2fca2e-fc24-48cd-bfa0-42ceb5aa5331}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="voices\kal16">
+      <UniqueIdentifier>{29f922d5-330d-49c3-9f8d-5aaada042fe0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_command.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_streaming.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_none.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\audio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_streaming.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_command.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\au_wince.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_none.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\audio.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\audio\auserver.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_rules.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lex.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_postlex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lex_data.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lex_entries.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lts_model.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_entries.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_lts_rules.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_mmap_win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmulex\cmu_postlex.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_string.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_tokenstream.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_cart.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_clunits.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_const.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_lex_entry.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_user.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_lpc.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_wchar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_time_awb\cmu_time_awb_mcep.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_alloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_args.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_diphone.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_endian.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_lpc.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_error.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_res.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_features.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_kal\cmu_us_kal_residx.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_alloc.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_mcep.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_args.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\stats\cst_cart.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_cg.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_clunits.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_clunits.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lex_entry.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_diphone.c">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c">
+      <Filter>voices\slt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_params.c">
+      <Filter>voices\slt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt.c">
+      <Filter>voices\slt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg.c">
+      <Filter>voices\slt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c">
+      <Filter>voices\slt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c">
+      <Filter>voices\slt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c">
+      <Filter>voices\slt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_voice.cpp">
+      <Filter>voices\rms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms.c">
+      <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_endian.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg.c">
+      <Filter>voices\rms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c">
+      <Filter>voices\rms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c">
+      <Filter>voices\rms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c">
+      <Filter>voices\rms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.c">
+      <Filter>voices\rms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_params.c">
+      <Filter>voices\rms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_sigpr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_error.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_sts.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_features.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_units.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_ffeature.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_clunits.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_ffeatures.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_diphone.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_file_stdio.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_reflpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_item.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_utt_utils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\lexicon\cst_lexicon.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_voice.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_lpcres.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\flite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\lexicon\cst_lts.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ffeatures.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\lexicon\cst_lts_rewrites.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_phoneset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_mlpg.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ssml.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_mlsa.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_synth.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_mmap_win32.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_viterbi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_phoneset.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_reflpc.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_ss.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\regex\cst_regex.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_utils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_rel_io.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g72x.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_relation.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g721.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_sigpr.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_24.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_socket.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_40.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\stats\cst_ss.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\rateconv.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_string.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_lpcres.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_sts.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_synth.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_tokenstream.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_track.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_track_io.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\regex\regexp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\wavesynth\cst_units.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\regex\regsub.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_utt_utils.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\regex\cst_regex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\hrg\cst_utterance.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlpg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_val.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlsa.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_val_const.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_vc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\utils\cst_val_user.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\cg\cst_vc.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\stats\cst_viterbi.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_gpos.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\cst_voice.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_wave.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_wave_io.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\cst_wave_utils.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phoneset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\synth\flite.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\speech\rateconv.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\regex\regexp.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_text.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\src\regex\regsub.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\usenglish.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_aswd.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_aswd.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_dur_stats.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_dur_stats.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_durz_cart.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_expand.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_expand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_f0_model.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0_model.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_f0lr.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0lr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_ffeatures.c">
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_params.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_file_stdio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_gpos.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_relation.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_int_accent_cart.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_utterance.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_int_tone_cart.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_ffeature.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_nums_cart.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_item.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_phoneset.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_rel_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_phrasing_cart.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts_rewrites.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\us_text.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lexicon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\usenglish\usenglish.c">
+    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt.c">
-      <Filter>sltvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent_params.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.c">
+      <Filter>voices\awb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c">
+      <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg.c">
-      <Filter>sltvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c">
+      <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c">
-      <Filter>sltvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c">
+      <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c">
-      <Filter>sltvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c">
+      <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.c">
-      <Filter>sltvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c">
+      <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_params.c">
-      <Filter>sltvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c">
+      <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c">
-      <Filter>sltvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_ressize.c">
+      <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb.c">
-      <Filter>awbvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal.c">
+      <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg.c">
-      <Filter>awbvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_diphone.c">
+      <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c">
-      <Filter>awbvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_res.c">
+      <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c">
-      <Filter>awbvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_lpc.c">
+      <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.c">
-      <Filter>awbvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_residx.c">
+      <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_params.c">
-      <Filter>awbvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16.c">
+      <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c">
-      <Filter>awbvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_diphone.c">
+      <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms.c">
-      <Filter>rmsvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_lpc.c">
+      <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg.c">
-      <Filter>rmsvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_res.c">
+      <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c">
-      <Filter>rmsvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_residx.c">
+      <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c">
-      <Filter>rmsvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_spamf0.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_load_voice.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_dump_voice.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.c">
-      <Filter>rmsvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_map.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_params.c">
-      <Filter>rmsvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_url.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c">
-      <Filter>rmsvoice</Filter>
+    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_socket.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmulex\cmu_lts_model.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmulex\cmulex.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_alloc.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_time_awb\voxdefs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_args.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h">
+      <Filter>voices\slt</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\voxdefs.h">
+      <Filter>voices\slt</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h">
+      <Filter>voices\slt</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h">
+      <Filter>voices\slt</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h">
+      <Filter>voices\rms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.h">
+      <Filter>voices\rms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\stdafx.h">
+      <Filter>voices\rms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\voxdefs.h">
+      <Filter>voices\rms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h">
+      <Filter>voices\rms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\src\speech\g72x.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_audio.h">
+    <ClInclude Include="..\..\flite-1.5.4\src\regex\cst_regex_defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_cart.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_cg.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_regexes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_clunits.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_diphone.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\usenglish.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_endian.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_error.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_f0.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_features.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_file.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_hrg.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_item.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_lexicon.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_lts.h">
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h">
+      <Filter>voices\awb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\voxdefs.h">
+      <Filter>voices\awb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h">
+      <Filter>voices\awb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_val_const.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_lts_rewrites.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_val_defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_math.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_viterbi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\src\cg\cst_mlpg.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_voice.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\src\cg\cst_mlsa.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_wave.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_phoneset.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_wchar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_regex.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\flite.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_relation.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_alloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_sigpr.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_args.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_socket.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_ss.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_string.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_cg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_sts.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_clunits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_synth.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_diphone.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_tokenstream.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_endian.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_track.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_error.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_units.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_features.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_utt_utils.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_ffeatures.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_utterance.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_file.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_val.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_hrg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_val_const.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_item.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_val_defs.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_lexicon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\src\cg\cst_vc.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_viterbi.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts_rewrites.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_voice.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_math.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\cst_wave.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_phoneset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\include\flite.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_regex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\src\audio\native_audio.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_relation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_durz_cart.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_sigpr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_f0.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_socket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_ffeatures.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_ss.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_int_accent_cart.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_string.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_int_tone_cart.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_sts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_nums_cart.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_synth.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_phrasing_cart.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_tokenstream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\us_text.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_track.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\usenglish\usenglish.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_units.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_time_awb\voxdefs.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_utt_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_kal\voxdefs.h">
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_utterance.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h">
-      <Filter>sltvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\include\cst_val.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h">
-      <Filter>sltvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h">
+      <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\cmu_us_slt_cg_mcep_trees.h">
-      <Filter>sltvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h">
+      <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_slt\voxdefs.h">
-      <Filter>sltvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h">
+      <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h">
-      <Filter>awbvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h">
+      <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h">
-      <Filter>awbvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h">
+      <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\cmu_us_awb_cg_mcep_trees.h">
-      <Filter>awbvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h">
+      <Filter>voices\slt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_awb\voxdefs.h">
-      <Filter>awbvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h">
+      <Filter>voices\slt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h">
-      <Filter>rmsvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal\voxdefs.h">
+      <Filter>voices\kal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h">
-      <Filter>rmsvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal16\voxdefs.h">
+      <Filter>voices\kal16</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\cmu_us_rms_cg_mcep_trees.h">
-      <Filter>rmsvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_cg_map.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.3.99\lang\cmu_us_rms\voxdefs.h">
-      <Filter>rmsvoice</Filter>
+    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_spamf0.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/mod/asr_tts/mod_flite/Makefile b/src/mod/asr_tts/mod_flite/Makefile
index cdb2137f14..4352a5ba69 100644
--- a/src/mod/asr_tts/mod_flite/Makefile
+++ b/src/mod/asr_tts/mod_flite/Makefile
@@ -1,4 +1,4 @@
-FLITE=flite-1.5.1
+FLITE=flite-1.5.4
 
 FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)-current
 FLITE_BUILDDIR=$(switch_builddir)/libs/$(FLITE)-current
diff --git a/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj b/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
index 53fdaadb08..23758c9191 100644
--- a/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
+++ b/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				PreprocessorDefinitions="APT_LIB_EXPORT"
 				UsePrecompiledHeader="0"
 			/>
@@ -108,7 +108,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				PreprocessorDefinitions="APT_LIB_EXPORT"
 				UsePrecompiledHeader="0"
 			/>
@@ -175,7 +175,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				PreprocessorDefinitions="APT_LIB_EXPORT"
 				UsePrecompiledHeader="0"
 			/>
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				PreprocessorDefinitions="APT_LIB_EXPORT"
 				UsePrecompiledHeader="0"
 			/>
@@ -308,7 +308,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -375,7 +375,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -440,7 +440,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -507,7 +507,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include"
+				AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
diff --git a/src/mod/asr_tts/mod_flite/mod_flite.2010.vcxproj b/src/mod/asr_tts/mod_flite/mod_flite.2010.vcxproj
index 7ffe03ca40..83125c88ae 100644
--- a/src/mod/asr_tts/mod_flite/mod_flite.2010.vcxproj
+++ b/src/mod/asr_tts/mod_flite/mod_flite.2010.vcxproj
@@ -120,7 +120,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -137,7 +137,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -152,7 +152,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -170,7 +170,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -186,7 +186,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -203,7 +203,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -218,7 +218,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -235,7 +235,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -258,7 +258,6 @@
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\libs\win32\flite\flite.2010.vcxproj">
       <Project>{0ad1177e-1fd8-4643-9391-431467a11084}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
diff --git a/src/mod/asr_tts/mod_flite/mod_flite.c b/src/mod/asr_tts/mod_flite/mod_flite.c
index cd4bbfa66a..079818af07 100644
--- a/src/mod/asr_tts/mod_flite/mod_flite.c
+++ b/src/mod/asr_tts/mod_flite/mod_flite.c
@@ -44,6 +44,10 @@ void unregister_cmu_us_rms(cst_voice * v);
 cst_voice *register_cmu_us_slt(void);
 void unregister_cmu_us_slt(cst_voice * v);
 
+cst_voice *register_cmu_us_kal16(void);
+void unregister_cmu_us_kal16(cst_voice * v);
+
+
 SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown);
 SWITCH_MODULE_DEFINITION(mod_flite, mod_flite_load, mod_flite_shutdown, NULL);
@@ -53,6 +57,7 @@ static struct {
 	cst_voice *kal;
 	cst_voice *rms;
 	cst_voice *slt;
+	cst_voice *kal16;
 } globals;
 
 struct flite_data {
@@ -75,13 +80,18 @@ static switch_status_t flite_speech_open(switch_speech_handle_t *sh, const char
 	if (!strcasecmp(voice_name, "awb")) {
 		flite->v = globals.awb;
 	} else if (!strcasecmp(voice_name, "kal")) {
-		flite->v = globals.kal;
+/*  "kal" is 8kHz and the native rate is set to 16kHz
+ *  so kal talks a little bit too fast ...
+ *  for now: "symlink" kal to kal16
+ */		flite->v = globals.kal16;
 	} else if (!strcasecmp(voice_name, "rms")) {
 		flite->v = globals.rms;
 	} else if (!strcasecmp(voice_name, "slt")) {
 		flite->v = globals.slt;
+	} else if (!strcasecmp(voice_name, "kal16")) {
+		flite->v = globals.kal16;
 	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Valid voice names are awb, kal, rms or slt.\n");
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Valid voice names are awb, rms, slt or kal.\n");
 	}
 
 	if (flite->v) {
@@ -179,6 +189,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load)
 	globals.kal = register_cmu_us_kal();
 	globals.rms = register_cmu_us_rms();
 	globals.slt = register_cmu_us_slt();
+	globals.kal16 = register_cmu_us_kal16();
 
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
@@ -203,6 +214,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown)
 	unregister_cmu_us_kal(globals.kal);
 	unregister_cmu_us_rms(globals.rms);
 	unregister_cmu_us_slt(globals.slt);
+	unregister_cmu_us_kal16(globals.kal16);
 
 	return SWITCH_STATUS_UNLOAD;
 }