diff --git a/include/extern.h b/include/extern.h
index 8805a01f5..59b14e649 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1539,7 +1539,7 @@ extern void mplayer_talk(struct monst *);
#if defined(MICRO) || defined(WIN32)
-/* ### msdos.c,os2.c,tos.c,windows.c ### */
+/* ### msdos.c,os2.c,tos.c,windsys.c ### */
#ifndef WIN32
extern int tgetch(void);
diff --git a/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest b/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest
deleted file mode 100644
index 54140a413..000000000
--- a/sys/windows/vs/NetHackPackage/NetHackPackage.appxmanifest
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- NetHack 3.7
- NetHack DevTeam
- Images\StoreLogo.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj b/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj
deleted file mode 100644
index 75a9096b6..000000000
--- a/sys/windows/vs/NetHackPackage/NetHackPackage.wapproj
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
- 15.0
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
-
- $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\
-
-
-
-
-
- $(BinDir)
-
-
- 6838ec9d-f25d-4779-9cd7-2edb61e49429
- 10.0.17763.0
- 10.0.15063.0
- en-US
- NetHackPackage_StoreKey.pfx
- 19591BE8832D6EFED75019EACE7C4CA42ABC90D4
- False
- True
- x86
- 1
- OnApplicationRun
-
-
- Always
-
-
- Always
-
-
- Always
-
-
- Always
-
-
-
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(vsDir)NetHackW\.nethackrc.template
-
-
- $(vsDir)NetHackW\Guidebook.txt
-
-
- $(vsDir)NetHackW\license
-
-
- $(vsDir)NetHackW\nhdat$(VERSION_MAJOR)$(VERSION_MINOR)$(PATCHLEVEL)
-
-
- $(vsDir)NetHackW\opthelp
-
-
- $(vsDir)NetHackW\symbols.template
-
-
- $(vsDir)NetHackW\sysconf.template
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml b/sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml
deleted file mode 100644
index 24422d2fd..000000000
--- a/sys/windows/vs/NetHackPackage/Package.StoreAssociation.xml
+++ /dev/null
@@ -1,373 +0,0 @@
-
-
- CN=8BDC628A-FAAA-4EBA-8B5B-EB61BA93BA1F
- NetHack DevTeam
- AAD
- http://www.w3.org/2001/04/xmlenc#sha256
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 30485NetHackDevTeam.NetHack3.6
-
- NetHack 3.7
-
-
-
- 30485NetHackDevTeam.NetHackBeta
-
-
-