diff --git a/developer/src/Defines.mak b/developer/src/Defines.mak
index acad0e0f10..3b26a06690 100644
--- a/developer/src/Defines.mak
+++ b/developer/src/Defines.mak
@@ -6,6 +6,7 @@ DEVELOPER_ROOT=$(KEYMAN_ROOT)\developer
 WINDOWS_ROOT=$(KEYMAN_ROOT)\windows
 
 DEVELOPER_PROGRAM=$(DEVELOPER_ROOT)\bin
+DEVELOPER_OUTLIB=$(DEVELOPER_ROOT)\lib
 DEVELOPER_DEBUGPATH=$(DEVELOPER_ROOT)\debug
 
 # Temporary import of windows/src/Defines.mak
diff --git a/developer/src/kmcmpdll/Makefile b/developer/src/kmcmpdll/Makefile
index cc91e84942..1769adac77 100644
--- a/developer/src/kmcmpdll/Makefile
+++ b/developer/src/kmcmpdll/Makefile
@@ -2,14 +2,14 @@
 # KMCmpDll Makefile
 #
 
-!include ..\..\Defines.mak
+!include ..\Defines.mak
 
 
 build: version.res dirs
     $(MSBUILD) kmcmpdll.vcxproj $(MSBUILD_BUILD) "/p:Platform=Win32"
-    $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.dll $(PROGRAM)\developer
-    $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.lib $(OUTLIB)
-    $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.pdb $(DEBUGPATH)\developer
+    $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.dll $(DEVELOPER_PROGRAM)
+    $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.lib $(DEVELOPER_OUTLIB)
+    $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.pdb $(DEVELOPER_DEBUGPATH)
 # for debugging purposes, it's useful to have a copy
 # of kmcmpdll.dll in the TIKE project folder; it is
 # .gitignored
@@ -19,9 +19,9 @@ build: version.res dirs
     $(COPY) $(WIN32_TARGET_PATH)\kmcmpdll.dll ..\kmcomp\$(WIN32_TARGET_PATH)\kmcmpdll.dll
 
     $(MSBUILD) kmcmpdll.vcxproj $(MSBUILD_BUILD) "/p:Platform=x64"
-    $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.dll $(PROGRAM)\developer\kmcmpdll.x64.dll
-    $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.lib $(OUTLIB)\kmcmpdll.x64.lib
-    $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.pdb $(DEBUGPATH)\developer\kmcmpdll.x64.pdb
+    $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.dll $(DEVELOPER_PROGRAM)\kmcmpdll.x64.dll
+    $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.lib $(DEVELOPER_OUTLIB)\kmcmpdll.x64.lib
+    $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.pdb $(DEVELOPER_DEBUGPATH)\kmcmpdll.x64.pdb
     -mkdir ..\kmcomp\$(X64_TARGET_PATH)
     $(COPY) $(X64_TARGET_PATH)\kmcmpdll.x64.dll ..\kmcomp\$(X64_TARGET_PATH)\kmcmpdll.x64.dll
 
@@ -30,20 +30,20 @@ clean: def-clean
     $(MSBUILD) kmcmpdll.vcxproj $(MSBUILD_CLEAN)
 
 signcode:
-    $(SIGNCODE) /d "Keyman Developer Compiler" $(PROGRAM)\developer\kmcmpdll.dll
-    $(SIGNCODE) /d "Keyman Developer Compiler" $(PROGRAM)\developer\kmcmpdll.x64.dll
+    $(SIGNCODE) /d "Keyman Developer Compiler" $(DEVELOPER_PROGRAM)\kmcmpdll.dll
+    $(SIGNCODE) /d "Keyman Developer Compiler" $(DEVELOPER_PROGRAM)\kmcmpdll.x64.dll
 
 wrap-symbols:
