diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj
index e12110c19..565e21794 100644
--- a/win/win32/vs2017/NetHack.vcxproj
+++ b/win/win32/vs2017/NetHack.vcxproj
@@ -257,6 +257,7 @@
     <ClInclude Include="$(IncDir)monflag.h" />
     <ClInclude Include="$(IncDir)monst.h" />
     <ClInclude Include="$(IncDir)monsym.h" />
+    <ClInclude Include="$(IncDir)nhlua.h" />
     <ClInclude Include="$(IncDir)ntconf.h" />
     <ClInclude Include="$(IncDir)obj.h" />
     <ClInclude Include="$(IncDir)objclass.h" />
diff --git a/win/win32/vs2017/aftermakedefs.proj b/win/win32/vs2017/aftermakedefs.proj
index 31a965de3..52af2a8be 100644
--- a/win/win32/vs2017/aftermakedefs.proj
+++ b/win/win32/vs2017/aftermakedefs.proj
@@ -11,7 +11,6 @@
 	<Exec Command="$(ToolsDir)makedefs.exe -d" WorkingDirectory="$(DatDir)"/>
 	<Exec Command="$(ToolsDir)makedefs.exe -r" WorkingDirectory="$(DatDir)"/>
 	<Exec Command="$(ToolsDir)makedefs.exe -s" WorkingDirectory="$(DatDir)"/>
-	<Exec Command="$(ToolsDir)makedefs.exe -q" WorkingDirectory="$(DatDir)"/>
 	<Exec Command="$(ToolsDir)makedefs.exe -h" WorkingDirectory="$(DatDir)"/>
   </Target>
   <Target Name="Clean">
diff --git a/win/win32/vs2017/dirs.props b/win/win32/vs2017/dirs.props
index bd1c09da8..bc951911e 100644
--- a/win/win32/vs2017/dirs.props
+++ b/win/win32/vs2017/dirs.props
@@ -10,7 +10,7 @@
     <DatDir>$(RootDir)dat\</DatDir>
     <DocDir>$(RootDir)doc\</DocDir>
     <IncDir>$(RootDir)include\</IncDir>
-    <LuaDir>$(RootDir)..\LUA-5.3.5\src\</LuaDir>
+    <LuaDir>$(RootDir)lib\lua-5.3.5\src\</LuaDir>
     <SrcDir>$(RootDir)src\</SrcDir>
 	<SysDir>$(RootDir)sys\</SysDir>
     <UtilDir>$(RootDir)util\</UtilDir>
@@ -23,7 +23,7 @@
 	<IntDir>$(ObjDir)</IntDir>
 	<WinCursDir>$(RootDir)win\curses\</WinCursDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(PDCURSES)'=='' AND Exists('$(RootDir)..\PDCurses')">
-	<PDCURSES>$(RootDir)..\PDCurses\</PDCURSES>
+  <PropertyGroup Condition="'$(PDCURSES)'=='' AND Exists('$(RootDir)bin\PDCurses')">
+	<PDCURSES>$(RootDir)bin\PDCurses\</PDCURSES>
   </PropertyGroup>
 </Project>
diff --git a/win/win32/vs2017/files.props b/win/win32/vs2017/files.props
index a88fc5bfa..c388b6898 100644
--- a/win/win32/vs2017/files.props
+++ b/win/win32/vs2017/files.props
@@ -11,140 +11,137 @@
 	<!-- -z -->
     <Defs Include = "$(IncDir)vis_tab.h"/>
     <Defs Include = "$(SrcDir)vis_tab.c"/>
-	<!-- -d -->
-    <Defs Include = "$(DatDir)data"/>
 	<!-- -r -->
     <Defs Include = "$(DatDir)rumors"/>
 	<!-- -s -->
     <Defs Include = "$(DatDir)engrave"/>
     <Defs Include = "$(DatDir)epitaph"/>
     <Defs Include = "$(DatDir)bogusmon"/>
-	<!-- -q -->
-    <Defs Include = "$(DatDir)quest.dat"/>
 	<!-- -h -->
     <Defs Include = "$(DatDir)oracles"/>
   </ItemGroup>
   <ItemGroup>
