diff --git a/windows/src/global/inc/kmtip_guids.h b/windows/include/kmtip_guids.h
similarity index 100%
rename from windows/src/global/inc/kmtip_guids.h
rename to windows/include/kmtip_guids.h
diff --git a/windows/src/engine/keyman32/Keyman32.vcxproj b/windows/src/engine/keyman32/Keyman32.vcxproj
index 83235f8463..e7d1df54d0 100644
--- a/windows/src/engine/keyman32/Keyman32.vcxproj
+++ b/windows/src/engine/keyman32/Keyman32.vcxproj
@@ -359,7 +359,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="keymanengine.h" />
-    <ClInclude Include="..\..\global\inc\kmtip_guids.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
     <ClInclude Include="addins.h" />
     <ClInclude Include="appint\aiTIP.h" />
     <ClInclude Include="appint\aiWin2000Unicode.h" />
diff --git a/windows/src/engine/keyman32/Keyman32.vcxproj.filters b/windows/src/engine/keyman32/Keyman32.vcxproj.filters
index 763f38aa28..5653929559 100644
--- a/windows/src/engine/keyman32/Keyman32.vcxproj.filters
+++ b/windows/src/engine/keyman32/Keyman32.vcxproj.filters
@@ -246,7 +246,7 @@
     <ClInclude Include="kmprocessactions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\global\inc\kmtip_guids.h">
+    <ClInclude Include="..\..\..\include\kmtip_guids.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/windows/src/engine/keyman32/globals.h b/windows/src/engine/keyman32/globals.h
index 222b15e431..2c321d809c 100644
--- a/windows/src/engine/keyman32/globals.h
+++ b/windows/src/engine/keyman32/globals.h
@@ -61,7 +61,7 @@
 #include "serialkeyeventclient.h"
 #include "SharedBuffers.h"
 
