diff --git a/src/windows/installer/Product.wxs b/src/windows/installer/Product.wxs
index 288fd5eb..8b07a679 100644
--- a/src/windows/installer/Product.wxs
+++ b/src/windows/installer/Product.wxs
@@ -591,334 +591,334 @@
             <Directory Id="VOICES" Name="voices">
               <Directory Id="AAV" Name="aav">
                 <Component Id="vi" Win64="$(var.Win64)" Guid="36A8D59F-65BC-41A8-90EB-5BEED8A081D5">
-                  <File Name="vi" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\aav\vi" KeyPath="yes"/>
+                  <File Name="vi" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\aav\vi" KeyPath="yes"/>
                 </Component>
                 <Component Id="vi_VN_x_central" Win64="$(var.Win64)" Guid="9071139B-561E-4357-BC7B-9AD71548E6E3">
-                  <File Name="vi-VN-x-central" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\aav\vi-VN-x-central" KeyPath="yes"/>
+                  <File Name="vi-VN-x-central" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\aav\vi-VN-x-central" KeyPath="yes"/>
                 </Component>
                 <Component Id="vi_VN_X_south" Win64="$(var.Win64)" Guid="C9E625EE-8720-48AD-8B9E-67ADC197FD3F">
-                  <File Name="vi-VN-x-south" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\aav\vi-VN-x-south" KeyPath="yes"/>
+                  <File Name="vi-VN-x-south" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\aav\vi-VN-x-south" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="ART" Name="art">
                 <Component Id="eo" Win64="$(var.Win64)" Guid="A6114E75-B0CB-47D7-B361-BFC7AA6B1273">
-                  <File Name="eo" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\art\eo" KeyPath="yes"/>
+                  <File Name="eo" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\art\eo" KeyPath="yes"/>
                 </Component>
                 <Component Id="ia" Win64="$(var.Win64)" Guid="13954C6E-7C80-486F-A326-8DEA77FB9201">
-                  <File Name="ia" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\art\ia" KeyPath="yes"/>
+                  <File Name="ia" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\art\ia" KeyPath="yes"/>
                 </Component>
                 <Component Id="jbo" Win64="$(var.Win64)" Guid="25B2B304-62DE-4959-9170-14275AEF1291">
-                  <File Name="jbo" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\art\jbo" KeyPath="yes"/>
+                  <File Name="jbo" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\art\jbo" KeyPath="yes"/>
                 </Component>
                 <Component Id="lfn" Win64="$(var.Win64)" Guid="7F94C036-4943-40A1-BD97-700A2605B91F">
-                  <File Name="lfn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\art\lfn" KeyPath="yes"/>
+                  <File Name="lfn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\art\lfn" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="AZC" Name="azc">
                 <Component Id="nci" Win64="$(var.Win64)" Guid="0DEDA8AE-AFEB-4B04-A8A7-6C898B98D488">
-                  <File Name="nci" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\azc\nci" KeyPath="yes"/>
+                  <File Name="nci" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\azc\nci" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="BAT" Name="bat">
                 <Component Id="lt" Win64="$(var.Win64)" Guid="6B89869A-83CF-4378-873D-0FDED6F42B85">
-                  <File Name="lt" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\bat\lt" KeyPath="yes"/>
+                  <File Name="lt" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\bat\lt" KeyPath="yes"/>
                 </Component>
                 <Component Id="lv" Win64="$(var.Win64)" Guid="886DF488-82FF-40F8-A110-5DDE8B35067F">
-                  <File Name="lv" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\bat\lv" KeyPath="yes"/>
+                  <File Name="lv" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\bat\lv" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="BNT" Name="bnt">
                 <Component Id="sw" Win64="$(var.Win64)" Guid="F6F9BF32-33D4-45E9-B609-DEF046407DF1">
-                  <File Name="sw" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\bnt\sw" KeyPath="yes"/>
+                  <File Name="sw" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\bnt\sw" KeyPath="yes"/>
                 </Component>
                 <Component Id="tn" Win64="$(var.Win64)" Guid="EA170DF5-CEB3-4298-9BCB-E0D1E5ED36D2">
