diff --git a/sys/windows/vs/FetchPrereq/fetchprereq.nmake b/sys/windows/vs/FetchPrereq/fetchprereq.nmake
index 41c5a8a6f..3b0ea1b8c 100644
--- a/sys/windows/vs/FetchPrereq/fetchprereq.nmake
+++ b/sys/windows/vs/FetchPrereq/fetchprereq.nmake
@@ -51,7 +51,7 @@ fetch-pdcurses:
 	cd $(LIBDIR)
 	curl --insecure -L -R $(PDCURL)$(PDCURSES_VERSION).zip -o $(PDCDIST).zip
 	if not exist $(PDCDIST)\*.* mkdir $(PDCDIST)
-	tar -C $(PDCDIST) --strip-components=1 -xvf $(CURLPDCDST).zip
+	tar -zxC $(PDCDIST) --strip-components=1 -f $(CURLPDCDST).zip
 	if exist $(CURLPDCDST).zip del $(CURLPDCDST).zip
 	cd ..\sys\windows\vs\fetchprereq
 	@echo $(PDCDIST) has been fetched into $(LIBDIR)\$(PDCDIST)
@@ -69,6 +69,10 @@ libdir:
 	@if not exist $(LIBDIR)\*.* mkdir $(LIBDIR)
 
 clean:
+	@if exist $(LIBDIR)\$(PDCDIST) rmdir /Q $(LIBDIR)\$(PDCDIST) /s
+	@if exist $(LIBDIR)\lua-$(LUA_VERSION) rmdir /Q $(LIBDIR)\lua-$(LUA_VERSION) /s
+	@if exist ..\..\..\..\include\nhlua.h del /Q ..\..\..\..\include\nhlua.h
 
 rebuild:
-
+	@if exist $(LIBDIR)\$(PDCDIST) echo nothing to do for lib\$(PDCDIST)
+	@if exist $(LIBDIR)\lua-$(LUA_VERSION) echo nothing to do for lib\lua-$(LUA_VERSION)
diff --git a/sys/windows/vs/FetchPrereq/fetchprereq.vcxproj b/sys/windows/vs/FetchPrereq/fetchprereq.vcxproj
index 31e6b7dd0..01c6eb857 100644
--- a/sys/windows/vs/FetchPrereq/fetchprereq.vcxproj
+++ b/sys/windows/vs/FetchPrereq/fetchprereq.vcxproj
@@ -20,11 +20,6 @@
   </ItemGroup>
   <Import Project="..\config.props" />
   <Import Project="..\dirs.props" />