-#include "kmtip_guids.h"
+#include "..\..\..\include\kmtip_guids.h"
 
 class Globals
 {
diff --git a/windows/src/engine/keyman32/keymanengine.h b/windows/src/engine/keyman32/keymanengine.h
index 1e190d5553..8904e8df2f 100644
--- a/windows/src/engine/keyman32/keymanengine.h
+++ b/windows/src/engine/keyman32/keymanengine.h
@@ -264,7 +264,7 @@ void keybd_shift(LPINPUT pInputs, int* n, BOOL isReset, LPBYTE const kbd);
 
 #include "testkeymanfunctioning.h"
 #include "keynames.h"
-#include "kmtip_guids.h"
+#include "..\..\..\include\kmtip_guids.h"
 
 #include "crc32.h"
 
diff --git a/windows/src/global/inc/testkeymanfunctioning.h b/windows/src/engine/keyman32/testkeymanfunctioning.h
similarity index 100%
rename from windows/src/global/inc/testkeymanfunctioning.h
rename to windows/src/engine/keyman32/testkeymanfunctioning.h
diff --git a/windows/src/engine/keyman64/keyman64.vcxproj b/windows/src/engine/keyman64/keyman64.vcxproj
index e7ec20205b..016575df3a 100644
--- a/windows/src/engine/keyman64/keyman64.vcxproj
+++ b/windows/src/engine/keyman64/keyman64.vcxproj
@@ -277,7 +277,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\keyman32\keymanengine.h" />
-    <ClInclude Include="..\..\global\inc\kmtip_guids.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
     <ClInclude Include="..\keyman32\addins.h" />
     <ClInclude Include="..\keyman32\appint\aiTIP.h" />
     <ClInclude Include="..\keyman32\appint\aiWin2000Unicode.h" />
@@ -314,7 +314,7 @@
     <ClInclude Include="..\keyman32\serialkeyeventserver.h" />
     <ClInclude Include="..\keyman32\SharedBuffers.h" />
     <ClInclude Include="..\keyman32\syskbd.h" />
-    <ClInclude Include="..\..\global\inc\testkeymanfunctioning.h" />
+    <ClInclude Include="..\keyman32\testkeymanfunctioning.h" />
     <ClInclude Include="..\..\global\inc\unicode.h" />
     <ClInclude Include="..\keyman32\vkscancodes.h" />
   </ItemGroup>
diff --git a/windows/src/engine/keyman64/keyman64.vcxproj.filters b/windows/src/engine/keyman64/keyman64.vcxproj.filters
index b4327d6622..2ef4891b0c 100644
--- a/windows/src/engine/keyman64/keyman64.vcxproj.filters
+++ b/windows/src/engine/keyman64/keyman64.vcxproj.filters
@@ -75,12 +75,12 @@
     <ClInclude Include="..\keyman32\serialkeyeventserver.h" />
     <ClInclude Include="..\keyman32\SharedBuffers.h" />
     <ClInclude Include="..\keyman32\syskbd.h" />
-    <ClInclude Include="..\..\global\inc\testkeymanfunctioning.h" />
+    <ClInclude Include="..\keyman32\testkeymanfunctioning.h" />
     <ClInclude Include="..\..\global\inc\unicode.h" />
     <ClInclude Include="..\keyman32\vkscancodes.h" />
     <ClInclude Include="..\keyman32\keymanengine.h" />
     <ClInclude Include="..\keyman32\kmprocessactions.h" />
-    <ClInclude Include="..\..\global\inc\kmtip_guids.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\keyman32\keyman-debug-etw.man" />
diff --git a/windows/src/engine/kmtip/globals.h b/windows/src/engine/kmtip/globals.h
index b5ca51249b..3990251765 100644
--- a/windows/src/engine/kmtip/globals.h
+++ b/windows/src/engine/kmtip/globals.h
@@ -1,18 +1,18 @@
 /*
   Name:             globals
   Copyright:        Copyright (C) SIL International.
-  Documentation:    
-  Description:      
+  Documentation:
+  Description:
   Create Date:      1 Aug 2006
 
   Modified Date:    28 Mar 2016
   Authors:          mcdurdin
-  Related Files:    
-  Dependencies:     
+  Related Files:
+  Dependencies:
 
-  Bugs:             
-  Todo:             
-  Notes:            
+  Bugs:
+  Todo:
+  Notes:
   History:          01 Aug 2006 - mcdurdin - Removed ARRAYSIZE define
                     05 Nov 2007 - mcdurdin - CHange msctf reference
                     07 Sep 2009 - mcdurdin - I2095 - Threadsafe
@@ -29,7 +29,7 @@
 #ifndef GLOBALS_H
 #define GLOBALS_H
 
-#include "kmtip_guids.h"
+#include "..\..\..\include\kmtip_guids.h"
 #define assert(x)
 
 //
@@ -57,7 +57,7 @@ void Log(WCHAR *fmt, ...);
 BOOL ShouldDebug();
 int SendDebugMessage_1(char *file, int line, PWCHAR msg);   // I4379
 int SendDebugMessageFormat_1(char *file, int line, PWCHAR fmt, ...);   // I4379
-void DebugLastError_1(char *file, int line, char *func, PWCHAR msg, DWORD err); 
+void DebugLastError_1(char *file, int line, char *func, PWCHAR msg, DWORD err);
 
 #define SendDebugMessage(msg) (SendDebugMessage_1(__FILE__, __LINE__, (msg)))
 #define SendDebugMessageFormat(msg,...) (SendDebugMessageFormat_1(__FILE__, __LINE__, (msg),__VA_ARGS__))
@@ -88,7 +88,7 @@ BOOL _LogSUCCEEDED(char *file, int line, PWSTR caller, PSTR callee, HRESULT hr);
     {                           \
         (punk)->Release();      \
     }                           \
-}                   
+}
 
 #define SafeReleaseClear(punk)  \
 {                               \
@@ -97,7 +97,7 @@ BOOL _LogSUCCEEDED(char *file, int line, PWSTR caller, PSTR callee, HRESULT hr);
         (punk)->Release();      \
         (punk) = NULL;          \
     }                           \
-}                   
+}
 
 extern HINSTANCE g_hInst;
 
diff --git a/windows/src/engine/kmtip/kmtip.vcxproj b/windows/src/engine/kmtip/kmtip.vcxproj
index 9fc0b6f2f0..c4d50ea23f 100644
--- a/windows/src/engine/kmtip/kmtip.vcxproj
+++ b/windows/src/engine/kmtip/kmtip.vcxproj
@@ -419,7 +419,7 @@
     <ClInclude Include="..\..\..\..\common\windows\cpp\include\vkeys.h" />
     <ClInclude Include="..\..\global\inc\certificate_check.h" />
     <ClInclude Include="$(KEYMAN_ROOT)\common\windows\cpp\include\legacy_kmx_file.h" />
-    <ClInclude Include="..\..\global\inc\kmtip_guids.h" />
+    <ClInclude Include="..\..\..\include\kmtip_guids.h" />
     <ClInclude Include="editsess.h" />
     <ClInclude Include="globals.h" />
     <ClInclude Include="..\..\global\inc\KEYNAMES.H" />
diff --git a/windows/src/engine/kmtip/kmtip.vcxproj.filters b/windows/src/engine/kmtip/kmtip.vcxproj.filters
index 04cb18843c..7777f14833 100644
--- a/windows/src/engine/kmtip/kmtip.vcxproj.filters
+++ b/windows/src/engine/kmtip/kmtip.vcxproj.filters
@@ -114,7 +114,7 @@
     <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\global\inc\kmtip_guids.h">
+    <ClInclude Include="..\..\..\include\kmtip_guids.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\common\windows\cpp\include\vkeys.h">