-                  <File Name="tn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\bnt\tn" KeyPath="yes"/>
+                  <File Name="tn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\bnt\tn" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="CCS" Name="ccs">
                 <Component Id="ka" Win64="$(var.Win64)" Guid="24DB441C-ECD1-4039-89BC-391E763A5F64">
-                  <File Name="ka" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ccs\ka" KeyPath="yes"/>
+                  <File Name="ka" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ccs\ka" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="CEL" Name="cel">
                 <Component Id="cy" Win64="$(var.Win64)" Guid="4B0DCD1C-941B-4F67-A5D5-D832FA04F9A9">
-                  <File Name="cy" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\cel\cy" KeyPath="yes"/>
+                  <File Name="cy" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\cel\cy" KeyPath="yes"/>
                 </Component>
                 <Component Id="ga" Win64="$(var.Win64)" Guid="C1D7253F-7A77-4E8B-8F38-EC46FE1F1D5F">
-                  <File Name="ga" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\cel\ga" KeyPath="yes"/>
+                  <File Name="ga" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\cel\ga" KeyPath="yes"/>
                 </Component>
                 <Component Id="gd" Win64="$(var.Win64)" Guid="F6DA62B5-CA75-4ACB-A4FA-6D8E20263E84">
-                  <File Name="gd" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\cel\gd" KeyPath="yes"/>
+                  <File Name="gd" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\cel\gd" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="CUS" Name="cus">
                 <Component Id="om" Win64="$(var.Win64)" Guid="FAA66301-7FEA-4573-B037-04DB85E16B41">
-                  <File Name="om" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\cus\om" KeyPath="yes"/>
+                  <File Name="om" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\cus\om" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="DRA" Name="dra">
                 <Component Id="kn" Win64="$(var.Win64)" Guid="88DD1D19-BD57-4F11-B6E8-25FA84FBA0E8">
-                  <File Name="kn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\dra\kn" KeyPath="yes"/>
+                  <File Name="kn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\dra\kn" KeyPath="yes"/>
                 </Component>
                 <Component Id="ml" Win64="$(var.Win64)" Guid="866D7929-F3FD-48CE-9345-4FF2EED7801C">
-                  <File Name="ml" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\dra\ml" KeyPath="yes"/>
+                  <File Name="ml" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\dra\ml" KeyPath="yes"/>
                 </Component>
                 <Component Id="ta" Win64="$(var.Win64)" Guid="B53F318B-B9C3-43C0-BC16-0F8CA6E18BC4">
-                  <File Name="ta" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\dra\ta" KeyPath="yes"/>
+                  <File Name="ta" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\dra\ta" KeyPath="yes"/>
                 </Component>
                 <Component Id="te" Win64="$(var.Win64)" Guid="BD18B71C-537E-496D-B135-971BE62975DF">
-                  <File Name="te" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\dra\te" KeyPath="yes"/>
+                  <File Name="te" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\dra\te" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="ESX" Name="esx">
                 <Component Id="kl" Win64="$(var.Win64)" Guid="6DE812B7-261E-4F8B-8C4F-1DC867B41F6C">
-                  <File Name="kl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\esx\kl" KeyPath="yes"/>
+                  <File Name="kl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\esx\kl" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Component Id="eu" Win64="$(var.Win64)" Guid="E6AE6D58-7B00-4DC8-AB65-82959662D641">
-                <File Name="eu" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\eu" KeyPath="yes"/>
+                <File Name="eu" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\eu" KeyPath="yes"/>
               </Component>
               <Directory Id="GMQ" Name="gmq">
                 <Component Id="da" Win64="$(var.Win64)" Guid="43D84D6D-A3D1-457C-84AB-B30C569F7C21">
-                  <File Name="da" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmq\da" KeyPath="yes"/>
+                  <File Name="da" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmq\da" KeyPath="yes"/>
                 </Component>
                 <Component Id="is" Win64="$(var.Win64)" Guid="BF7EADBC-8A31-41C7-9128-3AD1A0BE5816">