-    <Levfiles Include = "bigrm-1.lua"/>
-    <Levfiles Include = "bigrm-2.lua"/>
-    <Levfiles Include = "bigrm-3.lua"/>
-    <Levfiles Include = "bigrm-4.lua"/>
-    <Levfiles Include = "bigrm-5.lua"/>
-    <Levfiles Include = "bigrm-6.lua"/>
-    <Levfiles Include = "bigrm-7.lua"/>
-    <Levfiles Include = "bigrm-8.lua"/>
-    <Levfiles Include = "bigrm-9.lua"/>
-    <Levfiles Include = "bigrm-10.lua"/>
-    <Levfiles Include = "castle.lua"/>
-    <Levfiles Include = "air.lua"/>
-    <Levfiles Include = "astral.lua"/>
-    <Levfiles Include = "earth.lua"/>
-    <Levfiles Include = "fire.lua"/>
-    <Levfiles Include = "water.lua"/>
-    <Levfiles Include = "asmodeus.lua"/>
-    <Levfiles Include = "baalz.lua"/>
-    <Levfiles Include = "juiblex.lua"/>
-    <Levfiles Include = "orcus.lua"/>
-    <Levfiles Include = "sanctum.lua"/>
-    <Levfiles Include = "valley.lua"/>
-    <Levfiles Include = "knox.lua"/>
-    <Levfiles Include = "minefill.lua"/>
-    <Levfiles Include = "minend-1.lua"/>
-    <Levfiles Include = "minend-2.lua"/>
-    <Levfiles Include = "minend-3.lua"/>
-    <Levfiles Include = "minetn-1.lua"/>
-    <Levfiles Include = "minetn-2.lua"/>
-    <Levfiles Include = "minetn-3.lua"/>
-    <Levfiles Include = "minetn-4.lua"/>
-    <Levfiles Include = "minetn-5.lua"/>
-    <Levfiles Include = "minetn-6.lua"/>
-    <Levfiles Include = "minetn-7.lua"/>
-    <Levfiles Include = "medusa-1.lua"/>
-    <Levfiles Include = "medusa-2.lua"/>
-    <Levfiles Include = "medusa-3.lua"/>
-    <Levfiles Include = "medusa-4.lua"/>
-    <Levfiles Include = "oracle.lua"/>
-    <Levfiles Include = "soko1-1.lua"/>
-    <Levfiles Include = "soko1-2.lua"/>
-    <Levfiles Include = "soko2-1.lua"/>
-    <Levfiles Include = "soko2-2.lua"/>
-    <Levfiles Include = "soko3-1.lua"/>
-    <Levfiles Include = "soko3-2.lua"/>
-    <Levfiles Include = "soko4-1.lua"/>
-    <Levfiles Include = "soko4-2.lua"/>
-    <Levfiles Include = "tower1.lua"/>
-    <Levfiles Include = "tower2.lua"/>
-    <Levfiles Include = "tower3.lua"/>
-    <Levfiles Include = "fakewiz1.lua"/>
-    <Levfiles Include = "fakewiz2.lua"/>
-    <Levfiles Include = "wizard1.lua"/>
-    <Levfiles Include = "wizard2.lua"/>
-    <Levfiles Include = "wizard3.lua"/>
-    <Levfiles Include = "arc-fila.lua"/>
-    <Levfiles Include = "arc-filb.lua"/>
-    <Levfiles Include = "arc-goal.lua"/>
-    <Levfiles Include = "arc-loca.lua"/>
-    <Levfiles Include = "arc-strt.lua"/>
-    <Levfiles Include = "bar-fila.lua"/>
-    <Levfiles Include = "bar-filb.lua"/>
-    <Levfiles Include = "bar-goal.lua"/>
-    <Levfiles Include = "bar-loca.lua"/>
-    <Levfiles Include = "bar-strt.lua"/>
-    <Levfiles Include = "cav-fila.lua"/>
-    <Levfiles Include = "cav-filb.lua"/>
-    <Levfiles Include = "cav-goal.lua"/>
-    <Levfiles Include = "cav-loca.lua"/>
-    <Levfiles Include = "cav-strt.lua"/>
-    <Levfiles Include = "hea-fila.lua"/>
-    <Levfiles Include = "hea-filb.lua"/>
-    <Levfiles Include = "hea-goal.lua"/>
-    <Levfiles Include = "hea-loca.lua"/>
-    <Levfiles Include = "hea-strt.lua"/>
-    <Levfiles Include = "kni-fila.lua"/>
-    <Levfiles Include = "kni-filb.lua"/>
-    <Levfiles Include = "kni-goal.lua"/>
-    <Levfiles Include = "kni-loca.lua"/>
-    <Levfiles Include = "kni-strt.lua"/>
-    <Levfiles Include = "mon-fila.lua"/>
-    <Levfiles Include = "mon-filb.lua"/>
-    <Levfiles Include = "mon-goal.lua"/>
-    <Levfiles Include = "mon-loca.lua"/>
-    <Levfiles Include = "mon-strt.lua"/>
-    <Levfiles Include = "pri-fila.lua"/>
-    <Levfiles Include = "pri-filb.lua"/>
-    <Levfiles Include = "pri-goal.lua"/>
-    <Levfiles Include = "pri-loca.lua"/>
-    <Levfiles Include = "pri-strt.lua"/>
-    <Levfiles Include = "ran-fila.lua"/>
-    <Levfiles Include = "ran-filb.lua"/>
-    <Levfiles Include = "ran-goal.lua"/>
-    <Levfiles Include = "ran-loca.lua"/>
-    <Levfiles Include = "ran-strt.lua"/>
-    <Levfiles Include = "rog-fila.lua"/>
-    <Levfiles Include = "rog-filb.lua"/>
-    <Levfiles Include = "rog-goal.lua"/>
-    <Levfiles Include = "rog-loca.lua"/>
-    <Levfiles Include = "rog-strt.lua"/>
-    <Levfiles Include = "sam-fila.lua"/>
-    <Levfiles Include = "sam-filb.lua"/>
-    <Levfiles Include = "sam-goal.lua"/>
-    <Levfiles Include = "sam-loca.lua"/>
-    <Levfiles Include = "sam-strt.lua"/>
-    <Levfiles Include = "tou-fila.lua"/>
-    <Levfiles Include = "tou-filb.lua"/>
-    <Levfiles Include = "tou-goal.lua"/>
-    <Levfiles Include = "tou-loca.lua"/>
-    <Levfiles Include = "tou-strt.lua"/>
-    <Levfiles Include = "val-fila.lua"/>
-    <Levfiles Include = "val-filb.lua"/>
-    <Levfiles Include = "val-goal.lua"/>
-    <Levfiles Include = "val-loca.lua"/>
-    <Levfiles Include = "val-strt.lua"/>
-    <Levfiles Include = "wiz-fila.lua"/>
-    <Levfiles Include = "wiz-filb.lua"/>
-    <Levfiles Include = "wiz-goal.lua"/>
-    <Levfiles Include = "wiz-loca.lua"/>
-    <Levfiles Include = "wiz-strt.lua"/>
+    <Luafiles Include = "bigrm-1.lua"/>
+    <Luafiles Include = "bigrm-2.lua"/>
+    <Luafiles Include = "bigrm-3.lua"/>
+    <Luafiles Include = "bigrm-4.lua"/>
+    <Luafiles Include = "bigrm-5.lua"/>
+    <Luafiles Include = "bigrm-6.lua"/>
+    <Luafiles Include = "bigrm-7.lua"/>
+    <Luafiles Include = "bigrm-8.lua"/>
+    <Luafiles Include = "bigrm-9.lua"/>
+    <Luafiles Include = "bigrm-10.lua"/>
+    <Luafiles Include = "castle.lua"/>
+    <Luafiles Include = "air.lua"/>
+    <Luafiles Include = "astral.lua"/>
+    <Luafiles Include = "earth.lua"/>
+    <Luafiles Include = "fire.lua"/>
+    <Luafiles Include = "water.lua"/>
+    <Luafiles Include = "asmodeus.lua"/>
+    <Luafiles Include = "baalz.lua"/>
+    <Luafiles Include = "juiblex.lua"/>
+    <Luafiles Include = "orcus.lua"/>
+    <Luafiles Include = "quest.lua"/>
+    <Luafiles Include = "sanctum.lua"/>
+    <Luafiles Include = "valley.lua"/>
+    <Luafiles Include = "knox.lua"/>
+    <Luafiles Include = "minefill.lua"/>
+    <Luafiles Include = "minend-1.lua"/>
+    <Luafiles Include = "minend-2.lua"/>
+    <Luafiles Include = "minend-3.lua"/>
+    <Luafiles Include = "minetn-1.lua"/>
+    <Luafiles Include = "minetn-2.lua"/>
+    <Luafiles Include = "minetn-3.lua"/>
+    <Luafiles Include = "minetn-4.lua"/>
+    <Luafiles Include = "minetn-5.lua"/>
+    <Luafiles Include = "minetn-6.lua"/>
+    <Luafiles Include = "minetn-7.lua"/>
+    <Luafiles Include = "medusa-1.lua"/>
+    <Luafiles Include = "medusa-2.lua"/>
+    <Luafiles Include = "medusa-3.lua"/>
+    <Luafiles Include = "medusa-4.lua"/>
+    <Luafiles Include = "oracle.lua"/>
+    <Luafiles Include = "soko1-1.lua"/>
+    <Luafiles Include = "soko1-2.lua"/>
+    <Luafiles Include = "soko2-1.lua"/>
+    <Luafiles Include = "soko2-2.lua"/>
+    <Luafiles Include = "soko3-1.lua"/>
+    <Luafiles Include = "soko3-2.lua"/>
+    <Luafiles Include = "soko4-1.lua"/>
+    <Luafiles Include = "soko4-2.lua"/>
+    <Luafiles Include = "tower1.lua"/>
+    <Luafiles Include = "tower2.lua"/>
+    <Luafiles Include = "tower3.lua"/>
+    <Luafiles Include = "fakewiz1.lua"/>
+    <Luafiles Include = "fakewiz2.lua"/>
+    <Luafiles Include = "wizard1.lua"/>
+    <Luafiles Include = "wizard2.lua"/>
+    <Luafiles Include = "wizard3.lua"/>
+    <Luafiles Include = "arc-fila.lua"/>
+    <Luafiles Include = "arc-filb.lua"/>
+    <Luafiles Include = "arc-goal.lua"/>
+    <Luafiles Include = "arc-loca.lua"/>
+    <Luafiles Include = "arc-strt.lua"/>
+    <Luafiles Include = "bar-fila.lua"/>
+    <Luafiles Include = "bar-filb.lua"/>
+    <Luafiles Include = "bar-goal.lua"/>
+    <Luafiles Include = "bar-loca.lua"/>
+    <Luafiles Include = "bar-strt.lua"/>
+    <Luafiles Include = "cav-fila.lua"/>
+    <Luafiles Include = "cav-filb.lua"/>
+    <Luafiles Include = "cav-goal.lua"/>
+    <Luafiles Include = "cav-loca.lua"/>
+    <Luafiles Include = "cav-strt.lua"/>
+    <Luafiles Include = "hea-fila.lua"/>
+    <Luafiles Include = "hea-filb.lua"/>
+    <Luafiles Include = "hea-goal.lua"/>
+    <Luafiles Include = "hea-loca.lua"/>
+    <Luafiles Include = "hea-strt.lua"/>
+    <Luafiles Include = "kni-fila.lua"/>
+    <Luafiles Include = "kni-filb.lua"/>
+    <Luafiles Include = "kni-goal.lua"/>
+    <Luafiles Include = "kni-loca.lua"/>
+    <Luafiles Include = "kni-strt.lua"/>
+    <Luafiles Include = "mon-fila.lua"/>
+    <Luafiles Include = "mon-filb.lua"/>
+    <Luafiles Include = "mon-goal.lua"/>
+    <Luafiles Include = "mon-loca.lua"/>
+    <Luafiles Include = "mon-strt.lua"/>
+    <Luafiles Include = "pri-fila.lua"/>
+    <Luafiles Include = "pri-filb.lua"/>
+    <Luafiles Include = "pri-goal.lua"/>
+    <Luafiles Include = "pri-loca.lua"/>
+    <Luafiles Include = "pri-strt.lua"/>
+    <Luafiles Include = "ran-fila.lua"/>
+    <Luafiles Include = "ran-filb.lua"/>
+    <Luafiles Include = "ran-goal.lua"/>
+    <Luafiles Include = "ran-loca.lua"/>
+    <Luafiles Include = "ran-strt.lua"/>
+    <Luafiles Include = "rog-fila.lua"/>
+    <Luafiles Include = "rog-filb.lua"/>
+    <Luafiles Include = "rog-goal.lua"/>
+    <Luafiles Include = "rog-loca.lua"/>
+    <Luafiles Include = "rog-strt.lua"/>
+    <Luafiles Include = "sam-fila.lua"/>
+    <Luafiles Include = "sam-filb.lua"/>
+    <Luafiles Include = "sam-goal.lua"/>
+    <Luafiles Include = "sam-loca.lua"/>
+    <Luafiles Include = "sam-strt.lua"/>
+    <Luafiles Include = "tou-fila.lua"/>
+    <Luafiles Include = "tou-filb.lua"/>
+    <Luafiles Include = "tou-goal.lua"/>
+    <Luafiles Include = "tou-loca.lua"/>
+    <Luafiles Include = "tou-strt.lua"/>
+    <Luafiles Include = "val-fila.lua"/>
+    <Luafiles Include = "val-filb.lua"/>
+    <Luafiles Include = "val-goal.lua"/>
+    <Luafiles Include = "val-loca.lua"/>
+    <Luafiles Include = "val-strt.lua"/>
+    <Luafiles Include = "wiz-fila.lua"/>
+    <Luafiles Include = "wiz-filb.lua"/>
+    <Luafiles Include = "wiz-goal.lua"/>
+    <Luafiles Include = "wiz-loca.lua"/>
+    <Luafiles Include = "wiz-strt.lua"/>
   </ItemGroup>
   <ItemGroup>
     <UUFiles Include = "$(SysWinntDir)nhico.uu"/>
