diff --git a/windows/src/global/delphi/cust/StockFileNames.pas b/common/windows/delphi/general/StockFileNames.pas
similarity index 100%
rename from windows/src/global/delphi/cust/StockFileNames.pas
rename to common/windows/delphi/general/StockFileNames.pas
diff --git a/developer/src/kmcomp/kmcomp.dpr b/developer/src/kmcomp/kmcomp.dpr
index e0d5605d23..0fe7f296e2 100644
--- a/developer/src/kmcomp/kmcomp.dpr
+++ b/developer/src/kmcomp/kmcomp.dpr
@@ -20,10 +20,9 @@ uses
   httpuploader in '..\..\..\common\windows\delphi\general\httpuploader.pas',
   httpuploader_messageprocessor_forms in '..\..\..\common\windows\delphi\general\httpuploader_messageprocessor_forms.pas',
   utilfiletypes in '..\..\..\common\windows\delphi\general\utilfiletypes.pas',
-  CustomisationStorage in '..\..\..\windows\src\global\delphi\cust\CustomisationStorage.pas',
   klog in '..\..\..\common\windows\delphi\general\klog.pas',
   KeyNames in '..\..\..\common\windows\delphi\general\KeyNames.pas',
-  StockFileNames in '..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\common\windows\delphi\general\StockFileNames.pas',
   KeymanDeveloperOptions in '..\tike\main\KeymanDeveloperOptions.pas',
   Upload_Settings in '..\..\..\common\windows\delphi\general\Upload_Settings.pas',
   utilstr in '..\..\..\common\windows\delphi\general\utilstr.pas',
@@ -55,9 +54,9 @@ uses
   TouchLayout in '..\tike\oskbuilder\TouchLayout.pas',
   TouchLayoutDefinitions in '..\tike\oskbuilder\TouchLayoutDefinitions.pas',
   TouchLayoutUtils in '..\tike\oskbuilder\TouchLayoutUtils.pas',
-  KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas',
+  KeyboardFonts in '..\common\windows\delphi\general\KeyboardFonts.pas',
   KeyboardParser in '..\tike\main\KeyboardParser.pas',
-  WindowsLanguages in '..\common\delphi\general\WindowsLanguages.pas',
+  WindowsLanguages in '..\common\windows\delphi\general\WindowsLanguages.pas',
   TempFileManager in '..\..\..\common\windows\delphi\general\TempFileManager.pas',
   JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas',
   TikeUnicodeData in '..\tike\main\TikeUnicodeData.pas',
@@ -65,7 +64,7 @@ uses
   ttinfo in '..\..\..\common\windows\delphi\general\ttinfo.pas',
   ADODB_TLB in '..\..\..\common\windows\delphi\tlb\ADODB_TLB.pas',
   ADOX_TLB in '..\..\..\common\windows\delphi\tlb\ADOX_TLB.pas',
-  UKeymanTargets in '..\common\delphi\general\UKeymanTargets.pas',
+  UKeymanTargets in '..\common\windows\delphi\general\UKeymanTargets.pas',
   kccompileproject in 'kccompileproject.pas',
   Keyman.Developer.System.Project.ProjectFile in '..\tike\project\Keyman.Developer.System.Project.ProjectFile.pas',
   mrulist in '..\tike\main\mrulist.pas',
@@ -100,7 +99,7 @@ uses
   Keyman.System.RegExGroupHelperRSP19902 in '..\..\..\common\windows\delphi\vcl\Keyman.System.RegExGroupHelperRSP19902.pas',
   Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
   Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
-  TextFileFormat in '..\common\delphi\general\TextFileFormat.pas',
+  TextFileFormat in '..\common\windows\delphi\general\TextFileFormat.pas',
   Keyman.Developer.System.Project.kmnProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas',
   Keyman.Developer.System.Project.kpsProjectFileAction in '..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas',
   Keyman.System.PackageInfoRefreshLexicalModels in '..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
diff --git a/developer/src/kmcomp/kmcomp.dproj b/developer/src/kmcomp/kmcomp.dproj
index 81aa31fa82..d0c1e020d4 100644
--- a/developer/src/kmcomp/kmcomp.dproj
+++ b/developer/src/kmcomp/kmcomp.dproj
@@ -162,16 +162,15 @@
         <DCCReference Include="..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
-        <DCCReference Include="..\TIKE\main\RedistFiles.pas"/>
+        <DCCReference Include="..\tike\main\RedistFiles.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\httpuploader.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\httpuploader_messageprocessor_forms.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\cust\CustomisationStorage.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\klog.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\KeyNames.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
-        <DCCReference Include="..\TIKE\main\KeymanDeveloperOptions.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
+        <DCCReference Include="..\tike\main\KeymanDeveloperOptions.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\Upload_Settings.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilsystem.pas"/>
@@ -180,15 +179,15 @@
         <DCCReference Include="..\..\..\common\windows\delphi\general\Unicode.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilhttp.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
-        <DCCReference Include="..\TIKE\main\UfrmTike.pas">
+        <DCCReference Include="..\tike\main\UfrmTike.pas">
             <Form>TikeForm</Form>
             <DesignClass>TTntForm</DesignClass>
         </DCCReference>
         <DCCReference Include="..\common\delphi\compiler\CompilePackageInstaller.pas"/>
