diff --git a/windows/src/global/delphi/comp/KeymanDeveloperDebuggerMemo.pas b/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
similarity index 100%
rename from windows/src/global/delphi/comp/KeymanDeveloperDebuggerMemo.pas
rename to developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
diff --git a/developer/src/common/delphi/components/developer_components.dpk b/developer/src/common/delphi/components/developer_components.dpk
index ccb808d366..44ef46afac 100644
--- a/developer/src/common/delphi/components/developer_components.dpk
+++ b/developer/src/common/delphi/components/developer_components.dpk
@@ -37,6 +37,7 @@ contains
   CloseButtonPageControl in 'CloseButtonPageControl.pas',
   DebugBitBtn in 'DebugBitBtn.pas',
   DebugListBox in 'DebugListBox.pas',
-  DebugListView in 'DebugListView.pas';
+  DebugListView in 'DebugListView.pas',
+  KeymanDeveloperDebuggerMemo in 'KeymanDeveloperDebuggerMemo.pas';
 
 end.
diff --git a/developer/src/common/delphi/components/developer_components.dproj b/developer/src/common/delphi/components/developer_components.dproj
index e80c171ee3..59f5e28376 100644
--- a/developer/src/common/delphi/components/developer_components.dproj
+++ b/developer/src/common/delphi/components/developer_components.dproj
@@ -132,6 +132,7 @@
         <DCCReference Include="DebugBitBtn.pas"/>
         <DCCReference Include="DebugListBox.pas"/>
         <DCCReference Include="DebugListView.pas"/>
+        <DCCReference Include="KeymanDeveloperDebuggerMemo.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/developer/src/tike/Tike.dpr b/developer/src/tike/Tike.dpr
index c8fae2fddc..8d9257f597 100644
--- a/developer/src/tike/Tike.dpr
+++ b/developer/src/tike/Tike.dpr
@@ -215,7 +215,7 @@ uses
   DropTarget in '..\..\..\windows\src\global\delphi\general\DropTarget.pas',
   CloseButtonPageControl in '..\common\delphi\components\CloseButtonPageControl.pas',
   UfrmTIKEDock in 'dockforms\UfrmTIKEDock.pas' {TIKEDockForm},
-  KeymanDeveloperDebuggerMemo in '..\..\..\windows\src\global\delphi\comp\KeymanDeveloperDebuggerMemo.pas',
+  KeymanDeveloperDebuggerMemo in '..\common\delphi\components\KeymanDeveloperDebuggerMemo.pas',
   UfrmCharacterMapDock in 'dockforms\UfrmCharacterMapDock.pas' {frmCharacterMapDock},
   Keyman.System.PackageInfoRefreshKeyboards in '..\common\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
   Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\..\common\windows\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
diff --git a/developer/src/tike/Tike.dproj b/developer/src/tike/Tike.dproj
index bde0ec5fd9..383ee6ee40 100644
--- a/developer/src/tike/Tike.dproj
+++ b/developer/src/tike/Tike.dproj
@@ -455,7 +455,7 @@
         <DCCReference Include="dockforms\UfrmTIKEDock.pas">
             <Form>TIKEDockForm</Form>
         </DCCReference>
-        <DCCReference Include="..\..\..\windows\src\global\delphi\comp\KeymanDeveloperDebuggerMemo.pas"/>
+        <DCCReference Include="..\common\delphi\components\KeymanDeveloperDebuggerMemo.pas"/>
         <DCCReference Include="dockforms\UfrmCharacterMapDock.pas">
             <Form>frmCharacterMapDock</Form>
         </DCCReference>
diff --git a/windows/src/global/delphi/keyman_components.dpk b/windows/src/global/delphi/keyman_components.dpk
index 1e36d6a7df..109796cfa5 100644
--- a/windows/src/global/delphi/keyman_components.dpk
+++ b/windows/src/global/delphi/keyman_components.dpk
@@ -64,7 +64,6 @@ contains
   Glossary in 'general\Glossary.pas',
   RegistryKeys in 'general\RegistryKeys.pas',
   KeymanVersion in 'general\KeymanVersion.pas',
-  KeymanDeveloperDebuggerMemo in 'comp\KeymanDeveloperDebuggerMemo.pas',
   TextFileFormat in '..\..\..\..\developer\src\tike\main\TextFileFormat.pas';
 
 end.
diff --git a/windows/src/global/delphi/keyman_components.dproj b/windows/src/global/delphi/keyman_components.dproj
index 4f4e282363..bd8990fe6e 100644
--- a/windows/src/global/delphi/keyman_components.dproj
+++ b/windows/src/global/delphi/keyman_components.dproj
@@ -132,7 +132,6 @@
         <DCCReference Include="general\Glossary.pas"/>
         <DCCReference Include="general\RegistryKeys.pas"/>
         <DCCReference Include="general\KeymanVersion.pas"/>
-        <DCCReference Include="comp\KeymanDeveloperDebuggerMemo.pas"/>
         <DCCReference Include="..\..\..\..\developer\src\tike\main\TextFileFormat.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>