diff --git a/common/windows/delphi/general/klog.pas b/common/windows/delphi/general/klog.pas
index 2756c63893..2787f8b347 100644
--- a/common/windows/delphi/general/klog.pas
+++ b/common/windows/delphi/general/klog.pas
@@ -23,7 +23,7 @@ unit klog;  // I3309
 
 interface
 
-{$DEFINE KLOGGING}
+{DEFINE KLOGGING}
 
 {$IFDEF KLOGGING}
 uses
diff --git a/core/tests/unit/kmx/fixtures/meson.build b/core/tests/unit/kmx/fixtures/meson.build
index 711bae6f80..e40c30ad46 100644
--- a/core/tests/unit/kmx/fixtures/meson.build
+++ b/core/tests/unit/kmx/fixtures/meson.build
@@ -2,5 +2,5 @@ if node.found()
   # Note: if node is not available, we cannot build the keyboards; build.sh
   # emits a warning that the 'ldml' keyboard tests will be skipped; that
   # includes these tests for now
-  #subdir('binary')
-endif
+  subdir('binary')
+endif
\ No newline at end of file
diff --git a/core/tests/unit/meson.build b/core/tests/unit/meson.build
index 4b0bb489e5..ee141cc12d 100644
--- a/core/tests/unit/meson.build
+++ b/core/tests/unit/meson.build
@@ -10,6 +10,6 @@ hextobin_cmd = [node, hextobin_root]
 
 subdir('json')
 subdir('utftest')
-#subdir('kmnkbd')
-#subdir('kmx')
-#subdir('ldml')
+subdir('kmnkbd')
+subdir('kmx')
+subdir('ldml')
diff --git a/windows/src/desktop/insthelp/insthelp.dpr b/windows/src/desktop/insthelp/insthelp.dpr
index 905e4ac8eb..ab0e47ff7d 100644
--- a/windows/src/desktop/insthelp/insthelp.dpr
+++ b/windows/src/desktop/insthelp/insthelp.dpr
@@ -8,12 +8,7 @@ uses
   KeymanVersion in '..\..\..\..\common\windows\delphi\general\KeymanVersion.pas',
   Keyman.System.InstHelp.KeymanStartTaskUninstall in 'Keyman.System.InstHelp.KeymanStartTaskUninstall.pas',
   TaskScheduler_TLB in '..\..\global\delphi\winapi\TaskScheduler_TLB.pas',
-  ErrorControlledRegistry in '..\..\..\..\common\windows\delphi\vcl\ErrorControlledRegistry.pas',
-  UserMessages in '..\..\..\..\common\windows\delphi\general\UserMessages.pas',
-  DebugPaths in '..\..\..\..\common\windows\delphi\general\DebugPaths.pas',
-  VersionInfo in '..\..\..\..\common\windows\delphi\general\VersionInfo.pas',
-  Unicode in '..\..\..\..\common\windows\delphi\general\Unicode.pas',
-  KeymanPaths in '..\..\..\..\common\windows\delphi\general\KeymanPaths.pas';
+  UserMessages in '..\..\..\..\common\windows\delphi\general\UserMessages.pas';
 
 {$R version.res}
 {-R manifest.res}
diff --git a/windows/src/desktop/insthelp/insthelp.dproj b/windows/src/desktop/insthelp/insthelp.dproj
index cfb0ad37fc..45913bd470 100644
--- a/windows/src/desktop/insthelp/insthelp.dproj
+++ b/windows/src/desktop/insthelp/insthelp.dproj
@@ -98,11 +98,6 @@
         <DCCReference Include="Keyman.System.InstHelp.KeymanStartTaskUninstall.pas"/>
         <DCCReference Include="..\..\global\delphi\winapi\TaskScheduler_TLB.pas"/>
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\UserMessages.pas"/>
-        <DCCReference Include="..\..\..\..\common\windows\delphi\vcl\ErrorControlledRegistry.pas"/>
-        <DCCReference Include="..\..\..\..\common\windows\delphi\general\KeymanPaths.pas"/>
-        <DCCReference Include="..\..\..\..\common\windows\delphi\general\DebugPaths.pas"/>
-        <DCCReference Include="..\..\..\..\common\windows\delphi\general\VersionInfo.pas"/>
-        <DCCReference Include="..\..\..\..\common\windows\delphi\general\Unicode.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>