-        <DCCReference Include="..\TIKE\main\UTikeDebugMode.pas"/>
-        <DCCReference Include="..\TIKE\compile\CompileKeymanWeb.pas"/>
+        <DCCReference Include="..\tike\main\UTikeDebugMode.pas"/>
+        <DCCReference Include="..\tike\compile\CompileKeymanWeb.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboard.pas"/>
-        <DCCReference Include="..\TIKE\compile\KeymanWebKeyCodes.pas"/>
+        <DCCReference Include="..\tike\compile\KeymanWebKeyCodes.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\ExtShiftState.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\wininet5.pas"/>
@@ -202,42 +201,42 @@
         <DCCReference Include="..\..\..\common\windows\delphi\general\Glossary.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\VKeys.pas"/>
         <DCCReference Include="..\common\delphi\compiler\CompileErrorCodes.pas"/>
-        <DCCReference Include="..\TIKE\oskbuilder\TouchLayout.pas"/>
-        <DCCReference Include="..\TIKE\oskbuilder\TouchLayoutDefinitions.pas"/>
-        <DCCReference Include="..\TIKE\oskbuilder\TouchLayoutUtils.pas"/>
-        <DCCReference Include="..\common\delphi\general\KeyboardFonts.pas"/>
-        <DCCReference Include="..\TIKE\main\KeyboardParser.pas"/>
-        <DCCReference Include="..\common\delphi\general\WindowsLanguages.pas"/>
+        <DCCReference Include="..\tike\oskbuilder\TouchLayout.pas"/>
+        <DCCReference Include="..\tike\oskbuilder\TouchLayoutDefinitions.pas"/>
+        <DCCReference Include="..\tike\oskbuilder\TouchLayoutUtils.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\KeyboardFonts.pas"/>
+        <DCCReference Include="..\tike\main\KeyboardParser.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\WindowsLanguages.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\TempFileManager.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
-        <DCCReference Include="..\TIKE\main\TikeUnicodeData.pas"/>
+        <DCCReference Include="..\tike\main\TikeUnicodeData.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\charmap\UnicodeData.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\ttinfo.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\tlb\ADODB_TLB.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\tlb\ADOX_TLB.pas"/>
-        <DCCReference Include="..\common\delphi\general\UKeymanTargets.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\UKeymanTargets.pas"/>
         <DCCReference Include="kccompileproject.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFile.pas"/>
-        <DCCReference Include="..\TIKE\main\mrulist.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.Project.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFiles.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectFileType.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectLoader.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kmnProjectFile.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kmxProjectFile.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kpsProjectFile.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kvkProjectFile.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectFile.pas"/>
+        <DCCReference Include="..\tike\main\mrulist.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.Project.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectFiles.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectFileType.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectLoader.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kmnProjectFile.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kmxProjectFile.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kpsProjectFile.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kvkProjectFile.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\UserMessages.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverBinary.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardSaverXML.pas"/>
         <DCCReference Include="kccompilekvk.pas"/>
-        <DCCReference Include="..\TIKE\compile\ValidateKeyboardInfo.pas"/>
-        <DCCReference Include="..\TIKE\compile\MergeKeyboardInfo.pas"/>
-        <DCCReference Include="..\TIKE\compile\JsonExtractKeyboardInfo.pas"/>
+        <DCCReference Include="..\tike\compile\ValidateKeyboardInfo.pas"/>
+        <DCCReference Include="..\tike\compile\MergeKeyboardInfo.pas"/>
+        <DCCReference Include="..\tike\compile\JsonExtractKeyboardInfo.pas"/>
         <DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas"/>
         <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardJSInfo.pas"/>
         <DCCReference Include="..\common\delphi\keyboards\Keyman.System.KeyboardUtils.pas"/>
@@ -250,12 +249,12 @@
         <DCCReference Include="..\..\..\common\windows\delphi\vcl\Keyman.System.RegExGroupHelperRSP19902.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
-        <DCCReference Include="..\common\delphi\general\TextFileFormat.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\TextFileFormat.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kmnProjectFileAction.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
         <DCCReference Include="..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.modelTsProjectFile.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas"/>
         <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas"/>
         <DCCReference Include="..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
         <DCCReference Include="Keyman.Developer.System.Project.ProjectLogConsole.pas"/>
@@ -266,9 +265,9 @@
         <DCCReference Include="..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
-        <DCCReference Include="..\TIKE\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
+        <DCCReference Include="..\tike\project\Keyman.Developer.System.Project.UrlRenderer.pas"/>
         <DCCReference Include="Keyman.Developer.System.ValidateRepoChanges.pas"/>
-        <DCCReference Include="..\TIKE\main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
+        <DCCReference Include="..\tike\main\Keyman.Developer.System.KeymanDeveloperPaths.pas"/>
         <DCCReference Include="..\common\delphi\compiler\Keyman.Developer.System.ValidateKpsFile.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
diff --git a/developer/src/kmconvert/kmconvert.dpr b/developer/src/kmconvert/kmconvert.dpr
index ba9006ff62..35b98b67d7 100644
--- a/developer/src/kmconvert/kmconvert.dpr
+++ b/developer/src/kmconvert/kmconvert.dpr
@@ -10,10 +10,10 @@ uses
   KeymanVersion in '..\..\..\common\windows\delphi\general\KeymanVersion.pas',
   utilexecute in '..\..\..\common\windows\delphi\general\utilexecute.pas',
   Keyman.Developer.System.KeyboardProjectTemplate in 'Keyman.Developer.System.KeyboardProjectTemplate.pas',