-                  <File Name="is" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmq\is" KeyPath="yes"/>
+                  <File Name="is" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmq\is" KeyPath="yes"/>
                 </Component>
                 <Component Id="no" Win64="$(var.Win64)" Guid="00A4EAD2-9EDB-46A7-9277-DF3E08B92221">
-                  <File Name="no" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmq\no" KeyPath="yes"/>
+                  <File Name="no" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmq\no" KeyPath="yes"/>
                 </Component>
                 <Component Id="sv" Win64="$(var.Win64)" Guid="4BA838F8-D077-41C8-9F4B-D686472AB216">
-                  <File Name="sv" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmq\sv" KeyPath="yes"/>
+                  <File Name="sv" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmq\sv" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="GMW" Name="gmw">
                 <Component Id="af" Win64="$(var.Win64)" Guid="F8C52D0C-3258-49D2-BB88-002A0B9395EB">
-                  <File Name="af" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\af" KeyPath="yes"/>
+                  <File Name="af" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\af" KeyPath="yes"/>
                 </Component>
                 <Component Id="de" Win64="$(var.Win64)" Guid="38792D05-6781-43DD-95F4-78DD029FE134">
-                  <File Name="de" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\de" KeyPath="yes"/>
+                  <File Name="de" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\de" KeyPath="yes"/>
                 </Component>
                 <Component Id="en" Win64="$(var.Win64)" Guid="527EE127-56C9-4A3B-A952-206038A8EB9C">
-                  <File Name="en" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\en" KeyPath="yes"/>
+                  <File Name="en" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\en" KeyPath="yes"/>
                 </Component>
                 <Component Id="en_029" Win64="$(var.Win64)" Guid="78136EBE-64AD-42A9-AA66-040A8AA8F41A">
-                  <File Name="en-029" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\en-029" KeyPath="yes"/>
+                  <File Name="en-029" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\en-029" KeyPath="yes"/>
                 </Component>
                 <Component Id="en_GB_scotland" Win64="$(var.Win64)" Guid="B7617BCB-AC08-431E-8141-6CAF47E339E5">
-                  <File Name="en-GB-scotland" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\en-GB-scotland" KeyPath="yes"/>
+                  <File Name="en-GB-scotland" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\en-GB-scotland" KeyPath="yes"/>
                 </Component>
                 <Component Id="en_GB_x_gbclan" Win64="$(var.Win64)" Guid="13C50255-9292-471B-8504-11F5D60F916E">
-                  <File Name="en-GB-x-gbclan" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\en-GB-x-gbclan" KeyPath="yes"/>
+                  <File Name="en-GB-x-gbclan" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\en-GB-x-gbclan" KeyPath="yes"/>
                 </Component>
                 <Component Id="en_GB_x_gbcwmd" Win64="$(var.Win64)" Guid="8899C7B1-FBB9-4E5E-A86F-DECD42CF9517">
-                  <File Name="en-GB-x-gbcwmd" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\en-GB-x-gbcwmd" KeyPath="yes"/>
+                  <File Name="en-GB-x-gbcwmd" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\en-GB-x-gbcwmd" KeyPath="yes"/>
                 </Component>
                 <Component Id="en_GB_x_rp" Win64="$(var.Win64)" Guid="94D2A7EE-956F-4A22-9A35-C930DF1F605B">
-                  <File Name="en-GB-x-rp" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\en-GB-x-rp" KeyPath="yes"/>
+                  <File Name="en-GB-x-rp" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\en-GB-x-rp" KeyPath="yes"/>
                 </Component>
                 <Component Id="en_US" Win64="$(var.Win64)" Guid="908D9137-F1BF-475C-B13C-B9695D07C2DE">
-                  <File Name="en-US" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\en-US" KeyPath="yes"/>
+                  <File Name="en-US" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\en-US" KeyPath="yes"/>
                 </Component>
                 <Component Id="nl" Win64="$(var.Win64)" Guid="294BC28C-5E44-41D1-9DF1-F6C389546050">
