diff --git a/libs/win32/Download FLITE.2010.vcxproj b/libs/win32/Download FLITE.2010.vcxproj
index d7690645b0..b8deca0e06 100644
--- a/libs/win32/Download FLITE.2010.vcxproj	
+++ b/libs/win32/Download FLITE.2010.vcxproj	
@@ -67,15 +67,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.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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-2.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2 "$(ProjectDir).."
+if exist "$(ProjectDir)..\flite-2.0.0-release" move "$(ProjectDir)..\flite-2.0.0-release" "$(ProjectDir)..\flite-2.0.0"
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-2.0.0;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Flite.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|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 Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\flite-2.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2 "$(ProjectDir).."
+if exist "$(ProjectDir)..\flite-2.0.0-release" move "$(ProjectDir)..\flite-2.0.0-release" "$(ProjectDir)..\flite-2.0.0"
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-2.0.0;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/libs/win32/Download FLITE.2012.vcxproj b/libs/win32/Download FLITE.2012.vcxproj
index eea3006edf..bcb056f5dc 100644
--- a/libs/win32/Download FLITE.2012.vcxproj	
+++ b/libs/win32/Download FLITE.2012.vcxproj	
@@ -69,15 +69,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.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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-2.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2 "$(ProjectDir).."
+if exist "$(ProjectDir)..\flite-2.0.0-release" move "$(ProjectDir)..\flite-2.0.0-release" "$(ProjectDir)..\flite-2.0.0"
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-2.0.0;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Flite.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|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 Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\flite-2.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2 "$(ProjectDir).."
+if exist "$(ProjectDir)..\flite-2.0.0-release" move "$(ProjectDir)..\flite-2.0.0-release" "$(ProjectDir)..\flite-2.0.0"
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-2.0.0;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/libs/win32/flite/flite.2010.vcxproj b/libs/win32/flite/flite.2010.vcxproj
index aff892f095..05df1b7165 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.5.4</RootNamespace>
+    <RootNamespace>flite-2.0.0</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -68,8 +68,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -83,8 +83,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,8 +96,8 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -112,8 +112,8 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -122,222 +122,222 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <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" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_data.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_entries.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_rules.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_postlex.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_clunits.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lex_entry.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_mcep.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_diphone.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_lpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_res.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_residx.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_diphone.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_lpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_res.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_residx.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_ressize.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_voice.cpp" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\usenglish.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_aswd.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_dur_stats.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_expand.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0lr.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0_model.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_gpos.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phoneset.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_text.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\audio.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_command.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_none.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_streaming.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_dump_voice.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_load_voice.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_map.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlpg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlsa.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_spamf0.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_vc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_ffeature.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_item.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_relation.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_rel_io.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_utterance.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lexicon.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts_rewrites.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\cst_regex.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regexp.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regsub.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_lpcres.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track_io.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_io.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_utils.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g721.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_24.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_40.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g72x.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\rateconv.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_ss.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_viterbi.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ffeatures.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_phoneset.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ssml.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_synth.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_utt_utils.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_voice.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\flite.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_alloc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_args.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_endian.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_error.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_features.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_file_stdio.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_mmap_win32.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_socket.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_string.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_tokenstream.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_url.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_const.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_user.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_wchar.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_clunits.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_diphone.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_reflpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sigpr.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sts.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_units.c" />
   </ItemGroup>
   <ItemGroup>
