diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 0c69ef838..f7fd72278 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -468,7 +468,8 @@ convert obj->oextra->omid from pointer to scalar
 get rid of unused obj->oextra->olong
 relocated unmaintained code to outdated folder, specifically sys/amiga, 
 	sys/atari, sys/be, sys/mac, sys/os2, sys/wince, win/Qt3, win/gem,
-	win/gnome, include/amiconf.h, include/os2conf.h, include/tosconf.h
-remove SYSFLAGS conditional code
-remove MFLOPPY conditional code
-
+	win/gnome, include/amiconf.h, include/beconf.h, include/def_os2.h,
+	include/os2conf.h, include/macconf.h, include/tosconf.h,
+	include/wceconf.h
+removed SYSFLAGS conditional code
+removed MFLOPPY conditional code
diff --git a/include/global.h b/include/global.h
index bf0ed4b16..38ab3d29d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -175,37 +175,13 @@ extern struct cross_target_s cross_target;
 #include "unixconf.h"
 #endif
 
-#ifdef OS2
-#include "os2conf.h"
-#endif
-
 #ifdef MSDOS
 #include "pcconf.h"
 #endif
 
-#ifdef TOS
-#include "tosconf.h"
-#endif
-
-#ifdef AMIGA
-#include "amiconf.h"
-#endif
-
-#ifdef MAC
-#include "macconf.h"
-#endif
-
-#ifdef __BEOS__
-#include "beconf.h"
-#endif
-
 #ifdef WIN32
-#ifdef WIN_CE
-#include "wceconf.h"
-#else
 #include "ntconf.h"
 #endif
-#endif
 
 /* Displayable name of this port; don't redefine if defined in *conf.h */
 #ifndef PORT_ID
diff --git a/include/beconf.h b/outdated/include/beconf.h
similarity index 100%
rename from include/beconf.h
rename to outdated/include/beconf.h
diff --git a/include/def_os2.h b/outdated/include/def_os2.h
similarity index 100%
rename from include/def_os2.h
rename to outdated/include/def_os2.h
diff --git a/include/macconf.h b/outdated/include/macconf.h
similarity index 100%
rename from include/macconf.h
rename to outdated/include/macconf.h
diff --git a/include/wceconf.h b/outdated/include/wceconf.h
similarity index 100%
rename from include/wceconf.h
rename to outdated/include/wceconf.h
diff --git a/sys/msdos/Makefile1.cross b/sys/msdos/Makefile1.cross
index 834156ab4..88f7efdd0 100644
--- a/sys/msdos/Makefile1.cross
+++ b/sys/msdos/Makefile1.cross
@@ -190,9 +190,7 @@ GLOBAL_H   = $(PCCONF_H)	$(INCL)/coord.h	   $(INCL)/global.h
 CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \
 		$(INCL)/global.h $(INCL)/coord.h $(INCL)/vmsconf.h \
 		$(INCL)/system.h $(INCL)/nhlua.h $(INCL)/unixconf.h \