-                  <File Name="nl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\gmw\nl" KeyPath="yes"/>
+                  <File Name="nl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\gmw\nl" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="GRK" Name="grk">
                 <Component Id="el" Win64="$(var.Win64)" Guid="74F0C17D-3DC5-4B85-A7CB-F20A6430A8DD">
-                  <File Name="el" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\grk\el" KeyPath="yes"/>
+                  <File Name="el" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\grk\el" KeyPath="yes"/>
                 </Component>
                 <Component Id="grc" Win64="$(var.Win64)" Guid="B3804F27-1C8C-419B-81D9-7E06501D3268">
-                  <File Name="grc" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\grk\grc" KeyPath="yes"/>
+                  <File Name="grc" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\grk\grc" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="INC" Name="inc">
                 <Component Id="as" Win64="$(var.Win64)" Guid="0A0FB29D-77AD-4BB0-8765-F5CAA04174F0">
-                  <File Name="as" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\as" KeyPath="yes"/>
+                  <File Name="as" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\as" KeyPath="yes"/>
                 </Component>
                 <Component Id="bn" Win64="$(var.Win64)" Guid="7C6EBF15-D6DD-4129-8882-0572645967B9">
-                  <File Name="bn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\bn" KeyPath="yes"/>
+                  <File Name="bn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\bn" KeyPath="yes"/>
                 </Component>
                 <Component Id="gu" Win64="$(var.Win64)" Guid="0F00646E-CE9B-4AD1-A0D1-450C40EAA357">
-                  <File Name="gu" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\gu" KeyPath="yes"/>
+                  <File Name="gu" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\gu" KeyPath="yes"/>
                 </Component>
                 <Component Id="hi" Win64="$(var.Win64)" Guid="6EBF1207-43A4-4958-A7E8-9CE52C3AFDE6">
-                  <File Name="hi" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\hi" KeyPath="yes"/>
+                  <File Name="hi" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\hi" KeyPath="yes"/>
                 </Component>
                 <Component Id="mr" Win64="$(var.Win64)" Guid="90488472-EEE7-468B-86EC-FB3816ADE7F9">
-                  <File Name="mr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\mr" KeyPath="yes"/>
+                  <File Name="mr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\mr" KeyPath="yes"/>
                 </Component>
                 <Component Id="ne" Win64="$(var.Win64)" Guid="9818C670-EE45-4665-BEC4-C3C3945F60F3">
-                  <File Name="ne" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\ne" KeyPath="yes"/>
+                  <File Name="ne" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\ne" KeyPath="yes"/>
                 </Component>
                 <Component Id="or" Win64="$(var.Win64)" Guid="626A8308-959D-40F0-B3A5-EDCF47F07AD2">
-                  <File Name="or" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\or" KeyPath="yes"/>
+                  <File Name="or" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\or" KeyPath="yes"/>
                 </Component>
                 <Component Id="pa" Win64="$(var.Win64)" Guid="0F44AC40-58F2-497C-B4F5-6E9C1528019B">
-                  <File Name="pa" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\pa" KeyPath="yes"/>
+                  <File Name="pa" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\pa" KeyPath="yes"/>
                 </Component>
                 <Component Id="si" Win64="$(var.Win64)" Guid="D85410F8-7B49-4A81-9172-641C6D3E5041">
-                  <File Name="si" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\si" KeyPath="yes"/>
+                  <File Name="si" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\si" KeyPath="yes"/>
                 </Component>
                 <Component Id="ur" Win64="$(var.Win64)" Guid="D13A0F3E-4357-4546-B408-0644939C41D5">
-                  <File Name="ur" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\inc\ur" KeyPath="yes"/>
+                  <File Name="ur" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\inc\ur" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="INE" Name="ine">
                 <Component Id="hy" Win64="$(var.Win64)" Guid="8AC34F47-61FD-4918-AEC9-4FBDC9E90AD1">