-  UKeymanTargets in '..\common\delphi\general\UKeymanTargets.pas',
+  UKeymanTargets in '..\common\windows\delphi\general\UKeymanTargets.pas',
   utilstr in '..\..\..\common\windows\delphi\general\utilstr.pas',
   Unicode in '..\..\..\common\windows\delphi\general\Unicode.pas',
-  StockFileNames in '..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\common\windows\delphi\general\StockFileNames.pas',
   utilfiletypes in '..\..\..\common\windows\delphi\general\utilfiletypes.pas',
   KeyboardParser in '..\TIKE\main\KeyboardParser.pas',
   kmxfile in '..\..\..\common\windows\delphi\keyboards\kmxfile.pas',
@@ -21,12 +21,12 @@ uses
   ExtShiftState in '..\..\..\common\windows\delphi\visualkeyboard\ExtShiftState.pas',
   utilsystem in '..\..\..\common\windows\delphi\general\utilsystem.pas',
   VKeys in '..\..\..\common\windows\delphi\general\VKeys.pas',
-  WindowsLanguages in '..\common\delphi\general\WindowsLanguages.pas',
+  WindowsLanguages in '..\common\windows\delphi\general\WindowsLanguages.pas',
   GetOsVersion in '..\..\..\common\windows\delphi\general\GetOsVersion.pas',
   CRC32 in '..\..\..\common\windows\delphi\general\CRC32.pas',
   KeyNames in '..\..\..\common\windows\delphi\general\KeyNames.pas',
   utildir in '..\..\..\common\windows\delphi\general\utildir.pas',
-  TextFileFormat in '..\common\delphi\general\TextFileFormat.pas',
+  TextFileFormat in '..\common\windows\delphi\general\TextFileFormat.pas',
   kpsfile in '..\common\delphi\packages\kpsfile.pas',
   PackageInfo in '..\..\..\common\windows\delphi\packages\PackageInfo.pas',
   JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas',
@@ -74,7 +74,7 @@ uses
   TouchLayout in '..\TIKE\oskbuilder\TouchLayout.pas',
   TouchLayoutDefinitions in '..\TIKE\oskbuilder\TouchLayoutDefinitions.pas',
   TouchLayoutUtils in '..\TIKE\oskbuilder\TouchLayoutUtils.pas',
-  KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas',
+  KeyboardFonts in '..\common\windows\delphi\general\KeyboardFonts.pas',
   Keyman.System.Util.RenderLanguageIcon in '..\..\..\common\windows\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas',
   utilicon in '..\..\..\common\windows\delphi\general\utilicon.pas',
   CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas',
diff --git a/developer/src/kmconvert/kmconvert.dproj b/developer/src/kmconvert/kmconvert.dproj
index 6bb61d97e6..5558b4de4e 100644
--- a/developer/src/kmconvert/kmconvert.dproj
+++ b/developer/src/kmconvert/kmconvert.dproj
@@ -116,10 +116,10 @@
         <DCCReference Include="..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilexecute.pas"/>
         <DCCReference Include="Keyman.Developer.System.KeyboardProjectTemplate.pas"/>
-        <DCCReference Include="..\common\delphi\general\UKeymanTargets.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\UKeymanTargets.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\Unicode.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
         <DCCReference Include="..\TIKE\main\KeyboardParser.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\keyboards\kmxfile.pas"/>
@@ -127,12 +127,12 @@
         <DCCReference Include="..\..\..\common\windows\delphi\visualkeyboard\ExtShiftState.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilsystem.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\VKeys.pas"/>
-        <DCCReference Include="..\common\delphi\general\WindowsLanguages.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\WindowsLanguages.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\GetOsVersion.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\CRC32.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\KeyNames.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utildir.pas"/>
-        <DCCReference Include="..\common\delphi\general\TextFileFormat.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\TextFileFormat.pas"/>
         <DCCReference Include="..\common\delphi\packages\kpsfile.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
@@ -180,7 +180,7 @@
         <DCCReference Include="..\TIKE\oskbuilder\TouchLayout.pas"/>
         <DCCReference Include="..\TIKE\oskbuilder\TouchLayoutDefinitions.pas"/>
         <DCCReference Include="..\TIKE\oskbuilder\TouchLayoutUtils.pas"/>
-        <DCCReference Include="..\common\delphi\general\KeyboardFonts.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\KeyboardFonts.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilicon.pas"/>
         <DCCReference Include="..\common\delphi\compiler\CompileErrorCodes.pas"/>
diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
index 84f9861c22..04856f445c 100644
--- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
+++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
@@ -19,7 +19,7 @@ uses
   PackageFileFormats in '..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas',
   PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
   utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
-  StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
   Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
   JsonUtil in '..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas',
@@ -65,11 +65,11 @@ uses
   Keyman.Developer.System.Project.ProjectLoader in '..\..\..\tike\project\Keyman.Developer.System.Project.ProjectLoader.pas',
   Keyman.Developer.System.Project.ProjectLog in '..\..\..\tike\project\Keyman.Developer.System.Project.ProjectLog.pas',
   Keyman.Developer.System.Project.ProjectSaver in '..\..\..\tike\project\Keyman.Developer.System.Project.ProjectSaver.pas',
-  UKeymanTargets in '..\..\..\common\delphi\general\UKeymanTargets.pas',
+  UKeymanTargets in '..\..\..\common\windows\delphi\general\UKeymanTargets.pas',
   CompileKeymanWeb in '..\..\..\tike\compile\CompileKeymanWeb.pas',
   CompileErrorCodes in '..\..\..\common\delphi\compiler\CompileErrorCodes.pas',
   KeyboardParser in '..\..\..\tike\main\KeyboardParser.pas',