-    <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" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_alloc.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_args.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_audio.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cg.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_clunits.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_diphone.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_endian.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_error.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_features.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ffeatures.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_file.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_hrg.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_item.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lexicon.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts_rewrites.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_math.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_phoneset.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_regex.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_relation.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sigpr.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_socket.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ss.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_string.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sts.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_synth.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_tokenstream.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_track.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_units.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utterance.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utt_utils.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_const.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_defs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_viterbi.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_voice.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wave.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wchar.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\flite.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_time_awb\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal16\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\stdafx.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\usenglish.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_f0.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_regexes.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_text.h" />
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_cg_map.h" />
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_spamf0.h" />
+    <ClInclude Include="..\..\flite-2.0.0\src\regex\cst_regex_defs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\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 979f772242..566f7a7158 100644
--- a/libs/win32/flite/flite.2010.vcxproj.filters
+++ b/libs/win32/flite/flite.2010.vcxproj.filters
@@ -29,648 +29,648 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_streaming.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_streaming.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\audio.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\audio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_command.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_command.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_none.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_none.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_rules.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_rules.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_postlex.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_postlex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_data.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_entries.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_entries.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_mmap_win32.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_mmap_win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_string.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_string.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_tokenstream.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_tokenstream.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_const.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_const.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_user.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_user.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_wchar.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_wchar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_alloc.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_alloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_args.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_args.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_endian.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_endian.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_error.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_error.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_features.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_features.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_mcep.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_mcep.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_clunits.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_clunits.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lex_entry.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lex_entry.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sigpr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_sts.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sts.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_units.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_units.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_clunits.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_clunits.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_diphone.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_diphone.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_reflpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_reflpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_utt_utils.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_utt_utils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_voice.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_voice.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\flite.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\flite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ffeatures.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ffeatures.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_phoneset.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_phoneset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ssml.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ssml.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_synth.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_synth.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_viterbi.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_viterbi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_ss.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_ss.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_utils.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_utils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g72x.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g72x.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g721.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g721.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_24.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_24.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_40.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_40.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\rateconv.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\rateconv.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_lpcres.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_lpcres.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track_io.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_io.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\regex\regexp.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regexp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\regex\regsub.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regsub.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\regex\cst_regex.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\cst_regex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlpg.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlpg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlsa.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlsa.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_vc.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_vc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_gpos.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_gpos.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phoneset.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phoneset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_text.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_text.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\usenglish.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\usenglish.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_aswd.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_aswd.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_dur_stats.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_dur_stats.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_expand.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_expand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0_model.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0_model.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0lr.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0lr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_file_stdio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_relation.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_relation.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_utterance.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_utterance.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_ffeature.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_ffeature.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_item.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_item.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_rel_io.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_rel_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts_rewrites.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts_rewrites.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lexicon.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lexicon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c">
       <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c">
       <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c">
       <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_ressize.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_ressize.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_diphone.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_diphone.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_res.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_res.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_lpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_lpc.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_residx.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_residx.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_diphone.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_diphone.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_lpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_lpc.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_res.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_res.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_residx.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_residx.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_spamf0.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_spamf0.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_load_voice.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_dump_voice.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_map.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_url.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_url.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_socket.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_socket.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_time_awb\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_time_awb\voxdefs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\stdafx.h">
       <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\src\speech\g72x.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\src\regex\cst_regex_defs.h">
+    <ClInclude Include="..\..\flite-2.0.0\src\regex\cst_regex_defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_regexes.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_regexes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_text.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\usenglish.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\usenglish.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_f0.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_f0.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_const.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_val_defs.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_viterbi.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_viterbi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_voice.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_voice.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_wave.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wave.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_wchar.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wchar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\flite.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\flite.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_alloc.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_alloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_args.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_args.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_audio.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_cg.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_clunits.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_clunits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_diphone.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_diphone.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_endian.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_endian.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_error.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_error.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_features.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_features.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_ffeatures.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ffeatures.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_file.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_file.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_hrg.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_hrg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_item.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_item.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_lexicon.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lexicon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts_rewrites.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts_rewrites.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_math.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_math.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_phoneset.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_phoneset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_regex.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_regex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_relation.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_relation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_sigpr.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sigpr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_socket.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_socket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_ss.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ss.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_string.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_string.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_sts.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_synth.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_synth.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_tokenstream.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_tokenstream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_track.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_track.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_units.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_units.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_utt_utils.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utt_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_utterance.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utterance.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_val.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h">
       <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h">
       <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h">
       <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h">
       <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h">
       <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h">
       <Filter>voices\slt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h">
       <Filter>voices\slt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal\voxdefs.h">
       <Filter>voices\kal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal16\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal16\voxdefs.h">
       <Filter>voices\kal16</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_cg_map.h">
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_cg_map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_spamf0.h">
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_spamf0.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libs/win32/flite/flite.2012.vcxproj b/libs/win32/flite/flite.2012.vcxproj
index d69896fd68..de1fd32959 100644
--- a/libs/win32/flite/flite.2012.vcxproj
+++ b/libs/win32/flite/flite.2012.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectName>flite</ProjectName>
     <ProjectGuid>{0AD1177E-1FD8-4643-9391-431467A11084}</ProjectGuid>