-                  <File Name="hy" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ine\hy" KeyPath="yes"/>
+                  <File Name="hy" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ine\hy" KeyPath="yes"/>
                 </Component>
                 <Component Id="hy_arevmda" Win64="$(var.Win64)" Guid="E7510729-A886-4BCD-A616-9B4D74D8BA43">
-                  <File Name="hy-arevmda" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ine\hy-arevmda" KeyPath="yes"/>
+                  <File Name="hy-arevmda" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ine\hy-arevmda" KeyPath="yes"/>
                 </Component>
                 <Component Id="sq" Win64="$(var.Win64)" Guid="80790CCF-4B20-4AC3-A19F-72890470D4F5">
-                  <File Name="sq" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ine\sq" KeyPath="yes"/>
+                  <File Name="sq" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ine\sq" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="IRA" Name="ira">
                 <Component Id="fa" Win64="$(var.Win64)" Guid="14E33743-FDEF-40BD-9CE2-E5EDFA4C4887">
-                  <File Name="fa" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ira\fa" KeyPath="yes"/>
+                  <File Name="fa" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ira\fa" KeyPath="yes"/>
                 </Component>
                 <Component Id="fa_en_us" Win64="$(var.Win64)" Guid="E1D79728-8EB7-422A-ADA4-F328B29954D7">
-                  <File Name="fa-en-us" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ira\fa-en-us" KeyPath="yes"/>
+                  <File Name="fa-en-us" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ira\fa-en-us" KeyPath="yes"/>
                 </Component>
                 <Component Id="fa_Latn" Win64="$(var.Win64)" Guid="4988D14D-90BE-4386-8642-19262D596864">
-                  <File Name="fa-Latn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ira\fa-Latn" KeyPath="yes"/>
+                  <File Name="fa-Latn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ira\fa-Latn" KeyPath="yes"/>
                 </Component>
                 <Component Id="ku" Win64="$(var.Win64)" Guid="E58A93BA-523A-4FB6-A877-B2F1718ACDFB">
-                  <File Name="ku" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ira\ku" KeyPath="yes"/>
+                  <File Name="ku" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ira\ku" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="ITC" Name="itc">
                 <Component Id="la" Win64="$(var.Win64)" Guid="6B7D7FBC-92B5-47ED-AC05-EFEC7BF87C6F">
-                  <File Name="la" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\itc\la" KeyPath="yes"/>
+                  <File Name="la" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\itc\la" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Component Id="ko" Win64="$(var.Win64)" Guid="0F759436-12BD-4FC5-80C0-6E755E021E40">
-                <File Name="ko" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\ko" KeyPath="yes"/>
+                <File Name="ko" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\ko" KeyPath="yes"/>
               </Component>
               <Directory Id="POZ" Name="poz">
                 <Component Id="id" Win64="$(var.Win64)" Guid="C9BFD2A4-A105-4061-961A-DF6CB6C02854">
-                  <File Name="id" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\poz\id" KeyPath="yes"/>
+                  <File Name="id" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\poz\id" KeyPath="yes"/>
                 </Component>
                 <Component Id="ms" Win64="$(var.Win64)" Guid="7E88BF7A-90E7-4C28-BBCF-50A4D4F55BA4">
-                  <File Name="ms" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\poz\ms" KeyPath="yes"/>
+                  <File Name="ms" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\poz\ms" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="ROA" Name="roa">
                 <Component Id="an" Win64="$(var.Win64)" Guid="B2A22EA3-3BF1-48CD-8E42-512A3E6DB140">
-                  <File Name="an" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\an" KeyPath="yes"/>
+                  <File Name="an" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\an" KeyPath="yes"/>
                 </Component>
                 <Component Id="ca" Win64="$(var.Win64)" Guid="8E7829D5-353D-4F8A-A7E3-4F4D03BEAB35">
-                  <File Name="ca" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\ca" KeyPath="yes"/>
+                  <File Name="ca" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\ca" KeyPath="yes"/>
                 </Component>
                 <Component Id="es" Win64="$(var.Win64)" Guid="F261F844-2822-4A13-9ED9-D00D914F5571">