-    $(SYMSTORE) $(PROGRAM)\developer\kmcmpdll.dll /t keyman-developer
-    $(SYMSTORE) $(PROGRAM)\developer\kmcmpdll.x64.dll /t keyman-developer
-    $(SYMSTORE) $(DEBUGPATH)\developer\kmcmpdll.pdb /t keyman-developer
-    $(SYMSTORE) $(DEBUGPATH)\developer\kmcmpdll.x64.pdb /t keyman-developer
+    $(SYMSTORE) $(DEVELOPER_PROGRAM)\kmcmpdll.dll /t keyman-developer
+    $(SYMSTORE) $(DEVELOPER_PROGRAM)\kmcmpdll.x64.dll /t keyman-developer
+    $(SYMSTORE) $(DEVELOPER_DEBUGPATH)\kmcmpdll.pdb /t keyman-developer
+    $(SYMSTORE) $(DEVELOPER_DEBUGPATH)\kmcmpdll.x64.pdb /t keyman-developer
 
 test-manifest:
     @rem This target needed as dependency for TIKE and KMCMPDLL
 
 install:
-    $(COPY) $(PROGRAM)\developer\kmcmpdll.dll "$(INSTALLPATH_KEYMANDEVELOPER)\kmcmpdll.dll"
-    $(COPY) $(PROGRAM)\developer\kmcmpdll.x64.dll "$(INSTALLPATH_KEYMANDEVELOPER)\kmcmpdll.x64.dll"
+    $(COPY) $(DEVELOPER_PROGRAM)\kmcmpdll.dll "$(INSTALLPATH_KEYMANDEVELOPER)\kmcmpdll.dll"
+    $(COPY) $(DEVELOPER_PROGRAM)\kmcmpdll.x64.dll "$(INSTALLPATH_KEYMANDEVELOPER)\kmcmpdll.x64.dll"
 
-!include ..\..\Target.mak
+!include ..\Target.mak
diff --git a/developer/src/kmcmpdll/kmcmpdll.vcxproj b/developer/src/kmcmpdll/kmcmpdll.vcxproj
index be57836f2f..779e14d4a6 100644
--- a/developer/src/kmcmpdll/kmcmpdll.vcxproj
+++ b/developer/src/kmcmpdll/kmcmpdll.vcxproj
@@ -87,20 +87,20 @@
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\ext\json;..\..\ext\json-schema-validator</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\ext\json;$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator</IncludePath>
     <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\ext\json;..\..\ext\json-schema-validator</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\ext\json;$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator</IncludePath>
     <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
     <TargetName>$(ProjectName).x64</TargetName>
     <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\ext\json;..\..\ext\json-schema-validator</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\ext\json;$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\ext\json;..\..\ext\json-schema-validator</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(KEYMAN_ROOT)\windows\src\ext\json;$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator</IncludePath>
     <IntDir>$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
     <TargetName>$(ProjectName).x64</TargetName>
     <OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
@@ -118,7 +118,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(KEYMAN_ROOT)\windows\src\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);JSON_SCHEMA_VALIDATOR_EXPORTS</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -135,7 +135,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0c09</Culture>
-      <AdditionalIncludeDirectories>..\..\global\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -166,7 +166,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(KEYMAN_ROOT)\windows\src\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);JSON_SCHEMA_VALIDATOR_EXPORTS</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -183,7 +183,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0c09</Culture>
-      <AdditionalIncludeDirectories>..\..\global\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -210,7 +210,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(KEYMAN_ROOT)\windows\src\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);JSON_SCHEMA_VALIDATOR_EXPORTS</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -226,7 +226,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0c09</Culture>
-      <AdditionalIncludeDirectories>..\..\global\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -254,7 +254,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\..\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(KEYMAN_ROOT)\windows\src\global\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);JSON_SCHEMA_VALIDATOR_EXPORTS</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -270,7 +270,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0c09</Culture>
-      <AdditionalIncludeDirectories>..\..\global\inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(KEYMAN_ROOT)\windows\src\global\inc</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;setupapi.lib;iphlpapi.lib;imm32.lib;crypt32.lib;wintrust.lib;imagehlp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -286,21 +286,21 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\ext\json-schema-validator\json-schema.hpp" />
-    <ClInclude Include="..\..\ext\json\json.hpp" />
-    <ClInclude Include="..\..\global\inc\certificate_check.h" />
-    <ClInclude Include="..\..\global\inc\Comperr.h" />
-    <ClInclude Include="..\..\global\inc\Compfile.h" />
-    <ClInclude Include="..\..\global\inc\Compiler.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator\json-schema.hpp" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\ext\json\json.hpp" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\certificate_check.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\Comperr.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\Compfile.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\Compiler.h" />
     <ClInclude Include="CasedKeys.h" />
     <ClInclude Include="CharToKeyConversion.h" />
     <ClInclude Include="CheckForDuplicates.h" />
     <ClInclude Include="CheckFilenameConsistency.h" />
     <ClInclude Include="CheckNCapsConsistency.h" />
     <ClInclude Include="comprc.h" />