-    <RootNamespace>flite-1.5.4</RootNamespace>
+    <RootNamespace>flite-2.0.0</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -72,8 +72,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -87,8 +87,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -100,8 +100,8 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -116,8 +116,8 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <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>
+      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -126,222 +126,222 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <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" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_data.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_entries.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_rules.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_postlex.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_clunits.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lex_entry.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_mcep.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_diphone.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_lpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_res.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_residx.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_diphone.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_lpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_res.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_residx.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_ressize.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_voice.cpp" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\usenglish.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_aswd.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_dur_stats.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_expand.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0lr.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0_model.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_gpos.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phoneset.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_text.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\audio.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_command.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_none.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_streaming.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_dump_voice.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_load_voice.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_map.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlpg.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlsa.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_spamf0.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_vc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_ffeature.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_item.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_relation.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_rel_io.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_utterance.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lexicon.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts_rewrites.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\cst_regex.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regexp.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regsub.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_lpcres.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track_io.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_io.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_utils.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g721.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_24.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_40.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g72x.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\rateconv.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_cart.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_ss.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_viterbi.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ffeatures.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_phoneset.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ssml.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_synth.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_utt_utils.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_voice.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\flite.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_alloc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_args.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_endian.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_error.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_features.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_file_stdio.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_mmap_win32.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_socket.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_string.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_tokenstream.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_url.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_const.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_user.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_wchar.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_clunits.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_diphone.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_reflpc.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sigpr.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sts.c" />
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_units.c" />
   </ItemGroup>
   <ItemGroup>
-    <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" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_alloc.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_args.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_audio.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cg.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_clunits.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_diphone.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_endian.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_error.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_features.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ffeatures.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_file.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_hrg.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_item.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lexicon.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts_rewrites.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_math.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_phoneset.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_regex.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_relation.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sigpr.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_socket.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ss.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_string.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sts.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_synth.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_tokenstream.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_track.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_units.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utterance.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utt_utils.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_const.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_defs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_viterbi.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_voice.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wave.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wchar.h" />
+    <ClInclude Include="..\..\flite-2.0.0\include\flite.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_time_awb\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal16\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\stdafx.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\voxdefs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\usenglish.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_f0.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_regexes.h" />
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_text.h" />
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_cg_map.h" />
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_spamf0.h" />
+    <ClInclude Include="..\..\flite-2.0.0\src\regex\cst_regex_defs.h" />
+    <ClInclude Include="..\..\flite-2.0.0\src\speech\g72x.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Download FLITE.2012.vcxproj">
@@ -352,4 +352,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/flite/flite.2012.vcxproj.filters b/libs/win32/flite/flite.2012.vcxproj.filters
index 979f772242..566f7a7158 100644
--- a/libs/win32/flite/flite.2012.vcxproj.filters
+++ b/libs/win32/flite/flite.2012.vcxproj.filters
@@ -29,648 +29,648 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_streaming.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_streaming.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\audio.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\audio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_command.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_command.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\audio\au_none.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_none.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_rules.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_rules.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_postlex.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_postlex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_data.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex_entries.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_entries.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_mmap_win32.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_mmap_win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_string.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_string.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_tokenstream.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_tokenstream.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_const.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_const.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_val_user.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_user.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_wchar.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_wchar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_alloc.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_alloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_args.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_args.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_endian.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_endian.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_error.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_error.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_features.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_features.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_mcep.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_mcep.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_clunits.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_clunits.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_time_awb\cmu_time_awb_lex_entry.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lex_entry.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_cg.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sigpr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_sts.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sts.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_units.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_units.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_clunits.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_clunits.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_diphone.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_diphone.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\wavesynth\cst_reflpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_reflpc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_utt_utils.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_utt_utils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_voice.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_voice.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\flite.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\flite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ffeatures.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ffeatures.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_phoneset.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_phoneset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_ssml.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ssml.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\synth\cst_synth.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_synth.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_viterbi.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_viterbi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\stats\cst_ss.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_ss.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_utils.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_utils.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g72x.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g72x.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g721.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g721.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_24.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_24.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\g723_40.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_40.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\rateconv.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\rateconv.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_lpcres.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_lpcres.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_track_io.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\speech\cst_wave_io.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\regex\regexp.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regexp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\regex\regsub.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\regsub.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\regex\cst_regex.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\regex\cst_regex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlpg.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlpg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_mlsa.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlsa.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_vc.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_vc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_gpos.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_gpos.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phoneset.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phoneset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_text.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_text.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\usenglish.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\usenglish.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_aswd.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_aswd.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_dur_stats.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_dur_stats.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_expand.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_expand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0_model.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0_model.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\usenglish\us_f0lr.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0lr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_file_stdio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_relation.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_relation.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_utterance.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_utterance.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_ffeature.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_ffeature.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_item.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_item.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\hrg\cst_rel_io.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_rel_io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts_rewrites.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts_rewrites.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lexicon.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lexicon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\lexicon\cst_lts.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c">
       <Filter>voices\rms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c">
       <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c">
       <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c">
       <Filter>voices\slt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_ressize.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_ressize.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_diphone.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_diphone.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_res.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_res.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_lpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_lpc.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal\cmu_us_kal_residx.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_residx.c">
       <Filter>voices\kal</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_diphone.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_diphone.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_lpc.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_lpc.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_res.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_res.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\lang\cmu_us_kal16\cmu_us_kal16_residx.c">