-                  <File Name="es" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\es" KeyPath="yes"/>
+                  <File Name="es" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\es" KeyPath="yes"/>
                 </Component>
                 <Component Id="es_419" Win64="$(var.Win64)" Guid="E97680DA-F4BA-4A2B-A39D-D9B7E29E85EA">
-                  <File Name="es-419" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\es-419" KeyPath="yes"/>
+                  <File Name="es-419" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\es-419" KeyPath="yes"/>
                 </Component>
                 <Component Id="fr" Win64="$(var.Win64)" Guid="69E627AA-54AE-495F-AE3C-CBDD66AD060B">
-                  <File Name="fr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\fr" KeyPath="yes"/>
+                  <File Name="fr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\fr" KeyPath="yes"/>
                 </Component>
                 <Component Id="fr_BE" Win64="$(var.Win64)" Guid="F06154D4-F6F7-4A9E-AF1D-605D643AD392">
-                  <File Name="fr-BE" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\fr-BE" KeyPath="yes"/>
+                  <File Name="fr-BE" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\fr-BE" KeyPath="yes"/>
                 </Component>
                 <Component Id="it" Win64="$(var.Win64)" Guid="B8BD5085-3E1C-47A5-86C9-DB1650FAC29E">
-                  <File Name="it" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\it" KeyPath="yes"/>
+                  <File Name="it" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\it" KeyPath="yes"/>
                 </Component>
                 <Component Id="pap" Win64="$(var.Win64)" Guid="6978C4BD-23AC-4FCF-B156-000A32B959DB">
-                  <File Name="pap" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\pap" KeyPath="yes"/>
+                  <File Name="pap" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\pap" KeyPath="yes"/>
                 </Component>
                 <Component Id="pt_BR" Win64="$(var.Win64)" Guid="C6533938-B071-4ADA-8A26-E58A57A0B76E">
-                  <File Name="pt-BR" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\pt-BR" KeyPath="yes"/>
+                  <File Name="pt-BR" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\pt-BR" KeyPath="yes"/>
                 </Component>
                 <Component Id="pt_PT" Win64="$(var.Win64)" Guid="0CE06717-9D5C-4C45-BCB4-E3C108069533">
-                  <File Name="pt-PT" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\pt-PT" KeyPath="yes"/>
+                  <File Name="pt-PT" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\pt-PT" KeyPath="yes"/>
                 </Component>
                 <Component Id="ro" Win64="$(var.Win64)" Guid="E2E0205E-5488-4A73-B3ED-10181F358987">
-                  <File Name="ro" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\roa\ro" KeyPath="yes"/>
+                  <File Name="ro" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\roa\ro" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="SAI" Name="sai">
                 <Component Id="gn" Win64="$(var.Win64)" Guid="D11B73FF-7A67-49B0-8BE6-1345BA1EB00D">
-                  <File Name="gn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\sai\gn" KeyPath="yes"/>
+                  <File Name="gn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\sai\gn" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="SEM" Name="sem">
                 <Component Id="am" Win64="$(var.Win64)" Guid="B28850DE-493A-464F-8889-8AA746F31596">
-                  <File Name="am" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\sem\am" KeyPath="yes"/>
+                  <File Name="am" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\sem\am" KeyPath="yes"/>
                 </Component>
                 <Component Id="mt" Win64="$(var.Win64)" Guid="00388BFC-A813-4951-9ECE-FC95EBF95B9F">
-                  <File Name="mt" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\sem\mt" KeyPath="yes"/>
+                  <File Name="mt" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\sem\mt" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="SIT" Name="sit">
                 <Component Id="cmn" Win64="$(var.Win64)" Guid="B9F21B2A-BD29-42DF-84D6-AD1CA29799B5">
-                  <File Name="cmn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\sit\cmn" KeyPath="yes"/>
+                  <File Name="cmn" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\sit\cmn" KeyPath="yes"/>
                 </Component>
                 <Component Id="my" Win64="$(var.Win64)" Guid="0927A4D6-4DA1-431C-ABFA-E9871165B3EC">