-		$(INCL)/os2conf.h $(INCL)/micro.h $(INCL)/pcconf.h \
-		$(INCL)/tosconf.h $(INCL)/amiconf.h $(INCL)/macconf.h \
-		$(INCL)/beconf.h $(INCL)/wceconf.h $(INCL)/ntconf.h
+		$(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/ntconf.h
 
 HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/lint.h $(INCL)/align.h \
 		$(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \
diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross
index 19499e86c..8cd94ffc2 100644
--- a/sys/msdos/Makefile2.cross
+++ b/sys/msdos/Makefile2.cross
@@ -413,9 +413,7 @@ GLOBAL_H   = $(PCCONF_H)	$(INCL)/coord.h	   $(INCL)/global.h
 CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \
 		$(INCL)/global.h $(INCL)/coord.h $(INCL)/vmsconf.h \
 		$(INCL)/system.h $(INCL)/nhlua.h $(INCL)/unixconf.h \
-		$(INCL)/os2conf.h $(INCL)/micro.h $(INCL)/pcconf.h \
-		$(INCL)/tosconf.h $(INCL)/amiconf.h $(INCL)/macconf.h \
-		$(INCL)/beconf.h $(INCL)/wceconf.h $(INCL)/ntconf.h
+		$(INCL)/micro.h $(INCL)/pcconf.h $(INCL)/ntconf.h
 
 HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/lint.h $(INCL)/align.h \
 		$(INCL)/dungeon.h $(INCL)/monsym.h $(INCL)/mkroom.h \
diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index fc9eca159..5bdf1d88f 100644
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -370,7 +370,7 @@ WINCURSESLIB = -lncurses
 GAME     = nethack
 # GAME     = nethack.prg
 
-# if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
+# if you defined RANDOM in unixconf.h since your system did not come
 # with a reasonable random number generator
 # RANDOBJ = random.o
 RANDOBJ =
@@ -401,7 +401,7 @@ QUIETCC=0
 # Nothing below this line should have to be changed.
 #
 # Other things that have to be reconfigured are in config.h,
-# {unixconf.h, pcconf.h, tosconf.h}, and possibly system.h
+# {unixconf.h, pcconf.h}, and possibly system.h
 
 # Verbosity definitions, begin
 #   Set QUIETCC=1 above to output less feedback while building.
@@ -493,15 +493,15 @@ CSOURCES = $(HACKCSRC) $(SYSCSRC) $(WINCSRC) $(CHAINSRC) $(GENCSRC)
 # cause dependency loops if run through "make depend"
 # and dgn_file.h, special level & dungeon files.
 #
-HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h botl.h \
-	color.h config.h config1.h context.h coord.h decl.h def_os2.h \
+HACKINCL = align.h artifact.h artilist.h attrib.h beconf.h botl.h \
+	color.h config.h config1.h context.h coord.h decl.h \
 	display.h dlb.h dungeon.h engrave.h extern.h flag.h fnamesiz.h \
-	func_tab.h global.h hack.h lint.h macconf.h mextra.h mfndpos.h \
+	func_tab.h global.h hack.h lint.h mextra.h mfndpos.h \
 	micro.h mkroom.h \
 	monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \
-	optlist.h os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h \
+	optlist.h patchlevel.h pcconf.h permonst.h prop.h rect.h \
 	region.h rm.h sp_lev.h spell.h sys.h system.h tcap.h timeout.h \
-	tosconf.h tradstdc.h trampoli.h trap.h unixconf.h vision.h vmsconf.h \
+	tradstdc.h trampoli.h trap.h unixconf.h vision.h vmsconf.h \
 	wintty.h wincurs.h winX.h winprocs.h wintype.h you.h youprop.h
 
 HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h dgn_file.h
@@ -733,9 +733,7 @@ depend: ../sys/unix/depend.awk \
 $(CONFIG_H): ../include/config.h ../include/config1.h ../include/tradstdc.h \
 		../include/global.h ../include/coord.h ../include/vmsconf.h \
 		../include/system.h ../include/nhlua.h ../include/unixconf.h \
-		../include/os2conf.h ../include/micro.h ../include/pcconf.h \
-		../include/tosconf.h ../include/amiconf.h ../include/macconf.h \
-		../include/beconf.h ../include/wceconf.h ../include/ntconf.h \
+		../include/micro.h ../include/pcconf.h ../include/ntconf.h \
 		../include/fnamesiz.h
 	touch $(CONFIG_H)
 # hack.h timestamp
diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src
index 40ea87bdc..e215ad04d 100644
--- a/sys/vms/Makefile.src
+++ b/sys/vms/Makefile.src
@@ -173,14 +173,14 @@ VERSOURCES = $(HACKCSRC) $(SYSSRC) $(WINSRC) $(RANDSRC) $(GENCSRC)
 # cause dependency loops if run through "make depend"
 # and dgn_comp.h, dgn_file.h, lev_comp.h, special level & dungeon files.
 #
-HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \
-	   config.h config1.h context.h coord.h decl.h def_os2.h display.h \
+HACKINCL = align.h artifact.h artilist.h attrib.h color.h \
+	   config.h config1.h context.h coord.h decl.h display.h \
 	   dlb.h dungeon.h engrave.h extern.h flag.h func_tab.h global.h \
-	   hack.h macconf.h mextra.h mfndpos.h micro.h mkroom.h \
+	   hack.h mextra.h mfndpos.h micro.h mkroom.h \
 	   monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \
-	   os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h \
+	   patchlevel.h pcconf.h permonst.h prop.h rect.h \
 	   region.h rm.h sp_lev.h spell.h sys.h system.h tcap.h timeout.h \
-	   tosconf.h tradstdc.h trampoli.h trap.h unixconf.h vision.h \
+	   tradstdc.h trampoli.h trap.h unixconf.h vision.h \
 	   vmsconf.h wintty.h winX.h winprocs.h wintype.h you.h youprop.h
 
 #HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h\
@@ -378,11 +378,8 @@ spotless :	clean
 #	dependencies (mostly cloned from sys/unix/Makefile.src)
 # config.h timestamp
 $(CONFIG_H) : $(INC)config.h $(INC)config1.h $(INC)tradstdc.h $(INC)global.h \
-		$(INC)coord.h $(INC)vmsconf.h $(INC)system.h \
-		$(INC)unixconf.h $(INC)os2conf.h $(INC)micro.h \
-		$(INC)pcconf.h $(INC)tosconf.h $(INC)amiconf.h \
-		$(INC)macconf.h $(INC)beconf.h $(INC)wceconf.h \
-		$(INC)ntconf.h
+		$(INC)coord.h $(INC)vmsconf.h $(INC)system.h $(INC)unixconf.h \
+		$(INC)micro.h $(INC)pcconf.h $(INC)ntconf.h
 	$(TOUCH) $(CONFIG_H)
 # hack.h timestamp
 $(HACK_H) : $(INC)hack.h $(CONFIG_H) $(INC)align.h \
diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index ad5d361a4..d4afa35bb 100644
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -474,8 +474,7 @@ endif
 CONFIG_H = $(INCL)/config.h $(INCL)/config1.h $(INCL)/tradstdc.h \
 		$(INCL)/global.h $(INCL)/fnamesiz.h $(INCL)/coord.h \
 		$(INCL)/vmsconf.h $(INCL)/system.h $(INCL)/unixconf.h \
-		$(INCL)/os2conf.h $(INCL)/micro.h $(INCL)/pcconf.h \
-		$(INCL)/tosconf.h $(INCL)/amiconf.h $(INCL)/macconf.h \
+		$(INCL)/micro.h $(INCL)/pcconf.h \
 		$(INCL)/beconf.h $(INCL)/ntconf.h
 
 HACK_H = $(INCL)/hack.h $(CONFIG_H) $(INCL)/align.h $(INCL)/context.h \
diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index bdba20fd4..f3bc2a61d 100644
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -472,9 +472,7 @@ PDCLIB =
 CONFIG_H = $(INCL)\config.h $(INCL)\config1.h $(INCL)\tradstdc.h \
 		$(INCL)\global.h $(INCL)\fnamesiz.h $(INCL)\coord.h \
 		$(INCL)\vmsconf.h $(INCL)\system.h $(INCL)\nhlua.h \
-		$(INCL)\unixconf.h $(INCL)\os2conf.h $(INCL)\micro.h \
-		$(INCL)\pcconf.h $(INCL)\tosconf.h $(INCL)\amiconf.h \
-		$(INCL)\macconf.h $(INCL)\beconf.h $(INCL)\wceconf.h \
+		$(INCL)\unixconf.h $(INCL)\micro.h $(INCL)\pcconf.h \ 
 		$(INCL)\ntconf.h
 
 HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\lint.h $(INCL)\align.h \