-  WindowsLanguages in '..\..\..\common\delphi\general\WindowsLanguages.pas',
+  WindowsLanguages in '..\..\..\common\windows\delphi\general\WindowsLanguages.pas',
   KeymanWebKeyCodes in '..\..\..\tike\compile\KeymanWebKeyCodes.pas',
   kmxfileutils in '..\..\..\..\..\common\windows\delphi\keyboards\kmxfileutils.pas',
   TikeUnicodeData in '..\..\..\tike\main\TikeUnicodeData.pas',
@@ -80,7 +80,7 @@ uses
   TouchLayoutDefinitions in '..\..\..\tike\oskbuilder\TouchLayoutDefinitions.pas',
   TouchLayout in '..\..\..\tike\oskbuilder\TouchLayout.pas',
   TouchLayoutUtils in '..\..\..\tike\oskbuilder\TouchLayoutUtils.pas',
-  KeyboardFonts in '..\..\..\common\delphi\general\KeyboardFonts.pas',
+  KeyboardFonts in '..\..\..\common\windows\delphi\general\KeyboardFonts.pas',
   Keyman.Developer.System.Project.kpsProjectFile in '..\..\..\tike\project\Keyman.Developer.System.Project.kpsProjectFile.pas',
   Keyman.Developer.System.Project.kpsProjectFileAction in '..\..\..\tike\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas',
   CompilePackageInstaller in '..\..\..\common\delphi\compiler\CompilePackageInstaller.pas',
@@ -92,7 +92,7 @@ uses
   Keyman.System.Standards.BCP47SubtagRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
   Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
   Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
-  TextFileFormat in '..\..\..\common\delphi\general\TextFileFormat.pas',
+  TextFileFormat in '..\..\..\common\windows\delphi\general\TextFileFormat.pas',
   Keyman.System.LexicalModelUtils in '..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas',
   Keyman.System.PackageInfoRefreshLexicalModels in '..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas',
   Keyman.System.Standards.LangTagsRegistry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas',
diff --git a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
index 48e8c345fb..959ce2cc8d 100644
--- a/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
+++ b/developer/src/test/auto/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
@@ -99,7 +99,7 @@
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageFileFormats.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
@@ -145,11 +145,11 @@
         <DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectLoader.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectLog.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.ProjectSaver.pas"/>
-        <DCCReference Include="..\..\..\common\delphi\general\UKeymanTargets.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\UKeymanTargets.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\compile\CompileKeymanWeb.pas"/>
         <DCCReference Include="..\..\..\..\..\developer\src\common\delphi\compiler\CompileErrorCodes.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\main\KeyboardParser.pas"/>
-        <DCCReference Include="..\..\..\common\delphi\general\WindowsLanguages.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\WindowsLanguages.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\compile\KeymanWebKeyCodes.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\keyboards\kmxfileutils.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\main\TikeUnicodeData.pas"/>
@@ -160,7 +160,7 @@
         <DCCReference Include="..\..\..\developer\TIKE\oskbuilder\TouchLayoutDefinitions.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\oskbuilder\TouchLayout.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\oskbuilder\TouchLayoutUtils.pas"/>
-        <DCCReference Include="..\..\..\common\delphi\general\KeyboardFonts.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\KeyboardFonts.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.kpsProjectFile.pas"/>
         <DCCReference Include="..\..\..\developer\TIKE\project\Keyman.Developer.System.Project.kpsProjectFileAction.pas"/>
         <DCCReference Include="..\..\..\..\..\developer\src\common\delphi\compiler\CompilePackageInstaller.pas"/>
@@ -172,7 +172,7 @@
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
-        <DCCReference Include="..\..\..\common\delphi\general\TextFileFormat.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\TextFileFormat.pas"/>
         <DCCReference Include="..\..\..\common\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas"/>
         <DCCReference Include="..\..\..\common\delphi\packages\Keyman.System.PackageInfoRefreshLexicalModels.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LangTagsRegistry.pas"/>
diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dpr b/developer/src/test/auto/kmconvert/kmconverttest.dpr
index 67be7f600f..2725ac47c2 100644
--- a/developer/src/test/auto/kmconvert/kmconverttest.dpr
+++ b/developer/src/test/auto/kmconvert/kmconverttest.dpr
@@ -13,7 +13,7 @@ uses
   DUnitX.TestFramework,
   Keyman.Developer.System.Test.KMConvertParametersTest in 'Keyman.Developer.System.Test.KMConvertParametersTest.pas',
   Keyman.Developer.System.KMConvertParameters in '..\..\..\kmconvert\Keyman.Developer.System.KMConvertParameters.pas',
-  UKeymanTargets in '..\..\..\common\delphi\general\UKeymanTargets.pas',
+  UKeymanTargets in '..\..\..\common\windows\delphi\general\UKeymanTargets.pas',
   BCP47Tag in '..\..\..\..\..\common\windows\delphi\general\BCP47Tag.pas',
   Keyman.System.CanonicalLanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas',
   Keyman.System.LanguageCodeUtils in '..\..\..\..\..\common\windows\delphi\general\Keyman.System.LanguageCodeUtils.pas',
@@ -28,7 +28,7 @@ uses
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
   Keyman.System.Standards.LCIDToBCP47Registry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
   utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
-  StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas';
+  StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas';
 
 var
   runner : ITestRunner;