-                  <File Name="my" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\sit\my" KeyPath="yes"/>
+                  <File Name="my" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\sit\my" KeyPath="yes"/>
                 </Component>
                 <Component Id="yue" Win64="$(var.Win64)" Guid="C08D04D1-B17B-40CA-B6B6-3C78F1D4E94A">
-                  <File Name="yue" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\sit\yue" KeyPath="yes"/>
+                  <File Name="yue" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\sit\yue" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="TRK" Name="trk">
                 <Component Id="az" Win64="$(var.Win64)" Guid="E96920A5-43FE-4743-97CA-A09436D8A833">
-                  <File Name="az" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\trk\az" KeyPath="yes"/>
+                  <File Name="az" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\trk\az" KeyPath="yes"/>
                 </Component>
                 <Component Id="tr" Win64="$(var.Win64)" Guid="A60A0F49-8D08-4CFA-AD3D-CA8807AFD8C6">
-                  <File Name="tr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\trk\tr" KeyPath="yes"/>
+                  <File Name="tr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\trk\tr" KeyPath="yes"/>
                 </Component>
                 <Component Id="tt" Win64="$(var.Win64)" Guid="7A3D1E2D-37B6-4CBD-A6C3-FD46D5BA5FBF">
-                  <File Name="tt" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\trk\tt" KeyPath="yes"/>
+                  <File Name="tt" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\trk\tt" KeyPath="yes"/>
                 </Component>
                 <Component Id="ky" Win64="$(var.Win64)" Guid="C2E2808E-56F4-40C4-BD41-DAC648E414BA">
-                  <File Name="ky" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\trk\ky" KeyPath="yes"/>
+                  <File Name="ky" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\trk\ky" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="URJ" Name="urj">
                 <Component Id="et" Win64="$(var.Win64)" Guid="8B42703E-6FEF-4E41-9F9F-7EFA95FAB433">
-                  <File Name="et" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\urj\et" KeyPath="yes"/>
+                  <File Name="et" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\urj\et" KeyPath="yes"/>
                 </Component>
                 <Component Id="fi" Win64="$(var.Win64)" Guid="B8407908-1BB2-4B22-BA1E-988400DEF724">
-                  <File Name="fi" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\urj\fi" KeyPath="yes"/>
+                  <File Name="fi" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\urj\fi" KeyPath="yes"/>
                 </Component>
                 <Component Id="hu" Win64="$(var.Win64)" Guid="ECE9B062-2E62-42C7-BC54-E210C50D7E44">
-                  <File Name="hu" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\urj\hu" KeyPath="yes"/>
+                  <File Name="hu" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\urj\hu" KeyPath="yes"/>
                 </Component>
               </Directory>
               <Directory Id="ZLS" Name="zls">
                 <Component Id="bg" Win64="$(var.Win64)" Guid="D75CE551-2BEC-4870-82C6-8AEC4BC4867A">
-                  <File Name="bg" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\bg" KeyPath="yes"/>
+                  <File Name="bg" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\bg" KeyPath="yes"/>
                 </Component>
                 <Component Id="bs" Win64="$(var.Win64)" Guid="A95A627B-E991-4814-9C98-3E1A7641AD22">
-                  <File Name="bs" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\bs" KeyPath="yes"/>
+                  <File Name="bs" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\bs" KeyPath="yes"/>
                 </Component>
                 <Component Id="cs" Win64="$(var.Win64)" Guid="4840D63E-9DAE-4AE5-946E-B03AA2EFA0C0">
-                  <File Name="cs" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\cs" KeyPath="yes"/>
+                  <File Name="cs" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\cs" KeyPath="yes"/>
                 </Component>
                 <Component Id="hr" Win64="$(var.Win64)" Guid="C34C709A-D32C-431F-83D7-B666250C8B2E">
