diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross
index 0f8415667..76c33e890 100644
--- a/sys/msdos/Makefile2.cross
+++ b/sys/msdos/Makefile2.cross
@@ -899,8 +899,6 @@ $(O)stubvid.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/video.c
 #
 #
 # src dependencies
-#$(O)tos.o: ../sys/atari/tos.c $(HACK_H) $(INCL)/tcap.h
-	$(TARGET_CC) $(cflags) -o$@ ../sys/atari/tos.c
 $(O)pcmain.o: ../sys/share/pcmain.c $(HACK_H) $(INCL)/dlb.h \
 		#$(INCL)/win32api.h
 	$(TARGET_CC) $(cflags) -o$@ ../sys/share/pcmain.c
@@ -958,57 +956,6 @@ $(O)winval.o: ../win/X11/winval.c $(HACK_H) $(INCL)/winX.h
 	$(TARGET_CC) $(cflags) -o$@ ../win/X11/winval.c
 #$(O)tile.o: tile.c $(HACK_H)
 #$(HOST_O)tile.o: tile.c $(HACK_H)
-$(O)gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \
-		../win/gnome/gnmain.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnaskstr.c
-$(O)gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \
-		../win/gnome/gnaskstr.h ../win/gnome/gnyesno.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnbind.c
-$(O)gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(INCL)/tile2x11.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnglyph.c
-$(O)gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \
-		../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \
-		$(INCL)/date.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmain.c
-$(O)gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h ../win/gnome/gnglyph.h \
-		../win/gnome/gnsignal.h $(HACK_H)
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmap.c
-$(O)gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \
-		../win/gnome/gnbind.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmenu.c
-$(O)gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmesg.c
-$(O)gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \
-		../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H)
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnopts.c
-$(O)gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \
-		../win/gnome/gnmain.h $(HACK_H)
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnplayer.c
-$(O)gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \
-		../win/gnome/gnmain.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnsignal.c
-$(O)gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h \
-		../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \
-		../win/gnome/gnomeprv.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnstatus.c
-$(O)gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \
-		../win/gnome/gn_rip.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gntext.c
-$(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \
-		../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnworn.c
-$(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h
-	$(TARGET_CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c
-$(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \
-		$(INCL)/wingem.h
-	$(TARGET_CC) $(cflags) -o$@ ../win/gem/wingem.c
-$(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \
-		$(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h
-	$(TARGET_CC) $(cflags) -o$@ ../win/gem/wingem1.c
-$(O)load_img.o: ../win/gem/load_img.c $(INCL)/load_img.h
-	$(TARGET_CC) $(cflags) -o$@ ../win/gem/load_img.c
-$(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h
-	$(TARGET_CC) $(cflags) -o$@ ../win/gem/gr_rect.c
 $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \
 		$(INCL)/dlb.h $(INCL)/tile2x11.h \
 		$(INCL)/qt_win.h $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \
@@ -1018,7 +965,6 @@ $(O)qt_clust.o: ../win/Qt/qt_clust.cpp $(INCL)/qt_clust.h
 	$(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_clust.cpp
 $(O)qttableview.o: ../win/Qt/qttableview.cpp $(INCL)/qttableview.h
 	$(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qttableview.cpp
-#$(O)monstr.o: monstr.c $(CONFIG_H)
 $(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h
 $(O)allmain.o: allmain.c $(HACK_H)
 $(O)alloc.o: alloc.c $(CONFIG_H)
diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index ca506a6db..380cb0c8f 100644
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -104,19 +104,19 @@ TARGET_CPU=x86
 
 #4b Qt
 #
-#WANT_WIN_QT4 = N
+#WANT_WIN_QT = N
 
-# WANT_WIN_QT4 requires Qt 4 or Qt 5, see
+# WANT_WIN_QT requires Qt 4 or Qt 5, see
 # https://www.qt.io/download-open-source/
 # Earlier versions of Qt are not compatible with Windows
 # For Qt 5, use:
 #
-#QT4_DIRECTORY = c:/Qt/Qt5.9.2/5.9.2/mingw53_32
+#QT_DIRECTORY = c:/Qt/Qt5.9.2/5.9.2/mingw53_32
 #HAVE_QT5 = Y
 
 # For Qt 4, comment out the above two lines and use:
 #
-#QT4_DIRECTORY = c:/Qt/4.8.6
+#QT_DIRECTORY = c:/Qt/4.8.6
 #HAVE_QT5 = N
 
 #
@@ -187,6 +187,7 @@ NHV=$(subst ",,$(NHV1))
 # MSWIN   - window port files (win32)
 # WCURSES - window port files (curses) 
 # WSHR    - Tile support files 
+# QT      - QT window support files
 
 INCL    =../include
 DAT     =../dat
@@ -199,6 +200,7 @@ TTY     =../win/tty
 MSWIN   =../win/win32
 WCURSES =../win/curses
 WSHR    =../win/share
+QT      =../win/Qt
 
 #
 #  Object directory.
@@ -216,7 +218,7 @@ RANDOM  = $(OBJ)/random.o
 BCRYPT=-lbcrypt
 
 WINPFLAG   = -DTILES -DMSWIN_GRAPHICS -DWIN32CON -D_WIN32_IE=0x0400 -D_WIN32_WINNT=0x0601 -DWINVER=0x0601
-ifeq "$(WANT_WIN_QT4)" "Y"
+ifeq "$(WANT_WIN_QT)" "Y"
     WINPFLAG += -DQT_GRAPHICS -DPIXMAPDIR='"."'
 endif
 # To store all the level files,
@@ -366,12 +368,12 @@ GUIOBJ  = $(O)mhaskyn.o $(O)mhdlg.o \
 
 endif
 
-ifeq "$(WANT_WIN_QT4)" "Y"
-    GUIOBJ += $(O)qt4bind.o $(O)qt4click.o $(O)qt4clust.o $(O)qt4delay.o \
-	$(O)qt4glyph.o $(O)qt4icon.o $(O)qt4inv.o $(O)qt4key.o $(O)qt4line.o \
-	$(O)qt4main.o $(O)qt4map.o $(O)qt4menu.o $(O)qt4msg.o $(O)qt4plsel.o \
-	$(O)qt4rip.o $(O)qt4set.o $(O)qt4stat.o $(O)qt4str.o $(O)qt4streq.o \
-	$(O)qt4svsel.o $(O)qt4win.o $(O)qt4xcmd.o $(O)qt4yndlg.o
+ifeq "$(WANT_WIN_QT)" "Y"
+    GUIOBJ += $(O)qt_bind.o $(O)qt_click.o $(O)qt_clust.o $(O)qt_delay.o \
+	$(O)qt_glyph.o $(O)qt_icon.o $(O)qt_inv.o $(O)qt_key.o $(O)qt_line.o \
+	$(O)qt_main.o $(O)qt_map.o $(O)qt_menu.o $(O)qt_msg.o $(O)qt_plsel.o \
+	$(O)qt_rip.o $(O)qt_set.o $(O)qt_stat.o $(O)qt_str.o $(O)qt_streq.o \
+	$(O)qt_svsel.o $(O)qt_win.o $(O)qt_xcmd.o $(O)qt_yndlg.o
 endif
 
 ifneq "$(SKIP_NETHACKW)" "Y"
@@ -382,14 +384,14 @@ GUIHDR = $(MSWIN)/mhaskyn.h $(MSWIN)/mhdlg.h $(MSWIN)/mhfont.h \
 	$(MSWIN)/mhtext.h $(MSWIN)/resource.h $(MSWIN)/winMS.h
 endif
 
-ifeq "$(WANT_WIN_QT4)" "Y"
-    GUIHDR += $(QT4)/qt4bind.h $(QT4)/qt4click.h $(QT4)/qt4clust.h \
-	$(QT4)/qt4delay.h $(QT4)/qt4glyph.h $(QT4)/qt4icon.h $(QT4)/qt4inv.h \
-	$(QT4)/qt4kde0.h $(QT4)/qt4key.h $(QT4)/qt4line.h $(QT4)/qt4main.h \
-	$(QT4)/qt4map.h $(QT4)/qt4menu.h $(QT4)/qt4msg.h $(QT4)/qt4plsel.h \
-	$(QT4)/qt4rip.h $(QT4)/qt4set.h $(QT4)/qt4stat.h $(QT4)/qt4str.h \
-	$(QT4)/qt4streq.h $(QT4)/qt4svsel.h $(QT4)/qt4win.h $(QT4)/qt4xcmd.h \
-	$(QT4)/qt4yndlg.h
+ifeq "$(WANT_WIN_QT)" "Y"
+    GUIHDR += $(QT)/qt_bind.h $(QT)/qt_click.h $(QT)/qt_clust.h \
+	$(QT)/qt_delay.h $(QT)/qt_glyph.h $(QT)/qt_icon.h $(QT)/qt_inv.h \
+	$(QT)/qt_kde0.h $(QT)/qt_key.h $(QT)/qt_line.h $(QT)/qt_main.h \
+	$(QT)/qt_map.h $(QT)/qt_menu.h $(QT)/qt_msg.h $(QT)/qt_plsel.h \
+	$(QT)/qt_rip.h $(QT)/qt_set.h $(QT)/qt_stat.h $(QT)/qt_str.h \
+	$(QT)/qt_streq.h $(QT)/qt_svsel.h $(QT)/qt_win.h $(QT)/qt_xcmd.h \
+	$(QT)/qt_yndlg.h
 endif
 
 COMCTRL = comctl32.lib
@@ -543,7 +545,7 @@ rc     = windres
 link   = gcc
 endif
 
-ifeq "$(WANT_WIN_QT4)" "Y"
+ifeq "$(WANT_WIN_QT)" "Y"
     link = g++
 endif
 
@@ -563,17 +565,17 @@ CFLAGSBASE  = -c $(cflags) $(WINPINC) $(cdebug) $(CURSESDEF)
 baselibs = -lwinmm -lshell32 -lole32 -luuid
 conlibs = -lgdi32 $(baselibs) $(BCRYPT)
 guilibs = -lcomctl32 $(baselibs) $(BCRYPT)
-ifeq "$(WANT_WIN_QT4)" "Y"
+ifeq "$(WANT_WIN_QT)" "Y"
     # Might be either Qt 4 or Qt 5
     ifeq "$(HAVE_QT5)" "Y"
-	guilibs += $(QT4_DIRECTORY)/lib/libQt5Core.a
-	guilibs += $(QT4_DIRECTORY)/lib/libQt5Gui.a
-	guilibs += $(QT4_DIRECTORY)/lib/libQt5Widgets.a
-	conlibs += $(QT4_DIRECTORY)/lib/libQt5Core.a
+	guilibs += $(QT_DIRECTORY)/lib/libQt5Core.a
+	guilibs += $(QT_DIRECTORY)/lib/libQt5Gui.a
+	guilibs += $(QT_DIRECTORY)/lib/libQt5Widgets.a
+	conlibs += $(QT_DIRECTORY)/lib/libQt5Core.a
     else
-	guilibs += $(QT4_DIRECTORY)/lib/libQtCore4.a
-	guilibs += $(QT4_DIRECTORY)/lib/libQtGui4.a
-	conlibs += $(QT4_DIRECTORY)/lib/libQtCore4.a
+	guilibs += $(QT_DIRECTORY)/lib/libQtCore4.a
+	guilibs += $(QT_DIRECTORY)/lib/libQtGui4.a
+	conlibs += $(QT_DIRECTORY)/lib/libQtCore4.a
     endif
 endif
 
@@ -581,7 +583,7 @@ endif
 # Extra files needed for some ports
 #==========================================
 EXTRA_FILES =
-ifeq "$(WANT_WIN_QT4)" "Y"
+ifeq "$(WANT_WIN_QT)" "Y"
     ifeq "$(HAVE_QT5)" "Y"
 	EXTRA_FILES += $(GAMEDIR)/Qt5Core.dll
 	EXTRA_FILES += $(GAMEDIR)/Qt5Gui.dll
@@ -711,19 +713,19 @@ $(OBJ)/%.o : $(LUASRC)/%.c
 	$(cc) $(CFLAGS)  -o$@  $<
 
 #==========================================
-# Rules for files in win/Qt4
+# Rules for files in win/Qt
 #==========================================
 
 ifeq "$(HAVE_QT5)" "Y"
-QT4_CXXFLAGS = -std=c++11
+QT_CXXFLAGS = -std=c++11
 else
-QT4_CXXFLAGS =
+QT_CXXFLAGS =
 endif
-$(OBJ)/%.o : $(QT4)/%.cpp
-	$(cxx) $(CXXFLAGS) $(QT4_CXXFLAGS) -I$(MSWIN) -I$(QT4_DIRECTORY)/include -o$@  $<
+$(OBJ)/%.o : $(QT)/%.cpp
+	$(cxx) $(CXXFLAGS) $(QT_CXXFLAGS) -I$(MSWIN) -I$(QT_DIRECTORY)/include -o$@  $<
 
-$(QT4)/%.moc : $(QT4)/%.h
-	$(QT4_DIRECTORY)\bin\moc -o $@ $<
+$(QT)/%.moc : $(QT)/%.h
+	$(QT_DIRECTORY)\bin\moc -o $@ $<
 
 ifeq "$(SKIP_NETHACKW)" "Y"
 NETHACKW_EXE =
@@ -1373,22 +1375,22 @@ $(O)cursstat.o: $(WCURSES)/cursstat.c $(WCURSES)/cursstat.h $(INCL)/wincurs.h
 $(O)curswins.o: $(WCURSES)/curswins.c $(WCURSES)/curswins.h $(INCL)/wincurs.h
 endif
 
-ifeq "$(WANT_WIN_QT4)" "Y"
+ifeq "$(WANT_WIN_QT)" "Y"
 # Qt dependencies
 
-$(GAMEDIR))/Qt5Core.dll : $(QT4_DIRECTORY)/bin/Qt5Core.dll
+$(GAMEDIR))/Qt5Core.dll : $(QT_DIRECTORY)/bin/Qt5Core.dll
 	$(subst /,\,@copy $< $@ >nul)
 
-$(GAMEDIR))/Qt5Gui.dll : $(QT4_DIRECTORY)/bin/Qt5Gui.dll
+$(GAMEDIR))/Qt5Gui.dll : $(QT_DIRECTORY)/bin/Qt5Gui.dll
 	$(subst /,\,@copy $< $@ >nul)
 
-$(GAMEDIR)/Qt5Widgets.dll : $(QT4_DIRECTORY)/bin/Qt5Widgets.dll
+$(GAMEDIR)/Qt5Widgets.dll : $(QT_DIRECTORY)/bin/Qt5Widgets.dll
 	$(subst /,\,@copy $< $@ >nul)
 
-$(GAMEDIR)/QtCore4.dll : $(QT4_DIRECTORY)/bin/QtCore4.dll
+$(GAMEDIR)/QtCore4.dll : $(QT_DIRECTORY)/bin/QtCore4.dll
 	$(subst /,\,@copy $< $@ >nul)
 
-$(GAMEDIR)/QtGui4.dll : $(QT4_DIRECTORY)/bin/QtGui4.dll
+$(GAMEDIR)/QtGui4.dll : $(QT_DIRECTORY)/bin/QtGui4.dll
 	$(subst /,\,@copy $< $@ >nul)
 
 $(GAMEDIR)/nhtiles.bmp : $(SRC)/tiles.bmp
@@ -1397,15 +1399,15 @@ $(GAMEDIR)/nhtiles.bmp : $(SRC)/tiles.bmp
 $(GAMEDIR)/rip.xpm : ../win/X11/rip.xpm
 	$(subst /,\,@copy $< $@ >nul)
 # Dependencies on .moc files (for Qt 4 or 5)
-$(OBJ)/qt4main.o : $(QT4)/qt4main.cpp $(QT4)/qt4main.moc $(QT4)/qt4kde0.moc
-$(OBJ)/qt4map.o : $(QT4)/qt4map.cpp $(QT4)/qt4map.moc
-$(OBJ)/qt4menu.o : $(QT4)/qt4menu.cpp $(QT4)/qt4menu.moc
-$(OBJ)/qt4msg.o : $(QT4)/qt4msg.cpp $(QT4)/qt4msg.moc
-$(OBJ)/qt4plsel.o : $(QT4)/qt4plsel.cpp $(QT4)/qt4plsel.moc
-$(OBJ)/qt4set.o : $(QT4)/qt4set.cpp $(QT4)/qt4set.moc
-$(OBJ)/qt4stat.o : $(QT4)/qt4stat.cpp $(QT4)/qt4stat.moc
-$(OBJ)/qt4xcmd.o : $(QT4)/qt4xcmd.cpp $(QT4)/qt4xcmd.moc
-$(OBJ)/qt4yndlg.o : $(QT4)/qt4yndlg.cpp $(QT4)/qt4yndlg.moc
+$(OBJ)/qt_main.o : $(QT)/qt_main.cpp $(QT)/qt_main.moc $(QT)/qt_kde0.moc
+$(OBJ)/qt_map.o : $(QT)/qt_map.cpp $(QT)/qt_map.moc
+$(OBJ)/qt_menu.o : $(QT)/qt_menu.cpp $(QT)/qt_menu.moc
+$(OBJ)/qt_msg.o : $(QT)/qt_msg.cpp $(QT)/qt_msg.moc
+$(OBJ)/qt_plsel.o : $(QT)/qt_plsel.cpp $(QT)/qt_plsel.moc
+$(OBJ)/qt_set.o : $(QT)/qt_set.cpp $(QT)/qt_set.moc
+$(OBJ)/qt_stat.o : $(QT)/qt_stat.cpp $(QT)/qt_stat.moc
+$(OBJ)/qt_xcmd.o : $(QT)/qt_xcmd.cpp $(QT)/qt_xcmd.moc
+$(OBJ)/qt_yndlg.o : $(QT)/qt_yndlg.cpp $(QT)/qt_yndlg.moc
 endif
 
 #
@@ -1479,66 +1481,15 @@ $(O)wintext.o: ../win/X11/wintext.c $(HACK_H) $(INCL)/winX.h $(INCL)/xwindow.h
 $(O)winval.o: ../win/X11/winval.c $(HACK_H) $(INCL)/winX.h
 	$(cc) $(CFLAGS) -o$@ ../win/X11/winval.c
 $(O)tile.o: $(SRC)/tile.c $(HACK_H)
-$(O)gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \
-		../win/gnome/gnmain.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnaskstr.c
-$(O)gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \
-		../win/gnome/gnaskstr.h ../win/gnome/gnyesno.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnbind.c
-$(O)gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(INCL)/tile2x11.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnglyph.c
-$(O)gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \
-		../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \
-		$(INCL)/date.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmain.c
-$(O)gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h ../win/gnome/gnglyph.h \
-		../win/gnome/gnsignal.h $(HACK_H)
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmap.c
-$(O)gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \
-		../win/gnome/gnbind.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmenu.c
-$(O)gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnmesg.c
-$(O)gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \
-		../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H)
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnopts.c
-$(O)gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \
-		../win/gnome/gnmain.h $(HACK_H)
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnplayer.c
-$(O)gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \
-		../win/gnome/gnmain.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnsignal.c
-$(O)gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h \
-		../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \
-		../win/gnome/gnomeprv.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnstatus.c
-$(O)gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \
-		../win/gnome/gn_rip.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gntext.c
-$(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \
-		../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnworn.c
-$(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h
-	$(cc) $(CFLAGS) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c
-$(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \
-		$(INCL)/wingem.h
-	$(cc) $(CFLAGS) -o$@ ../win/gem/wingem.c
-$(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \
-		$(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h
-	$(cc) $(CFLAGS) -o$@ ../win/gem/wingem1.c
-$(O)load_img.o: ../win/gem/load_img.c $(INCL)/load_img.h
-	$(cc) $(CFLAGS) -o$@ ../win/gem/load_img.c
-$(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h
-	$(cc) $(CFLAGS) -o$@ ../win/gem/gr_rect.c
-$(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \
+$(O)qt_win.o: $(QT)/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \
 		$(INCL)/dlb.h $(INCL)/tile2x11.h \
 		$(INCL)/qt_win.h $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \
 		$(INCL)/qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc
-	$(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_win.cpp
-$(O)qt_clust.o: ../win/Qt/qt_clust.cpp $(INCL)/qt_clust.h
-	$(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qt_clust.cpp
-$(O)qttableview.o: ../win/Qt/qttableview.cpp $(INCL)/qttableview.h
-	$(CXX) $(CXXFLAGS) -o$@ ../win/Qt/qttableview.cpp
+	$(CXX) $(CXXFLAGS) -o$@ $(QT)/qt_win.cpp
+$(O)qt_clust.o: $(QT)/qt_clust.cpp $(INCL)/qt_clust.h
+	$(CXX) $(CXXFLAGS) -o$@ $(QT)/qt_clust.cpp
+$(O)qttableview.o: $(QT)/qttableview.cpp $(INCL)/qttableview.h
+	$(CXX) $(CXXFLAGS) -o$@ $(QT)/qttableview.cpp
 $(O)vis_tab.o: vis_tab.c $(CONFIG_H) $(INCL)/vis_tab.h
 $(O)allmain.o: allmain.c $(HACK_H)
 $(O)alloc.o: alloc.c $(CONFIG_H)
diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 05fc3d8eb..629213b47 100644
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -189,6 +189,7 @@ TTY     = ..\win\tty     # window port files (tty)
 MSWIN   = ..\win\win32   # window port files (win32)
 WCURSES = ..\win\curses  # window port files (curses) 
 WSHR    = ..\win\share   # Tile support files 
+QT      = ..\win\Qt      # QT support files
 
 #
 #  Object directory.
@@ -1676,8 +1677,6 @@ clean:
 # That means that there is some irrelevant stuff
 # in here, but maintenance should be easier.
 #
-$(O)tos.o: ..\sys\atari\tos.c $(HACK_H) $(INCL)\tcap.h
-#	@$(cc) $(cflagsBuild) -Fo$@  ..\sys\atari\tos.c
 $(O)pcmain.o: ..\sys\share\pcmain.c $(HACK_H) $(INCL)\dlb.h
 #	@$(cc) $(cflagsBuild) -Fo$@  ..\sys\share\pcmain.c
 $(O)pcsys.o: ..\sys\share\pcsys.c $(HACK_H)
@@ -1762,198 +1761,118 @@ $(O)wintext.o: ..\win\X11\wintext.c $(HACK_H) $(INCL)\winX.h $(INCL)\xwindow.h
 $(O)winval.o: ..\win\X11\winval.c $(HACK_H) $(INCL)\winX.h
 #	@$(cc) $(cflagsBuild) $(X11CFLAGS) -Fo$@  ..\win\X11\winval.c
 $(O)tile.o: $(SRC)\tile.c $(HACK_H)
-$(O)gnaskstr.o: ..\win\gnome\gnaskstr.c ..\win\gnome\gnaskstr.h \
-		..\win\gnome\gnmain.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnaskstr.c
-$(O)gnbind.o: ..\win\gnome\gnbind.c ..\win\gnome\gnbind.h ..\win\gnome\gnomeprv.h \
-		$(HACK_H) $(INCL)\dlb.h \
-		$(INCL)\winGnome.h ..\win\gnome\gnmain.h \
-		..\win\gnome\gnmap.h ..\win\gnome\gnmenu.h \
-		..\win\gnome\gnplayer.h ..\win\gnome\gnsignal.h \
-		..\win\gnome\gnglyph.h ..\win\gnome\gnstatus.h \
-		..\win\gnome\gntext.h ..\win\gnome\gnmesg.h \
-		..\win\gnome\gnyesno.h ..\win\gnome\gnworn.h \
-		..\win\gnome\gnaskstr.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnbind.c
-$(O)gnglyph.o: ..\win\gnome\gnglyph.c ..\win\gnome\gnglyph.h $(CONFIG_H) \
-		$(INCL)\tile2x11.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnglyph.c
-$(O)gnmain.o: ..\win\gnome\gnmain.c ..\win\gnome\gnmain.h ..\win\gnome\gnsignal.h \
-		..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \
-		$(INCL)\winGnome.h \
-		..\win\gnome\gnglyph.h ..\win\gnome\gnbind.h \
-		..\win\gnome\gnmap.h ..\win\gnome\gnmenu.h \
-		..\win\gnome\gnplayer.h ..\win\gnome\gnstatus.h \
-		..\win\gnome\gntext.h ..\win\gnome\gnmesg.h \
-		..\win\gnome\gnyesno.h ..\win\gnome\gnworn.h \
-		..\win\gnome\gnopts.h $(INCL)\date.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnmain.c
-$(O)gnmap.o: ..\win\gnome\gnmap.c ..\win\gnome\gnmap.h $(CONFIG_H) \
-		..\win\gnome\gnglyph.h ..\win\gnome\gnsignal.h \
-		..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \
-		$(INCL)\winGnome.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnmap.c
-$(O)gnmenu.o: ..\win\gnome\gnmenu.c ..\win\gnome\gnmenu.h $(CONFIG_H) \
-		..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \
-		$(INCL)\winGnome.h \
-		..\win\gnome\gnmain.h ..\win\gnome\gnbind.h \
-		..\win\gnome\gnmap.h ..\win\gnome\gnplayer.h \
-		..\win\gnome\gnsignal.h ..\win\gnome\gnglyph.h \
-		..\win\gnome\gnstatus.h ..\win\gnome\gntext.h \
-		..\win\gnome\gnmesg.h ..\win\gnome\gnyesno.h \
-		..\win\gnome\gnworn.h $(INCL)\func_tab.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnmenu.c
-$(O)gnmesg.o: ..\win\gnome\gnmesg.c ..\win\gnome\gnmesg.h $(CONFIG_H) \
-		..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h $(HACK_H) \
-		$(INCL)\dlb.h $(INCL)\winGnome.h \
-		..\win\gnome\gnglyph.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnmesg.c
-$(O)gnopts.o: ..\win\gnome\gnopts.c ..\win\gnome\gnopts.h ..\win\gnome\gnglyph.h \
-		$(CONFIG_H) ..\win\gnome\gnmain.h ..\win\gnome\gnmap.h $(HACK_H)
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnopts.c
-$(O)gnplayer.o: ..\win\gnome\gnplayer.c ..\win\gnome\gnplayer.h \
-		..\win\gnome\gnmain.h $(HACK_H)
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnplayer.c
-$(O)gnsignal.o: ..\win\gnome\gnsignal.c ..\win\gnome\gnsignal.h \
-		..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \
-		$(INCL)\winGnome.h \
-		..\win\gnome\gnglyph.h ..\win\gnome\gnmain.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnsignal.c
-$(O)gnstatus.o: ..\win\gnome\gnstatus.c ..\win\gnome\gnstatus.h $(CONFIG_H) \
-		..\win\gnome\gnsignal.h ..\win\gnome\gnomeprv.h $(HACK_H) \
-		$(INCL)\dlb.h $(INCL)\winGnome.h \
-		..\win\gnome\gnglyph.h ..\win\gnome\gn_xpms.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnstatus.c
-$(O)gntext.o: ..\win\gnome\gntext.c ..\win\gnome\gntext.h $(CONFIG_H) \
-		..\win\gnome\gnmain.h ..\win\gnome\gn_rip.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gntext.c
-$(O)gnyesno.o: ..\win\gnome\gnyesno.c ..\win\gnome\gnbind.h \
-		..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \
-		$(INCL)\winGnome.h \
-		..\win\gnome\gnmain.h ..\win\gnome\gnmap.h \
-		..\win\gnome\gnmenu.h ..\win\gnome\gnplayer.h \
-		..\win\gnome\gnsignal.h ..\win\gnome\gnglyph.h \
-		..\win\gnome\gnstatus.h ..\win\gnome\gntext.h \
-		..\win\gnome\gnmesg.h ..\win\gnome\gnyesno.h \
-		..\win\gnome\gnworn.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnyesno.c
-$(O)gnworn.o: ..\win\gnome\gnworn.c ..\win\gnome\gnworn.h $(CONFIG_H) \
-		..\win\gnome\gnglyph.h ..\win\gnome\gnsignal.h \
-		..\win\gnome\gnomeprv.h $(HACK_H) $(INCL)\dlb.h \
-		$(INCL)\winGnome.h
-#	@$(cc) $(cflagsBuild) $(GNOMEINC) -Fo$@  ..\win\gnome\gnworn.c
-$(O)wingem.o: ..\win\gem\wingem.c $(HACK_H) $(INCL)\func_tab.h $(INCL)\dlb.h \
-		$(INCL)\wingem.h
-#	@$(cc) $(cflagsBuild) -Fo$@  ..\win\gem\wingem.c
-$(O)wingem1.o: ..\win\gem\wingem1.c $(INCL)\gem_rsc.h $(INCL)\load_img.h \
-		$(INCL)\gr_rect.h $(INCL)\wintype.h $(INCL)\wingem.h
-#	@$(cc) $(cflagsBuild) -Fo$@  ..\win\gem\wingem1.c
-$(O)load_img.o: ..\win\gem\load_img.c $(INCL)\load_img.h
-#	@$(cc) $(cflagsBuild) -Fo$@  ..\win\gem\load_img.c
-$(O)gr_rect.o: ..\win\gem\gr_rect.c $(INCL)\gr_rect.h
-#	@$(cc) $(cflagsBuild) -Fo$@  ..\win\gem\gr_rect.c
-$(O)tile.o: $(SRC)\tile.c $(HACK_H)
 #cppregex.o: ..\sys\share\cppregex.cpp
 #	$(CXX) $(CXXFLAGS) -Fo$@  ..\sys\share\cppregex.cpp
-$(O)qt_bind.o: ..\win\Qt\qt_bind.cpp $(HACK_H) ..\win\Qt\qt_bind.h \
-		..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h ..\win\Qt\qt_click.h \
-		..\win\Qt\qt_delay.h ..\win\Qt\qt_xcmd.h ..\win\Qt\qt_key.h \
-		..\win\Qt\qt_map.h ..\win\Qt\qt_win.h ..\win\Qt\qt_clust.h \
-		..\win\Qt\qt_menu.h ..\win\Qt\qt_rip.h ..\win\Qt\qt_msg.h \
-		..\win\Qt\qt_plsel.h ..\win\Qt\qt_svsel.h ..\win\Qt\qt_set.h \
-		..\win\Qt\qt_stat.h ..\win\Qt\qt_icon.h ..\win\Qt\qt_streq.h \
-		..\win\Qt\qt_line.h ..\win\Qt\qt_yndlg.h ..\win\Qt\qt_str.h \
+$(O)qt_bind.o: $(QT)\qt_bind.cpp $(HACK_H) $(QT)\qt_bind.h \
+		$(QT)\qt_main.h $(QT)\qt_kde0.h $(QT)\qt_click.h \
+		$(QT)\qt_delay.h $(QT)\qt_xcmd.h $(QT)\qt_key.h \
+		$(QT)\qt_map.h $(QT)\qt_win.h $(QT)\qt_clust.h \
+		$(QT)\qt_menu.h $(QT)\qt_rip.h $(QT)\qt_msg.h \
+		$(QT)\qt_plsel.h $(QT)\qt_svsel.h $(QT)\qt_set.h \
+		$(QT)\qt_stat.h $(QT)\qt_icon.h $(QT)\qt_streq.h \
+		$(QT)\qt_line.h $(QT)\qt_yndlg.h $(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h \
 		$(INCL)\dlb.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_bind.cpp
-$(O)qt_click.o: ..\win\Qt\qt_click.cpp $(HACK_H) ..\win\Qt\qt_click.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_click.cpp
-$(O)qt_clust.o: ..\win\Qt\qt_clust.cpp ..\win\Qt\qt_clust.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_clust.cpp
-$(O)qt_delay.o: ..\win\Qt\qt_delay.cpp $(HACK_H) ..\win\Qt\qt_delay.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_delay.cpp
-$(O)qt_glyph.o: ..\win\Qt\qt_glyph.cpp $(HACK_H) $(INCL)\tile2x11.h \
-		..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_glyph.cpp
-$(O)qt_icon.o: ..\win\Qt\qt_icon.cpp $(HACK_H) ..\win\Qt\qt_icon.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_icon.cpp
-$(O)qt_inv.o: ..\win\Qt\qt_inv.cpp $(HACK_H) ..\win\Qt\qt_inv.h \
-		..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_inv.cpp
-$(O)qt_key.o: ..\win\Qt\qt_key.cpp $(HACK_H) ..\win\Qt\qt_key.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_key.cpp
-$(O)qt_line.o: ..\win\Qt\qt_line.cpp $(HACK_H) ..\win\Qt\qt_line.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_line.cpp
-$(O)qt_main.o: ..\win\Qt\qt_main.cpp $(HACK_H) \
-		..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h qt_main.moc \
-		..\win\Qt\qt_bind.h ..\win\Qt\qt_glyph.h ..\win\Qt\qt_inv.h \
-		..\win\Qt\qt_key.h ..\win\Qt\qt_map.h ..\win\Qt\qt_win.h \
-		..\win\Qt\qt_clust.h ..\win\Qt\qt_msg.h ..\win\Qt\qt_set.h \
-		..\win\Qt\qt_stat.h ..\win\Qt\qt_icon.h ..\win\Qt\qt_str.h \
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_bind.cpp
+$(O)qt_click.o: $(QT)\qt_click.cpp $(HACK_H) $(QT)\qt_click.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_click.cpp \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+$(O)qt_clust.o: $(QT)\qt_clust.cpp $(QT)\qt_clust.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_clust.cpp
+$(O)qt_delay.o: $(QT)\qt_delay.cpp $(HACK_H) $(QT)\qt_delay.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_delay.cpp \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+$(O)qt_glyph.o: $(QT)\qt_glyph.cpp $(HACK_H) $(INCL)\tile2x11.h \
+		$(QT)\qt_glyph.h $(QT)\qt_set.h $(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_glyph.cpp
+$(O)qt_icon.o: $(QT)\qt_icon.cpp $(HACK_H) $(QT)\qt_icon.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_icon.cpp
+$(O)qt_inv.o: $(QT)\qt_inv.cpp $(HACK_H) $(QT)\qt_inv.h \
+		$(QT)\qt_glyph.h $(QT)\qt_set.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_inv.cpp
+$(O)qt_key.o: $(QT)\qt_key.cpp $(HACK_H) $(QT)\qt_key.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_key.cpp
+$(O)qt_line.o: $(QT)\qt_line.cpp $(HACK_H) $(QT)\qt_line.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_line.cpp
+$(O)qt_main.o: $(QT)\qt_main.cpp $(HACK_H) \
+		$(QT)\qt_main.h $(QT)\qt_kde0.h qt_main.moc \
+		$(QT)\qt_bind.h $(QT)\qt_glyph.h $(QT)\qt_inv.h \
+		$(QT)\qt_key.h $(QT)\qt_map.h $(QT)\qt_win.h \
+		$(QT)\qt_clust.h $(QT)\qt_msg.h $(QT)\qt_set.h \
+		$(QT)\qt_stat.h $(QT)\qt_icon.h $(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h \
 		qt_kde0.moc
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_main.cpp
-$(O)qt_map.o: ..\win\Qt\qt_map.cpp $(HACK_H) ..\win\Qt\qt_map.h ..\win\Qt\qt_win.h \
-		..\win\Qt\qt_clust.h qt_map.moc ..\win\Qt\qt_click.h \
-		..\win\Qt\qt_glyph.h ..\win\Qt\qt_xpms.h ..\win\Qt\qt_set.h \
-		..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_map.cpp
-$(O)qt_menu.o: ..\win\Qt\qt_menu.cpp $(HACK_H) ..\win\Qt\qt_menu.h \
-		..\win\Qt\qt_win.h ..\win\Qt\qt_rip.h qt_menu.moc \
-		..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h ..\win\Qt\qt_streq.h \
-		..\win\Qt\qt_line.h ..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_menu.cpp
-$(O)qt_msg.o: ..\win\Qt\qt_msg.cpp $(HACK_H) ..\win\Qt\qt_msg.h ..\win\Qt\qt_win.h \
-		qt_msg.moc ..\win\Qt\qt_map.h ..\win\Qt\qt_clust.h \
-		..\win\Qt\qt_set.h ..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_msg.cpp
-$(O)qt_plsel.o: ..\win\Qt\qt_plsel.cpp $(HACK_H) ..\win\Qt\qt_plsel.h qt_plsel.moc \
-		..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \
-		..\win\Qt\qt_glyph.h ..\win\Qt\qt_set.h ..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_plsel.cpp
-$(O)qt_rip.o: ..\win\Qt\qt_rip.cpp $(HACK_H) ..\win\Qt\qt_rip.h \
-		..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \
-		..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_rip.cpp
-$(O)qt_set.o: ..\win\Qt\qt_set.cpp $(HACK_H) ..\win\Qt\qt_set.h qt_set.moc \
-		..\win\Qt\qt_glyph.h ..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_set.cpp
-$(O)qt_stat.o: ..\win\Qt\qt_stat.cpp $(HACK_H) ..\win\Qt\qt_stat.h \
-		..\win\Qt\qt_win.h ..\win\Qt\qt_icon.h qt_stat.moc \
-		..\win\Qt\qt_set.h ..\win\Qt\qt_str.h ..\win\Qt\qt_xpms.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_stat.cpp
-$(O)qt_str.o: ..\win\Qt\qt_str.cpp ..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_str.cpp
-$(O)qt_streq.o: ..\win\Qt\qt_streq.cpp $(HACK_H) ..\win\Qt\qt_streq.h \
-		..\win\Qt\qt_line.h ..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_streq.cpp
-$(O)qt_svsel.o: ..\win\Qt\qt_svsel.cpp $(HACK_H) ..\win\Qt\qt_svsel.h \
-		..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \
-		..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_svsel.cpp
-$(O)qt_win.o: ..\win\Qt\qt_win.cpp $(HACK_H) ..\win\Qt\qt_win.h \
-		..\win\Qt\qt_bind.h ..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h \
-		..\win\Qt\qt_click.h ..\win\Qt\qt_glyph.h ..\win\Qt\qt_inv.h \
-		..\win\Qt\qt_key.h ..\win\Qt\qt_icon.h ..\win\Qt\qt_map.h \
-		..\win\Qt\qt_clust.h ..\win\Qt\qt_menu.h ..\win\Qt\qt_rip.h \
-		..\win\Qt\qt_msg.h ..\win\Qt\qt_set.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_win.cpp
-$(O)qt_xcmd.o: ..\win\Qt\qt_xcmd.cpp $(HACK_H) $(INCL)\func_tab.h \
-		..\win\Qt\qt_xcmd.h qt_xcmd.moc ..\win\Qt\qt_bind.h \
-		..\win\Qt\qt_main.h ..\win\Qt\qt_kde0.h ..\win\Qt\qt_set.h \
-		..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_xcmd.cpp
-$(O)qt_yndlg.o: ..\win\Qt\qt_yndlg.cpp $(HACK_H) ..\win\Qt\qt_yndlg.h qt_yndlg.moc \
-		..\win\Qt\qt_str.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt\qt_yndlg.cpp
-$(O)qt3_win.o: ..\win\Qt3\qt3_win.cpp $(HACK_H) $(INCL)\func_tab.h \
-		$(INCL)\dlb.h $(INCL)\tile2x11.h \
-		..\win\Qt3\qt3_win.h ..\win\Qt3\qt3_clust.h \
-		..\win\Qt3\qt3_kde0.h ..\win\Qt3\qt3_xpms.h qt3_win.moc \
-		qt3_kde0.moc qt3tableview.moc
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt3\qt3_win.cpp
-$(O)qt3_clust.o: ..\win\Qt3\qt3_clust.cpp ..\win\Qt3\qt3_clust.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt3\qt3_clust.cpp
-$(O)qt3tableview.o: ..\win\Qt3\qt3tableview.cpp ..\win\Qt3\qt3tableview.h
-	$(CXX) $(CXXFLAGS) -Fo$@  ..\win\Qt3\qt3tableview.cpp
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_main.cpp
+$(O)qt_map.o: $(QT)\qt_map.cpp $(HACK_H) $(QT)\qt_map.h $(QT)\qt_win.h \
+		$(QT)\qt_clust.h qt_map.moc $(QT)\qt_click.h \
+		$(QT)\qt_glyph.h $(QT)\qt_xpms.h $(QT)\qt_set.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h \
+		$(QT)\qt_str.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_map.cpp
+$(O)qt_menu.o: $(QT)\qt_menu.cpp $(HACK_H) $(QT)\qt_menu.h \
+		$(QT)\qt_win.h $(QT)\qt_rip.h qt_menu.moc \
+		$(QT)\qt_glyph.h $(QT)\qt_set.h $(QT)\qt_streq.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h \
+		$(QT)\qt_line.h $(QT)\qt_str.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_menu.cpp
+$(O)qt_msg.o: $(QT)\qt_msg.cpp $(HACK_H) $(QT)\qt_msg.h $(QT)\qt_win.h \
+		qt_msg.moc $(QT)\qt_map.h $(QT)\qt_clust.h \
+		$(QT)\qt_set.h $(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_msg.cpp
+$(O)qt_plsel.o: $(QT)\qt_plsel.cpp $(HACK_H) $(QT)\qt_plsel.h qt_plsel.moc \
+		$(QT)\qt_bind.h $(QT)\qt_main.h $(QT)\qt_kde0.h \
+		$(QT)\qt_glyph.h $(QT)\qt_set.h $(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_plsel.cpp
+$(O)qt_rip.o: $(QT)\qt_rip.cpp $(HACK_H) $(QT)\qt_rip.h \
+		$(QT)\qt_bind.h $(QT)\qt_main.h $(QT)\qt_kde0.h \
+		$(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_rip.cpp
+$(O)qt_set.o: $(QT)\qt_set.cpp $(HACK_H) $(QT)\qt_set.h qt_set.moc \
+		$(QT)\qt_glyph.h $(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_set.cpp
+$(O)qt_stat.o: $(QT)\qt_stat.cpp $(HACK_H) $(QT)\qt_stat.h \
+		$(QT)\qt_win.h $(QT)\qt_icon.h qt_stat.moc \
+		$(QT)\qt_set.h $(QT)\qt_str.h $(QT)\qt_xpms.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_stat.cpp
+$(O)qt_str.o: $(QT)\qt_str.cpp $(QT)\qt_str.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_str.cpp
+$(O)qt_streq.o: $(QT)\qt_streq.cpp $(HACK_H) $(QT)\qt_streq.h \
+		$(QT)\qt_line.h $(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_streq.cpp
+$(O)qt_svsel.o: $(QT)\qt_svsel.cpp $(HACK_H) $(QT)\qt_svsel.h \
+		$(QT)\qt_bind.h $(QT)\qt_main.h $(QT)\qt_kde0.h \
+		$(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_svsel.cpp
+$(O)qt_win.o: $(QT)\qt_win.cpp $(HACK_H) $(QT)\qt_win.h \
+		$(QT)\qt_bind.h $(QT)\qt_main.h $(QT)\qt_kde0.h \
+		$(QT)\qt_click.h $(QT)\qt_glyph.h $(QT)\qt_inv.h \
+		$(QT)\qt_key.h $(QT)\qt_icon.h $(QT)\qt_map.h \
+		$(QT)\qt_clust.h $(QT)\qt_menu.h $(QT)\qt_rip.h \
+		$(QT)\qt_msg.h $(QT)\qt_set.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_win.cpp
+$(O)qt_xcmd.o: $(QT)\qt_xcmd.cpp $(HACK_H) $(INCL)\func_tab.h \
+		$(QT)\qt_xcmd.h qt_xcmd.moc $(QT)\qt_bind.h \
+		$(QT)\qt_main.h $(QT)\qt_kde0.h $(QT)\qt_set.h \
+		$(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_xcmd.cpp
+$(O)qt_yndlg.o: $(QT)\qt_yndlg.cpp $(HACK_H) $(QT)\qt_yndlg.h qt_yndlg.moc \
+		$(QT)\qt_str.h \
+		$(QT)\qt_pre.h $(QT)\qt_post.h
+	$(CXX) $(CXXFLAGS) -Fo$@  $(QT)\qt_yndlg.cpp
 $(O)wc_chainin.o: ..\win\chain\wc_chainin.c $(HACK_H)
 #	@$(cc) $(cflagsBuild) -Fo$@  ..\win\chain\wc_chainin.c
 $(O)wc_chainout.o: ..\win\chain\wc_chainout.c $(HACK_H)
@@ -1983,7 +1902,6 @@ $(O)dog.o: dog.c $(HACK_H)
 $(O)dogmove.o: dogmove.c $(HACK_H) $(INCL)\mfndpos.h
 $(O)dokick.o: dokick.c $(HACK_H)
 $(O)dothrow.o: dothrow.c $(HACK_H)
-$(O)drawing.o: drawing.c $(CONFIG_H)
 $(O)dungeon.o: dungeon.c $(HACK_H) $(INCL)\dgn_file.h $(INCL)\dlb.h
 $(O)eat.o: eat.c $(HACK_H)
 $(O)end.o: end.c $(HACK_H) $(INCL)\dlb.h