diff --git a/developer/src/test/auto/kmconvert/kmconverttest.dproj b/developer/src/test/auto/kmconvert/kmconverttest.dproj
index 0a04a7f320..ca80e02ecb 100644
--- a/developer/src/test/auto/kmconvert/kmconverttest.dproj
+++ b/developer/src/test/auto/kmconvert/kmconverttest.dproj
@@ -149,7 +149,7 @@
         </DelphiCompile>
         <DCCReference Include="Keyman.Developer.System.Test.KMConvertParametersTest.pas"/>
         <DCCReference Include="..\..\..\developer\kmconvert\Keyman.Developer.System.KMConvertParameters.pas"/>
-        <DCCReference Include="..\..\..\common\delphi\general\UKeymanTargets.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\UKeymanTargets.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\BCP47Tag.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Keyman.System.CanonicalLanguageCodeUtils.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Keyman.System.LanguageCodeUtils.pas"/>
@@ -164,7 +164,7 @@
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
index 1c26ce765f..aef131a3b0 100644
--- a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
+++ b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
@@ -18,7 +18,7 @@ uses
   utildir in '..\..\..\..\..\common\windows\delphi\general\utildir.pas',
   utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
   KeymanVersion in '..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
-  StockFileNames in '..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
   Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
diff --git a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
index 79bb38c38f..8c2fcb37ee 100644
--- a/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
+++ b/developer/src/test/auto/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
@@ -98,7 +98,7 @@
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utildir.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
-        <DCCReference Include="..\..\..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas"/>
diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr
index 569ed0bb03..37481c615c 100644
--- a/developer/src/tike/Tike.dpr
+++ b/developer/src/tike/Tike.dpr
@@ -89,7 +89,7 @@ uses
   utilsystem in '..\..\..\common\windows\delphi\general\utilsystem.pas',
   utilfiletypes in '..\..\..\common\windows\delphi\general\utilfiletypes.pas',
   UfrmNewFileDetails in 'dialogs\UfrmNewFileDetails.pas' {frmNewFileDetails},
-  StockFileNames in '..\..\..\windows\src\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\common\windows\delphi\general\StockFileNames.pas',
   CompileKeymanWeb in 'compile\CompileKeymanWeb.pas',
   KeymanWebKeyCodes in 'compile\KeymanWebKeyCodes.pas',
   utildir in '..\..\..\common\windows\delphi\general\utildir.pas',
@@ -102,7 +102,7 @@ uses
   utilstr in '..\..\..\common\windows\delphi\general\utilstr.pas',
   utilkeyboard in '..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas',
   KeyboardParser in 'main\KeyboardParser.pas',
-  TextFileFormat in '..\common\delphi\general\TextFileFormat.pas',
+  TextFileFormat in '..\common\windows\delphi\general\TextFileFormat.pas',
   KMDActions in '..\common\delphi\components\KMDActions.pas',
   KMDActionInterfaces in '..\common\delphi\components\KMDActionInterfaces.pas',
   UfrmHelp in 'main\UfrmHelp.pas' {frmHelp},
@@ -146,7 +146,7 @@ uses
   kmxfileutils in '..\..\..\common\windows\delphi\keyboards\kmxfileutils.pas',
   UfrmSelectWindowsLanguages in 'dialogs\languages\UfrmSelectWindowsLanguages.pas' {frmSelectWindowsLanguages: TTntForm},
   Keyman.Developer.UI.UfrmSelectBCP47Language in 'dialogs\languages\Keyman.Developer.UI.UfrmSelectBCP47Language.pas' {frmSelectBCP47Language: TTntForm},
-  WindowsLanguages in '..\common\delphi\general\WindowsLanguages.pas',
+  WindowsLanguages in '..\common\windows\delphi\general\WindowsLanguages.pas',
   wininet5 in '..\..\..\common\windows\delphi\general\wininet5.pas',
   TextFileTemplates in 'main\TextFileTemplates.pas',
   GlobalProxySettings in '..\..\..\common\windows\delphi\general\GlobalProxySettings.pas',
@@ -188,10 +188,10 @@ uses
   UfrmKeymanWizard in 'child\UfrmKeymanWizard.pas' {frmKeymanWizard},
   UfrmKeyboardFonts in 'dialogs\UfrmKeyboardFonts.pas' {frmKeyboardFonts},
   CompileErrorCodes in '..\common\delphi\compiler\CompileErrorCodes.pas',
-  KeyboardFonts in '..\common\delphi\general\KeyboardFonts.pas',
+  KeyboardFonts in '..\common\windows\delphi\general\KeyboardFonts.pas',
   JsonUtil in '..\..\..\common\windows\delphi\general\JsonUtil.pas',
   TikeUnicodeData in 'main\TikeUnicodeData.pas',
-  UKeymanTargets in '..\common\delphi\general\UKeymanTargets.pas',
+  UKeymanTargets in '..\common\windows\delphi\general\UKeymanTargets.pas',
   UfrmSMTPSetup in 'dialogs\UfrmSMTPSetup.pas' {frmSMTPSetup},
   UfrmSendURLsToEmail in 'dialogs\UfrmSendURLsToEmail.pas' {frmSendURLsToEmail},
   MSXMLDomCreate in '..\..\..\common\windows\delphi\general\MSXMLDomCreate.pas',
diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj
index 0994f1b100..da58fef3d5 100644
--- a/developer/src/tike/Tike.dproj
+++ b/developer/src/tike/Tike.dproj
@@ -214,7 +214,7 @@
         <DCCReference Include="dialogs\UfrmRegressionTestFailure.pas">
             <Form>frmRegressionTestFailure</Form>
         </DCCReference>