+    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_residx.c">
       <Filter>voices\kal16</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_spamf0.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_spamf0.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_load_voice.c">
+    <ClCompile Include="..\..\flite-2.0.0\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">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_dump_voice.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\cg\cst_cg_map.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_url.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_url.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\flite-1.5.4\src\utils\cst_socket.c">
+    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_socket.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lts_model.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmulex\cmu_lex.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_time_awb\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_time_awb\voxdefs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\stdafx.h">
       <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\src\speech\g72x.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\src\regex\cst_regex_defs.h">
+    <ClInclude Include="..\..\flite-2.0.0\src\regex\cst_regex_defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_pos_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_regexes.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_regexes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_text.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_text.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\usenglish.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\usenglish.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_durz_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_f0.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_f0.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_ffeatures.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_accent_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_int_tone_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_nums_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\usenglish\us_phrasing_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\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">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_const.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_val_defs.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_viterbi.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_viterbi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_voice.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_voice.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_wave.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wave.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_wchar.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_wchar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\flite.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\flite.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_alloc.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_alloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_args.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_args.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_audio.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_cart.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cart.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_cg.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_cg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_clunits.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_clunits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_diphone.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_diphone.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_endian.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_endian.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_error.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_error.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_features.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_features.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_ffeatures.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ffeatures.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_file.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_file.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_hrg.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_hrg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_item.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_item.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_lexicon.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lexicon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_lts_rewrites.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts_rewrites.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_math.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_math.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_phoneset.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_phoneset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_regex.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_regex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_relation.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_relation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_sigpr.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sigpr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_socket.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_socket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_ss.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_ss.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_string.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_string.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_sts.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_sts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_synth.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_synth.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_tokenstream.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_tokenstream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_track.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_track.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_units.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_units.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_utt_utils.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utt_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_utterance.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_utterance.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\include\cst_val.h">
+    <ClInclude Include="..\..\flite-2.0.0\include\cst_val.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h">
       <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h">
       <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h">
       <Filter>voices\awb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h">
       <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h">
       <Filter>voices\rms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h">
       <Filter>voices\slt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h">
       <Filter>voices\slt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal\voxdefs.h">
       <Filter>voices\kal</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\lang\cmu_us_kal16\voxdefs.h">
+    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal16\voxdefs.h">
       <Filter>voices\kal16</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_cg_map.h">
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_cg_map.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\flite-1.5.4\src\cg\cst_spamf0.h">
+    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_spamf0.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>