-                  <File Name="hr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\hr" KeyPath="yes"/>
+                  <File Name="hr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\hr" KeyPath="yes"/>
                 </Component>
                 <Component Id="mk" Win64="$(var.Win64)" Guid="70541A8E-CF44-49AA-A296-9D65397B5275">
-                  <File Name="mk" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\mk" KeyPath="yes"/>
+                  <File Name="mk" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\mk" KeyPath="yes"/>
                 </Component>
                 <Component Id="pl" Win64="$(var.Win64)" Guid="C772D1EB-708F-4523-BAE9-5F06AD90523A">
-                  <File Name="pl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\pl" KeyPath="yes"/>
+                  <File Name="pl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\pl" KeyPath="yes"/>
                 </Component>
                 <Component Id="ru" Win64="$(var.Win64)" Guid="6D827F08-82E9-4169-A3EC-794DE2487109">
-                  <File Name="ru" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\ru" KeyPath="yes"/>
+                  <File Name="ru" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\ru" KeyPath="yes"/>
                 </Component>
                 <Component Id="sk" Win64="$(var.Win64)" Guid="124B16B9-9DD3-4E60-8000-06A45B5F7CB6">
-                  <File Name="sk" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\sk" KeyPath="yes"/>
+                  <File Name="sk" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\sk" KeyPath="yes"/>
                 </Component>
                 <Component Id="sl" Win64="$(var.Win64)" Guid="65183911-49B5-4767-8281-5E60C3BCD98D">
-                  <File Name="sl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\sl" KeyPath="yes"/>
+                  <File Name="sl" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\sl" KeyPath="yes"/>
                 </Component>
                 <Component Id="sr" Win64="$(var.Win64)" Guid="35B89632-7F74-4016-B52F-DA7EE27E8FC7">
-                  <File Name="sr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\voices\zls\sr" KeyPath="yes"/>
+                  <File Name="sr" Source="$(var.ProjectDir)..\..\..\espeak-ng-data\lang\zls\sr" KeyPath="yes"/>
                 </Component>
               </Directory>
             </Directory>
diff --git a/src/windows/libespeak-ng.vcxproj b/src/windows/libespeak-ng.vcxproj
index c4ba7951..eee40869 100644
--- a/src/windows/libespeak-ng.vcxproj
+++ b/src/windows/libespeak-ng.vcxproj
@@ -87,7 +87,7 @@
       </PrecompiledHeader>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat;$(ProjectDir)/../ucd-tools/src/include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
     </ClCompile>
@@ -106,7 +106,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat;$(ProjectDir)/../ucd-tools/src/include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -123,7 +123,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat;$(ProjectDir)/../ucd-tools/src/include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
     </ClCompile>
@@ -146,7 +146,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>LIBESPEAK_NG_EXPORT;INCLUDE_KLATT;INCLUDE_MBROLA;HAVE_PCAUDIOLIB_AUDIO_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)libespeak-ng.pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)/../include;$(ProjectDir)/../pcaudiolib/src/include;$(ProjectDir)/../include/compat;$(ProjectDir)/../ucd-tools/src/include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -158,6 +158,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\ucd-tools\src\case.c" />
+    <ClCompile Include="..\ucd-tools\src\categories.c" />
+    <ClCompile Include="..\ucd-tools\src\ctype.c" />
+    <ClCompile Include="..\ucd-tools\src\scripts.c" />
+    <ClCompile Include="..\ucd-tools\src\tostring.c" />
     <ClCompile Include="..\libespeak-ng\compiledata.c" />
     <ClCompile Include="..\libespeak-ng\compiledict.c" />
     <ClCompile Include="..\libespeak-ng\compilembrola.c" />
@@ -203,6 +208,7 @@
     <ClInclude Include="..\libespeak-ng\voice.h" />
     <ClInclude Include="..\pcaudiolib\src\audio_priv.h" />
     <ClInclude Include="..\pcaudiolib\src\include\pcaudiolib\audio.h" />
+    <ClInclude Include="..\include\ucd-tools\src\include\ucd\ucd.h" />
     <ClInclude Include="config.h" />
   </ItemGroup>
   <ItemGroup>