-        <DCCReference Include="debug\XString.pas"/>
+        <DCCReference Include="main\XString.pas"/>
         <DCCReference Include="debug\debugkeyboard.pas"/>
         <DCCReference Include="dialogs\Keyman.Developer.UI.UfrmMessageDlgWithSave.pas">
             <Form>frmMessageDlgWithSave</Form>
@@ -236,7 +236,7 @@
         <DCCReference Include="dialogs\UfrmNewFileDetails.pas">
             <Form>frmNewFileDetails</Form>
         </DCCReference>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="compile\CompileKeymanWeb.pas"/>
         <DCCReference Include="compile\KeymanWebKeyCodes.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\utildir.pas"/>
@@ -249,8 +249,8 @@
         <DCCReference Include="..\..\..\common\windows\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas"/>
         <DCCReference Include="main\KeyboardParser.pas"/>
-        <DCCReference Include="..\common\delphi\general\TextFileFormat.pas"/>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\comp\KMDActions.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\TextFileFormat.pas"/>
+        <DCCReference Include="..\common\delphi\components\KMDActions.pas"/>
         <DCCReference Include="..\common\delphi\components\KMDActionInterfaces.pas"/>
         <DCCReference Include="main\UfrmHelp.pas">
             <Form>frmHelp</Form>
@@ -333,7 +333,7 @@
             <Form>frmSelectBCP47Language</Form>
             <DesignClass>TTntForm</DesignClass>
         </DCCReference>
-        <DCCReference Include="..\common\delphi\general\WindowsLanguages.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\WindowsLanguages.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\wininet5.pas"/>
         <DCCReference Include="main\TextFileTemplates.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\GlobalProxySettings.pas"/>
@@ -419,10 +419,10 @@
             <Form>frmKeyboardFonts</Form>
         </DCCReference>
         <DCCReference Include="..\common\delphi\compiler\CompileErrorCodes.pas"/>
-        <DCCReference Include="..\common\delphi\general\KeyboardFonts.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\KeyboardFonts.pas"/>
         <DCCReference Include="..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
         <DCCReference Include="main\TikeUnicodeData.pas"/>
-        <DCCReference Include="..\common\delphi\general\UKeymanTargets.pas"/>
+        <DCCReference Include="..\common\windows\delphi\general\UKeymanTargets.pas"/>
         <DCCReference Include="dialogs\UfrmSMTPSetup.pas">
             <Form>frmSMTPSetup</Form>
         </DCCReference>
diff --git a/windows/src/buildtools/buildpkg/buildpkg.dpr b/windows/src/buildtools/buildpkg/buildpkg.dpr
index a69acad294..e1ebdb363e 100644
--- a/windows/src/buildtools/buildpkg/buildpkg.dpr
+++ b/windows/src/buildtools/buildpkg/buildpkg.dpr
@@ -23,7 +23,7 @@ uses
   RedistFiles in '..\..\..\..\developer\src\tike\main\RedistFiles.pas',
   DebugPaths in '..\..\..\..\common\windows\delphi\general\DebugPaths.pas',
   CustomisationStorage in '..\..\global\delphi\cust\CustomisationStorage.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   klog in '..\..\..\..\common\windows\delphi\general\klog.pas',
   httpuploader in '..\..\..\..\common\windows\delphi\general\httpuploader.pas',
   Upload_Settings in '..\..\..\..\common\windows\delphi\general\Upload_Settings.pas',
diff --git a/windows/src/buildtools/buildpkg/buildpkg.dproj b/windows/src/buildtools/buildpkg/buildpkg.dproj
index b59126f99f..49fdf4ab5a 100644
--- a/windows/src/buildtools/buildpkg/buildpkg.dproj
+++ b/windows/src/buildtools/buildpkg/buildpkg.dproj
@@ -110,7 +110,7 @@
         <DCCReference Include="..\..\..\..\developer\src\tike\main\RedistFiles.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
         <DCCReference Include="..\..\global\delphi\cust\CustomisationStorage.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\klog.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\httpuploader.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\Upload_Settings.pas"/>
diff --git a/windows/src/desktop/kmshell/kmshell.dpr b/windows/src/desktop/kmshell/kmshell.dpr
index bb612358e5..b20d90cffb 100644
--- a/windows/src/desktop/kmshell/kmshell.dpr
+++ b/windows/src/desktop/kmshell/kmshell.dpr
@@ -123,7 +123,7 @@ uses
   utilfocusappwnd in 'util\utilfocusappwnd.pas',
   UImportOlderVersionKeyboards8 in 'main\UImportOlderVersionKeyboards8.pas',
   KeymanPaths in '..\..\..\..\common\windows\delphi\general\KeymanPaths.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   KeymanEngineControl in '..\..\global\delphi\general\KeymanEngineControl.pas',
   KeymanOptionNames in '..\..\global\delphi\general\KeymanOptionNames.pas',
   VisualKeyboardLoaderBinary in '..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas',
diff --git a/windows/src/desktop/kmshell/kmshell.dproj b/windows/src/desktop/kmshell/kmshell.dproj
index 771525a887..d8a2beac27 100644
--- a/windows/src/desktop/kmshell/kmshell.dproj
+++ b/windows/src/desktop/kmshell/kmshell.dproj
@@ -266,7 +266,7 @@
         <DCCReference Include="util\utilfocusappwnd.pas"/>
         <DCCReference Include="main\UImportOlderVersionKeyboards8.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\global\delphi\general\KeymanEngineControl.pas"/>
         <DCCReference Include="..\..\global\delphi\general\KeymanOptionNames.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas"/>