-  <Import Project="..\default.props" />
-  <Import Project="..\NetHackProperties.props" />
-  <Import Project="..\console.props" />
-  <Import Project="..\common.props" />
-  <Import Project="..\files.props" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectGuid>{503AE687-C33A-45ED-93AA-83967E176D67}</ProjectGuid>
@@ -57,13 +52,19 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="!Exists('$(LibDir)pdcurses') OR !Exists('$(LibDir)lua-5.4.6')">
-    <NMakeBuildCommandLine>pushd $(vsDir)fetchprereq %26%26 nmake -F fetchprereq.nmake %26%26 popd</NMakeBuildCommandLine>
-    <NMakeCleanCommandLine>pushd $(vsDir)fetchprereq %26%26 nmake -F fetchprereq.nmake clean %26%26 popd</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>pushd $(vsDir)fetchprereq %26%26 nmake -F fetchprereq.nmake rebuild %26%26 popd</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <PropertyGroup Condition="Exists('$(LibDir)pdcursesmod') AND Exists('$(LibDir)lua-$(LUA_VERSION)')">
+	<NMakeBuildCommandLine>echo lib\pdcursesmod and lib\lua-$(LUA_VERSION) are already present</NMakeBuildCommandLine>
+	<NMakeCleanCommandLine>pushd $(vsDir)fetchprereq %26%26 nmake -F fetchprereq.nmake clean %26%26 popd</NMakeCleanCommandLine>
+	<NMakeReBuildCommandLine>echo rebuilding lib\pdcursesmod and lib\lua-$(LUA_VERSION)</NMakeReBuildCommandLine>
+	<NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    </PropertyGroup>
+    <PropertyGroup Condition="!Exists('$(LibDir)pdcursesmod') OR !Exists('$(LibDir)lua-$(LUA_VERSION)')">
+	<NMakeBuildCommandLine>pushd $(vsDir)fetchprereq %26%26 nmake -F fetchprereq.nmake %26%26 popd</NMakeBuildCommandLine>
+	<NMakeCleanCommandLine>pushd $(vsDir)fetchprereq %26%26 nmake -F fetchprereq.nmake clean %26%26 popd</NMakeCleanCommandLine>
+	<NMakeReBuildCommandLine>pushd $(vsDir)fetchprereq %26%26 nmake -F fetchprereq.nmake rebuild %26%26 popd</NMakeReBuildCommandLine>
+	<NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/sys/windows/vs/NetHack.sln b/sys/windows/vs/NetHack.sln
index 153182535..39b247dce 100644
--- a/sys/windows/vs/NetHack.sln
+++ b/sys/windows/vs/NetHack.sln
@@ -8,6 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHac
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
 		{1693F852-A207-4348-8223-222C2A7FEEEB} = {1693F852-A207-4348-8223-222C2A7FEEEB}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
 		{93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
@@ -16,6 +17,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb\dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
@@ -23,39 +25,48 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 		{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751} = {609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp\tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B} = {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses\PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{477BF231-48E0-4312-AA12-9D8576215489}"
 	ProjectSection(SolutionItems) = preProject
@@ -63,8 +74,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pdcursesgui", "PDCursesGui\Pdcursesgui.vcxproj", "{1693F852-A207-4348-8223-222C2A7FEEEB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hacklib", "hacklib\hacklib.vcxproj", "{096FD6BB-256A-4E68-9B09-2ACA7C606FF3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetchprereq", "FetchPrereq\fetchprereq.vcxproj", "{503AE687-C33A-45ED-93AA-83967E176D67}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -162,6 +181,14 @@ Global
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3}.Release|Win32.Build.0 = Release|Win32
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3}.Release|x64.ActiveCfg = Release|x64
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3}.Release|x64.Build.0 = Release|x64
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Debug|Win32.ActiveCfg = Debug|Win32
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Debug|Win32.Build.0 = Debug|Win32
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Debug|x64.ActiveCfg = Debug|x64
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Debug|x64.Build.0 = Debug|x64
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Release|Win32.ActiveCfg = Release|Win32
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Release|Win32.Build.0 = Release|Win32
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Release|x64.ActiveCfg = Release|x64
+		{503AE687-C33A-45ED-93AA-83967E176D67}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/sys/windows/vs/NetHack/NetHack.vcxproj b/sys/windows/vs/NetHack/NetHack.vcxproj
index a19d59985..d97ae990e 100644
--- a/sys/windows/vs/NetHack/NetHack.vcxproj
+++ b/sys/windows/vs/NetHack/NetHack.vcxproj
@@ -9,12 +9,12 @@
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(vsDir)NetHackProperties.props" />
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\NetHackProperties.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <PropertyGroup>
     <OutDir>$(BinDir)</OutDir>
   </PropertyGroup>
diff --git a/sys/windows/vs/NetHackW/NetHackW.vcxproj b/sys/windows/vs/NetHackW/NetHackW.vcxproj
index 6950063fe..819af841c 100644
--- a/sys/windows/vs/NetHackW/NetHackW.vcxproj
+++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(vsDir)NetHackProperties.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\NetHackProperties.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <PropertyGroup>
     <OutDir>$(BinDir)</OutDir>
   </PropertyGroup>
@@ -349,7 +349,7 @@
     <ClInclude Include="$(IncDir)xwindowp.h" />
     <ClInclude Include="$(IncDir)you.h" />
     <ClInclude Include="$(IncDir)youprop.h" />
-    <ClInclude Include="$(vsDir)resource.h" />
+    <ClInclude Include="..\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="$(WinWin32Dir)mnsel.bmp" />
diff --git a/sys/windows/vs/PDCurses/PDCurses.vcxproj b/sys/windows/vs/PDCurses/PDCurses.vcxproj
index 8b5f7901c..7ec154d2f 100644
--- a/sys/windows/vs/PDCurses/PDCurses.vcxproj
+++ b/sys/windows/vs/PDCurses/PDCurses.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)config.props" />
+  <Import Project="..\config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -9,7 +9,7 @@
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default_lib.props" />
+  <Import Project="..\default_lib.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ItemGroup>
     <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addch.c" />