@@ -178,7 +175,6 @@
     <DlbList Include = "$(DatDir)options" Condition="Exists('$(DatDir)options')"/>
     <DlbList Include = "$(DatDir)ttyoptions" Condition="Exists('$(DatDir)ttyoptions')"/>
     <DlbList Include = "$(DatDir)guioptions" Condition="Exists('$(DatDir)guioptions')"/>
-    <DlbList Include = "$(DatDir)quest.dat"/>
     <DlbList Include = "$(DatDir)rumors"/>
     <DlbList Include = "$(DatDir)engrave"/>
     <DlbList Include = "$(DatDir)epitaph"/>
diff --git a/win/win32/vs2017/makedefs.vcxproj b/win/win32/vs2017/makedefs.vcxproj
index 20b9ea338..accc0f964 100644
--- a/win/win32/vs2017/makedefs.vcxproj
+++ b/win/win32/vs2017/makedefs.vcxproj
@@ -50,6 +50,18 @@
     <ClInclude Include="..\..\..\include\tradstdc.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target
+      Name="GenerateHeader"
+      BeforeTargets="ClCompile"
+      Outputs="$(IncDir)\nhlua.h">
+      <Message Text="Generating $(IncDir)nhlua.h" />
+	<Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+	<Exec Command="echo #include %22../lib/lua-5.3.5/src/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+	<Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+	<Exec Command="echo #include %22../lib/lua-5.3.5/src/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+	<Exec Command="echo #include %22../lib/lua-5.3.5/src/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+	<Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+ </Target>
   <Target Name="AfterBuild">
     <MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
@@ -59,4 +71,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>