diff --git a/windows/src/desktop/setup/setup.dpr b/windows/src/desktop/setup/setup.dpr
index 9f3ac7350a..0d9a16b875 100644
--- a/windows/src/desktop/setup/setup.dpr
+++ b/windows/src/desktop/setup/setup.dpr
@@ -35,7 +35,7 @@ uses
   PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
   utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas',
   utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   utildir in '..\..\..\..\common\windows\delphi\general\utildir.pas',
   JsonUtil in '..\..\..\..\common\windows\delphi\general\JsonUtil.pas',
   kmpinffile in '..\..\..\..\common\windows\delphi\packages\kmpinffile.pas',
diff --git a/windows/src/desktop/setup/setup.dproj b/windows/src/desktop/setup/setup.dproj
index 2c51bccea5..33a9d6f4a5 100644
--- a/windows/src/desktop/setup/setup.dproj
+++ b/windows/src/desktop/setup/setup.dproj
@@ -138,7 +138,7 @@
         <DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\utildir.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\packages\kmpinffile.pas"/>
diff --git a/windows/src/engine/keyman/keyman.dpr b/windows/src/engine/keyman/keyman.dpr
index 9de71a3fd2..f425f89042 100644
--- a/windows/src/engine/keyman/keyman.dpr
+++ b/windows/src/engine/keyman/keyman.dpr
@@ -94,7 +94,7 @@ uses
   keyman_msctf in '..\..\global\delphi\winapi\keyman_msctf.pas',
   KeymanDesktopShell in 'KeymanDesktopShell.pas',
   KeymanPaths in '..\..\..\..\common\windows\delphi\general\KeymanPaths.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   KeymanEngineControl in '..\..\global\delphi\general\KeymanEngineControl.pas',
   VisualKeyboardLoaderBinary in '..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas',
   VisualKeyboardLoaderXML in '..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas',
diff --git a/windows/src/engine/keyman/keyman.dproj b/windows/src/engine/keyman/keyman.dproj
index 3d8597bbf7..52c8dda9cf 100644
--- a/windows/src/engine/keyman/keyman.dproj
+++ b/windows/src/engine/keyman/keyman.dproj
@@ -218,7 +218,7 @@
         <DCCReference Include="..\..\global\delphi\winapi\keyman_msctf.pas"/>
         <DCCReference Include="KeymanDesktopShell.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\global\delphi\general\KeymanEngineControl.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderBinary.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\visualkeyboard\VisualKeyboardLoaderXML.pas"/>
diff --git a/windows/src/engine/kmcomapi/kmcomapi.dpr b/windows/src/engine/kmcomapi/kmcomapi.dpr
index 065ff1729c..0db7f5ea06 100644
--- a/windows/src/engine/kmcomapi/kmcomapi.dpr
+++ b/windows/src/engine/kmcomapi/kmcomapi.dpr
@@ -84,7 +84,7 @@ uses
   keymanapi_TLB in 'keymanapi_TLB.pas',
   kmxfile in '..\..\..\..\common\windows\delphi\keyboards\kmxfile.pas',
   utilhandleexception in 'util\utilhandleexception.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   CustomisationMenu in '..\..\global\delphi\cust\CustomisationMenu.pas',
   utilolepicture in 'util\utilolepicture.pas',
   utilxml in '..\..\..\..\common\windows\delphi\general\utilxml.pas',
diff --git a/windows/src/engine/kmcomapi/kmcomapi.dproj b/windows/src/engine/kmcomapi/kmcomapi.dproj
index e5c3d5aff0..9cf288d95c 100644
--- a/windows/src/engine/kmcomapi/kmcomapi.dproj
+++ b/windows/src/engine/kmcomapi/kmcomapi.dproj
@@ -222,7 +222,7 @@
         <DCCReference Include="keymanapi_TLB.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\keyboards\kmxfile.pas"/>
         <DCCReference Include="util\utilhandleexception.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\global\delphi\cust\CustomisationMenu.pas"/>
         <DCCReference Include="util\utilolepicture.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\utilxml.pas"/>
diff --git a/windows/src/engine/tsysinfo/tsysinfo.dpr b/windows/src/engine/tsysinfo/tsysinfo.dpr
index 34bd83aa00..d333e75d97 100644
--- a/windows/src/engine/tsysinfo/tsysinfo.dpr
+++ b/windows/src/engine/tsysinfo/tsysinfo.dpr
@@ -49,7 +49,7 @@ uses
   keyman_msctf in '..\..\global\delphi\winapi\keyman_msctf.pas',
   Glossary in '..\..\..\..\common\windows\delphi\general\Glossary.pas',
   TempFileManager in '..\..\..\..\common\windows\delphi\general\TempFileManager.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   kmxfileconsts in '..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas',
   Keyman.System.CEFManager in '..\..\..\..\common\windows\delphi\chromium\Keyman.System.CEFManager.pas',
   Keyman.UI.UframeCEFHost in '..\..\..\..\common\windows\delphi\chromium\Keyman.UI.UframeCEFHost.pas' {frameCEFHost},
diff --git a/windows/src/engine/tsysinfo/tsysinfo.dproj b/windows/src/engine/tsysinfo/tsysinfo.dproj
index dd4be456c2..eaca7762c2 100644
--- a/windows/src/engine/tsysinfo/tsysinfo.dproj
+++ b/windows/src/engine/tsysinfo/tsysinfo.dproj
@@ -198,7 +198,7 @@
         <DCCReference Include="..\..\global\delphi\winapi\keyman_msctf.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\Glossary.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\TempFileManager.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\keyboards\kmxfileconsts.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\chromium\Keyman.System.CEFManager.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\chromium\Keyman.UI.UframeCEFHost.pas">