diff --git a/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj b/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj
index e28db5b80..5d599faa5 100644
--- a/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj
+++ b/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)config.props" />
+  <Import Project="..\config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1693F852-A207-4348-8223-222C2A7FEEEB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -9,7 +9,7 @@
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default_lib.props" />
+  <Import Project="..\default_lib.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ItemGroup>
     <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addch.c" />
diff --git a/sys/windows/vs/dlb/dlb.vcxproj b/sys/windows/vs/dlb/dlb.vcxproj
index 752b28861..b0ba09b77 100644
--- a/sys/windows/vs/dlb/dlb.vcxproj
+++ b/sys/windows/vs/dlb/dlb.vcxproj
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)config.props" />
+  <Import Project="..\config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/sys/windows/vs/hacklib/hacklib.vcxproj b/sys/windows/vs/hacklib/hacklib.vcxproj
index 07ac07a27..b43c429ea 100644
--- a/sys/windows/vs/hacklib/hacklib.vcxproj
+++ b/sys/windows/vs/hacklib/hacklib.vcxproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="../config.props" />
-  <Import Project="../dirs.props" />
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
-  <Import Project="$(vsDir)NetHackProperties.props" />
+  <Import Project="..\config.props" />
+  <Import Project="..\dirs.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
+  <Import Project="..\NetHackProperties.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
diff --git a/sys/windows/vs/makedefs/makedefs.vcxproj b/sys/windows/vs/makedefs/makedefs.vcxproj
index 37401b423..ae93dde4b 100644
--- a/sys/windows/vs/makedefs/makedefs.vcxproj
+++ b/sys/windows/vs/makedefs/makedefs.vcxproj
@@ -7,23 +7,23 @@
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/sys/windows/vs/recover/recover.vcxproj b/sys/windows/vs/recover/recover.vcxproj
index dfd527044..22ec329e6 100644
--- a/sys/windows/vs/recover/recover.vcxproj
+++ b/sys/windows/vs/recover/recover.vcxproj
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)config.props" />
+  <Import Project="..\config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(vsDir)NetHackProperties.props" />
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\NetHackProperties.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <PropertyGroup>
     <OutDir>$(BinDir)</OutDir>
   </PropertyGroup>
diff --git a/sys/windows/vs/tile2bmp/tile2bmp.vcxproj b/sys/windows/vs/tile2bmp/tile2bmp.vcxproj
index e59d13516..ecd7607d7 100644
--- a/sys/windows/vs/tile2bmp/tile2bmp.vcxproj
+++ b/sys/windows/vs/tile2bmp/tile2bmp.vcxproj
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)config.props" />
+  <Import Project="..\config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{642BC75D-ABAF-403E-8224-7C725FD4CB42}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/sys/windows/vs/tilemap/tilemap.vcxproj b/sys/windows/vs/tilemap/tilemap.vcxproj
index 00bee490f..958b5e974 100644
--- a/sys/windows/vs/tilemap/tilemap.vcxproj
+++ b/sys/windows/vs/tilemap/tilemap.vcxproj
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)config.props" />
+  <Import Project="..\config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{93F10526-209E-41D7-BBEA-775787876895}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <ItemDefinitionGroup>
diff --git a/sys/windows/vs/uudecode/uudecode.vcxproj b/sys/windows/vs/uudecode/uudecode.vcxproj
index 5f82ba7db..ca76b0e24 100644
--- a/sys/windows/vs/uudecode/uudecode.vcxproj
+++ b/sys/windows/vs/uudecode/uudecode.vcxproj
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dirs.props" />
-  <Import Project="$(vsDir)config.props" />
+  <Import Project="..\config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{63F9B82B-F589-4082-ABE5-D4F0682050AB}</ProjectGuid>
     <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default.props" />
+  <Import Project="..\default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
+    <Import Project="..\NetHackProperties.props" />
   </ImportGroup>
-  <Import Project="$(vsDir)console.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysShareDir);</AdditionalIncludeDirectories>