-    <ClInclude Include="..\..\global\inc\ConvertUTF.h" />
-    <ClInclude Include="..\..\global\inc\crc32.h" />
-    <ClInclude Include="..\..\global\inc\debugstore.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\ConvertUTF.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\crc32.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\debugstore.h" />
     <ClInclude Include="DeprecationChecks.h" />
     <ClInclude Include="Edition.h" />
     <ClInclude Include="keyman64.h" />
@@ -308,32 +308,32 @@
     <ClInclude Include="NamedCodeConstants.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="..\..\global\inc\unicode.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\unicode.h" />
     <ClInclude Include="UnreachableRules.h" />
     <ClInclude Include="versioning.h" />
     <ClInclude Include="virtualcharkeys.h" />
-    <ClInclude Include="..\..\global\inc\Vkeys.h" />
+    <ClInclude Include="$(KEYMAN_ROOT)\windows\src\global\inc\Vkeys.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\ext\json-schema-validator\json-schema-draft4.json.cpp">
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator\json-schema-draft4.json.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\ext\json-schema-validator\json-uri.cpp">
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator\json-uri.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\ext\json-schema-validator\json-validator.cpp">
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\ext\json-schema-validator\json-validator.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\global\vc\xstring.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\global\vc\xstring.cpp" />
     <ClCompile Include="CasedKeys.cpp" />
     <ClCompile Include="CharToKeyConversion.cpp" />
     <ClCompile Include="CheckForDuplicates.cpp" />
@@ -349,7 +349,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\global\vc\ConvertUTF.c">
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\global\vc\ConvertUTF.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -363,7 +363,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\global\vc\crc32.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\global\vc\crc32.cpp" />
     <ClCompile Include="DeprecationChecks.cpp" />
     <ClCompile Include="Edition.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -391,8 +391,8 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\global\vc\rc4.cpp" />
-    <ClCompile Include="..\..\global\vc\registry.cpp">
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\global\vc\rc4.cpp" />
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\global\vc\registry.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -402,7 +402,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\global\vc\unicode.cpp">
+    <ClCompile Include="$(KEYMAN_ROOT)\windows\src\global\vc\unicode.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/windows/src/Target.mak b/windows/src/Target.mak
index 090dbafac2..4d40433317 100644
--- a/windows/src/Target.mak
+++ b/windows/src/Target.mak
@@ -56,7 +56,9 @@ dirs:
     -mkdir $(ROOT)\bin\help\md 2>nul
     -mkdir $(ROOT)\bin\help\md\desktop 2>nul
     -mkdir $(ROOT)\lib 2>nul
+    -mkdir $(KEYMAN_ROOT)\developer\lib 2>nul
     -mkdir $(ROOT)\release 2>nul
+    -mkdir $(KEYMAN_ROOT)\developer\release 2>nul
 
     -mkdir $(KEYMAN_ROOT)\developer\debug 2>nul
     -mkdir $(ROOT)\debug\buildtools 2>nul