diff --git a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr
index 07d1f1cfc0..6f4a235b9a 100644
--- a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr
+++ b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dpr
@@ -17,7 +17,7 @@ uses
   CRC32 in 'C:\Projects\keyman\open\common\windows\delphi\general\CRC32.pas',
   KeyNames in 'C:\Projects\keyman\open\common\windows\delphi\general\KeyNames.pas',
   KeymanVersion in 'C:\Projects\keyman\open\common\windows\delphi\general\KeymanVersion.pas',
-  StockFileNames in 'C:\Projects\keyman\open\windows\src\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in 'C:\Projects\keyman\open\windows\src\..\..\common\windows\delphi\general\StockFileNames.pas',
   Unicode in 'C:\Projects\keyman\open\common\windows\delphi\general\Unicode.pas',
   JsonUtil in 'C:\Projects\keyman\open\common\windows\delphi\general\JsonUtil.pas';
 
diff --git a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj
index 05ea9e4111..48edcb38d9 100644
--- a/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj
+++ b/windows/src/support/convert-iso6393-to-bcp47-for-keyboards/cvt.dproj
@@ -108,7 +108,7 @@
         <DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\CRC32.pas"/>
         <DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\KeyNames.pas"/>
         <DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\KeymanVersion.pas"/>
-        <DCCReference Include="C:\Projects\keyman\open\windows\src\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="C:\Projects\keyman\open\windows\src\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\Unicode.pas"/>
         <DCCReference Include="C:\Projects\keyman\open\common\windows\delphi\general\JsonUtil.pas"/>
         <BuildConfiguration Include="Release">
diff --git a/windows/src/support/kmxfonts/kmxfonts.dpr b/windows/src/support/kmxfonts/kmxfonts.dpr
index 436d2def29..86a9bf1ce9 100644
--- a/windows/src/support/kmxfonts/kmxfonts.dpr
+++ b/windows/src/support/kmxfonts/kmxfonts.dpr
@@ -15,7 +15,7 @@ uses
   utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
   utilkeyboard in '..\..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas',
   KeymanVersion in '..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas';
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas';
 
 {$R *.res}
 
diff --git a/windows/src/support/kmxfonts/kmxfonts.dproj b/windows/src/support/kmxfonts/kmxfonts.dproj
index e395b46346..1964ec9750 100644
--- a/windows/src/support/kmxfonts/kmxfonts.dproj
+++ b/windows/src/support/kmxfonts/kmxfonts.dproj
@@ -231,7 +231,7 @@
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\keyboards\utilkeyboard.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr
index fdabdaffae..6837444caa 100644
--- a/windows/src/test/manual-tests/inffiletests/packageinftool.dpr
+++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dpr
@@ -9,7 +9,7 @@ uses
   PackageInfo in '..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
   utilfiletypes in '..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
   utilstr in '..\..\..\..\common\windows\delphi\general\utilstr.pas',
-  StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   Unicode in '..\..\..\..\common\windows\delphi\general\Unicode.pas',
   KeymanVersion in '..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
   VersionInfo in '..\..\..\..\common\windows\delphi\general\VersionInfo.pas',
diff --git a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj
index eee1aeedbf..9023ecca0b 100644
--- a/windows/src/test/manual-tests/inffiletests/packageinftool.dproj
+++ b/windows/src/test/manual-tests/inffiletests/packageinftool.dproj
@@ -91,7 +91,7 @@
         <DCCReference Include="..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
-        <DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr
index b59c9dda05..1bd9aa5e8b 100644
--- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr
+++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dpr
@@ -11,7 +11,7 @@ uses
   PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
   utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
   utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
-  StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
   KeymanVersion in '..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
   VersionInfo in '..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas',
diff --git a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj
index 7e8a158e94..3bdbd31793 100644
--- a/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj
+++ b/windows/src/test/unit-tests/package-info/PackageInfoTestSuite.dproj
@@ -94,7 +94,7 @@
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\KeymanVersion.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
diff --git a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr
index 0905e3cb5a..716aa37def 100644
--- a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr
+++ b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dpr
@@ -15,7 +15,7 @@ uses
   Keyman.Setup.System.InstallInfo in '..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas',
   PackageInfo in '..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas',
   utilfiletypes in '..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas',
-  StockFileNames in '..\..\..\global\delphi\cust\StockFileNames.pas',
+  StockFileNames in '..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas',
   utilstr in '..\..\..\..\..\common\windows\delphi\general\utilstr.pas',
   Unicode in '..\..\..\..\..\common\windows\delphi\general\Unicode.pas',
   JsonUtil in '..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas',
diff --git a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj
index e52340cb74..64ebf2d805 100644
--- a/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj
+++ b/windows/src/test/unit-tests/windows-setup/WindowsSetupTest.dproj
@@ -105,7 +105,7 @@
         <DCCReference Include="..\..\..\desktop\setup\Keyman.Setup.System.InstallInfo.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\packages\PackageInfo.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilfiletypes.pas"/>
-        <DCCReference Include="..\..\..\global\delphi\cust\StockFileNames.pas"/>
+        <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\StockFileNames.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\utilstr.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
         <DCCReference Include="..\..\..\..\..\common\windows\delphi\general\JsonUtil.pas"/>