diff --git a/include/monst.h b/include/monst.h
index bc8f939c5..3a26b7241 100644
--- a/include/monst.h
+++ b/include/monst.h
@@ -159,8 +159,9 @@ struct monst {
 
     long mtrapseen;        /* bitmap of traps we've been trapped in */
     long mlstmv;           /* for catching up with lost time */
+    long mstate;           /* debugging info on monsters stored here */
+    long migflags;         /* migrating flags */
     long mspare1;
-#define mstate mspare1      /* only for debug exam right now, not code flow */
     struct obj *minvent;   /* mon's inventory */
     struct obj *mw;        /* mon's weapon */
     long misc_worn_check;  /* mon's wornmask */
diff --git a/src/dog.c b/src/dog.c
index a5946eb76..5b9cfed69 100644
--- a/src/dog.c
+++ b/src/dog.c
@@ -417,7 +417,7 @@ boolean with_you;
         break;
     }
 
-    if ((mtmp->mspare1 & MIGR_LEFTOVERS) != 0L) {
+    if ((mtmp->migflags & MIGR_LEFTOVERS) != 0L) {
         /* Pick up the rest of the MIGR_TO_SPECIES objects */
         if (g.migrating_objs)
             deliver_obj_to_mon(mtmp, 0, DF_ALL);
diff --git a/src/mkmaze.c b/src/mkmaze.c
index 0313c002d..b5fd346fd 100644
--- a/src/mkmaze.c
+++ b/src/mkmaze.c
@@ -646,14 +646,14 @@ unsigned long mflags;
         /* once in a blue moon, he won't be at the very bottom */
         if (!rn2(40))
             nlev--;
-        mtmp->mspare1 |= MIGR_LEFTOVERS;
+        mtmp->migflags |= MIGR_LEFTOVERS;
     } else {
         nlev = rn2((max_depth - cur_depth) + 1) + cur_depth;
         if (nlev == cur_depth)
             nlev++;
         if (nlev > max_depth)
             nlev = max_depth;
-        mtmp->mspare1 = (mtmp->mspare1 & ~MIGR_LEFTOVERS);
+        mtmp->migflags = (mtmp->migflags & ~MIGR_LEFTOVERS);
     }
     get_level(&dest, nlev);
     migrate_to_level(mtmp, ledger_no(&dest), MIGR_RANDOM, (coord *) 0);
diff --git a/src/sfascii.c b/src/sfascii.c
index 22508db4a..4dcc990d4 100644
--- a/src/sfascii.c
+++ b/src/sfascii.c
@@ -6,7 +6,7 @@
 #include "integer.h"
 #include "sfprocs.h"
 
-#ifdef MACOSX
+#if defined(MACOSX) || defined(VMS)
 extern long long FDECL(atoll, (const char *));
 #endif
 
diff --git a/src/sfdata.c b/src/sfdata.c
index ac6fe5fc5..b3d862ae7 100644
--- a/src/sfdata.c
+++ b/src/sfdata.c
@@ -1258,6 +1258,8 @@ int cnt;
     sfo_ulong(nhfp, &d_monst->mstrategy, parent, "mstrategy", 1);/* (unsigned long) */
     sfo_long(nhfp, &d_monst->mtrapseen, parent, "mtrapseen", 1); /* (long) */
     sfo_long(nhfp, &d_monst->mlstmv, parent, "mlstmv", 1);       /* (long) */
+    sfo_long(nhfp, &d_monst->mstate, parent, "mstate", 1);       /* (long) */
+    sfo_long(nhfp, &d_monst->migflags, parent, "migflags", 1);   /* (long) */
     sfo_long(nhfp, &d_monst->mspare1, parent, "mspare1", 1);     /* (long) */
     sfo_genericptr(nhfp, (genericptr_t) &d_monst->minvent, parent, "minvent", 1);/* (struct obj *) */
     sfo_genericptr(nhfp, (genericptr_t) &d_monst->mw, parent, "mw", 1);/* (struct obj *) */
@@ -3814,6 +3816,8 @@ int cnt;
     sfi_ulong(nhfp, &d_monst->mstrategy, parent, "mstrategy", 1);
     sfi_long(nhfp, &d_monst->mtrapseen, parent, "mtrapseen", 1);
     sfi_long(nhfp, &d_monst->mlstmv, parent, "mlstmv", 1);
+    sfi_long(nhfp, &d_monst->mstate, parent, "mstate", 1);
+    sfi_long(nhfp, &d_monst->migflags, parent, "migflags", 1);
     sfi_long(nhfp, &d_monst->mspare1, parent, "mspare1", 1);
     sfi_genericptr(nhfp, (genericptr_t) &d_monst->minvent, parent, "minvent", 1);
     sfi_genericptr(nhfp, (genericptr_t) &d_monst->mw, parent, "mw", 1);
@@ -5682,6 +5686,8 @@ const char *critical_members[] = {
 	"struct monst:mstrategy:unsigned long",
 	"struct monst:mtrapseen:long",
 	"struct monst:mlstmv:long",
+	"struct monst:mstate:long",
+	"struct monst:migflags:long",
 	"struct monst:mspare1:long",
 	"struct monst:minvent:struct obj *",
 	"struct monst:mw:struct obj *",
diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
index 30676b7e7..3fe09817a 100644
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -371,20 +371,18 @@ tileedit: tileedit.cpp $(TEXT_IO)
 
 #	dependencies for readtags
 #
-CTAGDEP = ../include/align.h    ../include/artifact.h ../src/artifact.c     \
-	 ../include/artilist.h ../include/attrib.h   ../src/bones.c        \
-	 ../include/context.h  ../include/coord.h    ../include/decl.h     \
-	 ../src/decl.c         ../include/dungeon.h  ../include/engrave.h  \
-	 ../src/engrave.c      ../include/flag.h     ../include/func_tab.h \
-	 ../include/global.h   ../include/hack.h     ../include/lev.h      \
-	 ../include/mextra.h   ../include/mkroom.h   ../include/monst.h    \
-	 ../include/monsym.h   ../include/obj.h      ../include/objclass.h \
-	 ../include/prop.h     ../include/quest.h    ../include/rect.h     \
-	 ../include/region.h   ../include/rm.h       ../include/skills.h   \
-	 ../include/spell.h    ../include/sys.h      ../include/timeout.h  \
-	 ../include/trap.h     ../include/you.h      ../include/onames.h   \
-	 ../include/wintype.h
-#	 ../include/permonst.h
+CTAGDEP = ../include/align.h  ../include/artifact.h ../include/artilist.h \
+	  ../include/attrib.h ../include/context.h  ../include/coord.h    \
+	  ../include/decl.h   ../include/dungeon.h  ../include/engrave.h  \
+	  ../include/flag.h   ../include/func_tab.h ../include/global.h   \
+	  ../include/hack.h   ../include/lev.h      ../include/mextra.h   \
+	  ../include/mkroom.h ../include/monst.h    ../include/monsym.h   \
+	  ../include/obj.h    ../include/objclass.h ../include/prop.h     \
+	  ../include/quest.h  ../include/rect.h     ../include/region.h   \
+	  ../include/rm.h     ../include/skills.h   ../include/spell.h    \
+	  ../include/sys.h    ../include/timeout.h  ../include/trap.h     \
+	  ../include/you.h    ../include/onames.h   ../include/wintype.h
+#	../include/permonst.h
 CTAGSOPT = --language-force=c --sort=no -D"Bitfield(x,n)=unsigned x : n" --excmd=pattern
 
 readtags: $(READTAGSOBJS)
@@ -399,17 +397,13 @@ nethack.tags: $(CTAGDEP)
 #
 	$(CTAGSCMD) $(CTAGSOPT) -f nethack.tags ../include/align.h
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/artifact.h
-	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../src/artifact.c
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/artilist.h
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/attrib.h
-	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../src/bones.c
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/context.h
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/coord.h
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/decl.h
-	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../src/decl.c
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/dungeon.h
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/engrave.h
-	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../src/engrave.c
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/flag.h
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/func_tab.h
 	$(CTAGSCMD) $(CTAGSOPT) -a -f nethack.tags ../include/global.h
diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 064398ce6..e5f479925 100644
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -244,13 +244,26 @@ O  = $(OBJ)^\
 
 U  = $(UTIL)^\
 
+!IFDEF TEST_CROSSCOMPILE
+CROSSCOMPILE_TARGET = -DCROSSCOMPILE_TARGET
+CROSSCOMPILE_HOST = -DCROSSCOMPILE_HOST
+CROSSCOMPILE = -DCROSSCOMPILE
+OPTIONS_AT_RUNTIME=Y
+HOST=_host
+!ELSE
+!UNDEF CROSSCOMPILE_TARGET
+!UNDEF CROSSCOMPILE_HOST
+!UNDEF CROSSCOMPILE
+!UNDEF HOST
+!ENDIF
+
 #
 # Utility Objects.
 #
 
 MAKESRC       = $(U)makedefs.c
 
-MAKEOBJS      = $(O)makedefs.o $(O)monst.o $(O)objects.o
+MAKEDEFSOBJS  = $(O)makedefs$(HOST).o $(O)monst$(HOST).o $(O)objects$(HOST).o
 
 RECOVOBJS      = $(O)recover.o
 
@@ -259,16 +272,18 @@ TILEFILES      = $(WSHR)\monsters.txt $(WSHR)\objects.txt $(WSHR)\other.txt
 #
 # These are not invoked during a normal game build in 3.4
 #
-TEXT_IO        = $(O)tiletext.o	$(O)tiletxt.o	$(O)drawing.o \
-		 $(O)decl.o	$(O)monst.o	$(O)objects.o
+!IFDEF CROSSCOMPILE_HOST
+TEXT_IO        = $(O)tiletext$(HOST).o	$(O)tiletxt$(HOST).o	$(O)drawing$(HOST).o \
+		 $(O)decl$(HOST).o	$(O)monst$(HOST).o	$(O)objects$(HOST).o
 
-TEXT_IO32      = $(O)tilete32.o $(O)tiletx32.o $(O)drawing.o \
-		 $(O)decl.o	$(O)monst.o	$(O)objects.o
+TEXT_IO32      = $(O)tilete32$(HOST).o $(O)tiletx32$(HOST).o $(O)drawing$(HOST).o \
+		 $(O)decl$(HOST).o $(O)monst$(HOST).o $(O)objects$(HOST).o
 
-GIFREADERS     = $(O)gifread.o	$(O)alloc.o $(O)panic.o
-GIFREADERS32   = $(O)gifrd32.o $(O)alloc.o $(O)panic.o
+GIFREADERS     = $(O)gifread$(HOST).o	$(O)alloc$(HOST).o $(O)panic$(HOST).o
+GIFREADERS32   = $(O)gifrd32$(HOST).o $(O)alloc$(HOST).o $(O)panic$(HOST).o
 
-PPMWRITERS     = $(O)ppmwrite.o $(O)alloc.o $(O)panic.o
+PPMWRITERS     = $(O)ppmwrite$(HOST).o $(O)alloc$(HOST).o $(O)panic$(HOST).o
+!ENDIF
 
 #
 #  Object files for the game itself.
@@ -307,31 +322,20 @@ VOBJ29 = $(O)sfstruct.o $(O)sfascii.o  $(O)sflendian.o
 LUAOBJ = $(O)nhlua.o    $(O)nhlsel.o
 LUA_QTEXT_FILE = "quest.lua"
 
+!IFDEF CROSSCOMPILE_HOST
+DLBOBJ_HOST = $(O)dlb$(HOST).o
+!ENDIF
 DLBOBJ = $(O)dlb.o
 
 REGEX  = $(O)cppregex.o
 
 TTYOBJ = $(O)topl.o     $(O)getline.o  $(O)wintty.o
 
-!IFDEF TEST_CROSSCOMPILE
-CROSSDEFINE_TARGET = -DCROSSCOMPILE_TARGET
-CROSSDEFINE_HOST = -DCROSSCOMPILE_HOST
-CROSSCOMPILE = -DCROSSCOMPILE
-CROSSDEFINES = $(CROSSCOMPILE) $(CROSSDEFINE_HOST) $(CROSSDEFINE_TARGET)
-OPTIONS_AT_RUNTIME=Y
-!ELSE
-CROSSDEFINE_TARGET =
-CROSSDEFINE_HOST =
-CROSSCOMPILE =
-CROSSDEFINES =
-CROSSDEFINES = 
-!ENDIF
+MDLIB = $(O)mdlib.o
 
 !IF "$(OPTIONS_AT_RUNTIME)" == "Y"
-MDLIB = $(O)mdlib.o
 RUNTIMEOPTDEF=-DOPTIONS_AT_RUNTIME
 !ELSE
-MDLIB =
 RUNTIMEOPTDEF=
 !ENDIF
 
@@ -619,8 +623,8 @@ CL_RECENT=-sdl
 !IF "$(ADD_CURSES)" == "Y"
 CURSESDEF=-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE" -DCHTYPE_32
 !ELSE
-CURSDEF=
-CURSESLIB=
+!UNDEF CURSDEF=
+!UNDEF CURSESLIB=
 !ENDIF
 
 ccommon= -c -nologo -D"_CONSOLE" -D"_CRT_NONSTDC_NO_DEPRECATE" -D"_CRT_SECURE_NO_DEPRECATE" \
@@ -726,20 +730,20 @@ DLB =
 #==========================================
 
 .c{$(OBJ)}.o:
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $<
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $<
 
 {$(SRC)}.c{$(OBJ)}.o:
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES)  -Fo$@  $<
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@  $<
 
 #==========================================
 # Rules for files in sys\share
 #==========================================
 
 {$(SSYS)}.c{$(OBJ)}.o:
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES)  -Fo$@  $<
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET)  -Fo$@  $<
 
 {$(SSYS)}.cpp{$(OBJ)}.o:
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) /EHsc -Fo$@  $<
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EHsc -Fo$@  $<
 
 #==========================================
 # Rules for files in sys\winnt
@@ -756,14 +760,14 @@ DLB =
 #==========================================
 
 {$(UTIL)}.c{$(OBJ)}.o:
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $<
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $<
 
 #==========================================
 # Rules for files in win\share
 #==========================================
 
 {$(WSHR)}.c{$(OBJ)}.o:
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $<
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $<
 
 {$(WSHR)}.h{$(INCL)}.h:
 	@copy $< $@
@@ -776,7 +780,7 @@ DLB =
 #==========================================
 
 {$(TTY)}.c{$(OBJ)}.o:
-	$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@  $<
+	$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@  $<
 
 
 #==========================================
@@ -784,14 +788,14 @@ DLB =
 #==========================================
 
 {$(MSWIN)}.c{$(OBJ)}.o:
-	$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@  $<
+	$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@  $<
 
 #==========================================
 # Rules for files in win\curses
 #==========================================
 
 {$(WCURSES)}.c{$(OBJ)}.o:
-	@$(cc) -DPDC_NCMOUSE $(PDCINCL) $(cflagsBuild) $(CROSSDEFINES)  -Fo$@ $<
+	@$(cc) -DPDC_NCMOUSE $(PDCINCL) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET)  -Fo$@ $<
 
 #{$(WCURSES)}.txt{$(DAT)}.txt:
 #	@copy $< $@
@@ -801,20 +805,20 @@ DLB =
 #==========================================
 
 {$(PDCURSES_TOP)}.c{$(OBJ)}.o:
-	@$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $<
+	@$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $<
 
 {$(PDCSRC)}.c{$(OBJ)}.o:
-	@$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $<
+	@$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $<
 
 {$(PDCWINCON)}.c{$(OBJ)}.o:
-	@$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $<
+	@$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $<
 
 #==========================================
 # Rules for LUA files
 #==========================================
 
 {$(LUASRC)}.c{$(OBJ)}.o:
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $<
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $<
 
 #==========================================
 #=============== TARGETS ==================
@@ -1053,20 +1057,20 @@ $(U)nhsizes.exe: $(O)nhsizes.o
 	@echo Linking $(@:\=/)
 	$(link) $(lflagsBuild) -out:$@ $(O)nhsizes.o $(O)panic.o $(O)alloc.o
 
-$(O)nhsizes.o: $(CONFIG_H) nhsizes.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ nhsizes.c
+$(O)nhsizes$(HOST).o: $(CONFIG_H) nhsizes.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ nhsizes.c
 
-$(U)makedefs.exe:	$(MAKEOBJS)
+$(U)makedefs.exe:	$(MAKEDEFSOBJS)
 	@echo Linking $(@:\=/)
-	@$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(MAKEOBJS)
+	@$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(MAKEDEFSOBJS)
 
-$(O)makedefs.o: $(CONFIG_H)	$(INCL)\monattk.h $(INCL)\monflag.h   $(INCL)\objclass.h \
+$(O)makedefs$(HOST).o: $(CONFIG_H)	$(INCL)\monattk.h $(INCL)\monflag.h   $(INCL)\objclass.h \
 		 $(INCL)\monsym.h    $(INCL)\qtext.h	$(INCL)\patchlevel.h \
 		 $(U)makedefs.c
 	@if not exist $(OBJ)\*.* echo creating directory $(OBJ:\=/)
 	@if not exist $(OBJ)\*.* mkdir $(OBJ)
-	$(cc) -DENUM_PM $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $(U)makedefs.c
-#	$(cc) -DENUM_PM $(cflagsBuild) $(CROSSDEFINES) /EP -Fo$@ $(U)makedefs.c >makedefs.c.preprocessed
+	$(cc) -DENUM_PM $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $(U)makedefs.c
+#	$(cc) -DENUM_PM $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /EP -Fo$@ $(U)makedefs.c >makedefs.c.preprocessed
 
 #
 #  date.h should be remade every time any of the source or include
@@ -1092,12 +1096,12 @@ $(SRC)\vis_tab.c: $(U)makedefs.exe
 # uudecode utility and uuencoded targets
 #==========================================
 
-$(U)uudecode.exe: $(O)uudecode.o
+$(U)uudecode.exe: $(O)uudecode$(HOST).o
 	@echo Linking $(@:\=/)
 	@$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(O)uudecode.o
 
-$(O)uudecode.o: $(SSYS)\uudecode.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) /D_CRT_SECURE_NO_DEPRECATE -Fo$@ $(SSYS)\uudecode.c
+$(O)uudecode$(HOST).o: $(SSYS)\uudecode.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /D_CRT_SECURE_NO_DEPRECATE -Fo$@ $(SSYS)\uudecode.c
 
 $(MSWSYS)\NetHack.ico : $(U)uudecode.exe $(MSWSYS)\nhico.uu 
 	chdir $(MSWSYS)
@@ -1185,20 +1189,30 @@ $(O)envchk.tag: $(O)obj.tag
 # DLB utility and nhdatNNN file creation
 #==========================================
 
-$(U)dlb_main.exe: $(DLBOBJ) $(O)dlb.o
+$(U)dlb_main.exe: $(DLBOBJ_HOST) $(O)dlb$(HOST).o
 	@echo Linking $(@:\=/)
 	@$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
-		$(O)dlb_main.o
-		$(O)dlb.o
-		$(O)alloc.o
-		$(O)panic.o
+		$(O)dlb_main$(HOST).o
+		$(O)dlb$(HOST).o
+		$(O)alloc$(HOST).o
+		$(O)panic$(HOST).o
 <<
 
-$(O)dlb.o:	$(O)dlb_main.o $(O)alloc.o $(O)panic.o $(INCL)\dlb.h
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) /Fo$@ $(SRC)\dlb.c
+!IFDEF CROSSCOMPILE_HOST
+$(O)dlb$(HOST).o: $(O)dlb_main$(HOST).o $(O)alloc$(HOST).o $(O)panic$(HOST).o $(INCL)\dlb.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /Fo$@ $(SRC)\dlb.c
+!ENDIF
+
+$(O)dlb.o: $(O)dlb_main.o $(O)alloc.o $(O)panic.o $(INCL)\dlb.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /Fo$@ $(SRC)\dlb.c
 	
+!IFDEF CROSSCOMPILE_HOST
+$(O)dlb_main$(HOST).o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /Fo$@ $(UTIL)\dlb_main.c
+!ENDIF
+
 $(O)dlb_main.o: $(UTIL)\dlb_main.c $(INCL)\config.h $(INCL)\dlb.h
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) /Fo$@ $(UTIL)\dlb_main.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /Fo$@ $(UTIL)\dlb_main.c
 
 $(DAT)\porthelp: $(MSWSYS)\porthelp
 	@copy $(MSWSYS)\porthelp $@ >nul
@@ -1248,7 +1262,7 @@ $(U)recover.exe: $(RECOVOBJS)
 	$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(RECOVOBJS)
 
 $(O)recover.o: $(CONFIG_H) $(U)recover.c $(MSWSYS)\win32api.h
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $(U)recover.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $(U)recover.c
 
 #==========================================
 #  Tile Mapping
@@ -1258,33 +1272,33 @@ $(SRC)\tile.c: $(U)tilemap.exe
 	@echo A new $(@:\=/) has been created
 	@$(U)tilemap
 
-$(U)tilemap.exe: $(O)tilemap.o
+$(U)tilemap.exe: $(O)tilemap$(HOST).o
 	@echo Linking $(@:\=/)
 	@$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ $(O)tilemap.o
 
-$(O)tilemap.o: $(WSHR)\tilemap.c $(HACK_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $(WSHR)\tilemap.c
+$(O)tilemap$(HOST).o: $(WSHR)\tilemap.c $(HACK_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $(WSHR)\tilemap.c
 
-$(O)tiletx32.o: $(WSHR)\tilemap.c $(HACK_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) /DTILETEXT /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tilemap.c
+$(O)tiletx32$(HOST).o: $(WSHR)\tilemap.c $(HACK_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /DTILETEXT /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tilemap.c
 
-$(O)tiletxt.o: $(WSHR)\tilemap.c $(HACK_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) /DTILETEXT -Fo$@ $(WSHR)\tilemap.c
+$(O)tiletxt$(HOST).o: $(WSHR)\tilemap.c $(HACK_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) /DTILETEXT -Fo$@ $(WSHR)\tilemap.c
 
-$(O)gifread.o: $(WSHR)\gifread.c  $(CONFIG_H) $(TILE_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) -Fo$@ $(WSHR)\gifread.c
+$(O)gifread$(HOST).o: $(WSHR)\gifread.c  $(CONFIG_H) $(TILE_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -I$(WSHR) -Fo$@ $(WSHR)\gifread.c
 
-$(O)gifrd32.o: $(WSHR)\gifread.c  $(CONFIG_H) $(TILE_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\gifread.c
+$(O)gifrd32$(HOST).o: $(WSHR)\gifread.c  $(CONFIG_H) $(TILE_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\gifread.c
 
-$(O)ppmwrite.o: $(WSHR)\ppmwrite.c $(CONFIG_H) $(TILE_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) -Fo$@ $(WSHR)\ppmwrite.c
+$(O)ppmwrite$(HOST).o: $(WSHR)\ppmwrite.c $(CONFIG_H) $(TILE_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -I$(WSHR) -Fo$@ $(WSHR)\ppmwrite.c
 
-$(O)tiletext.o: $(WSHR)\tiletext.c  $(CONFIG_H) $(TILE_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) -Fo$@ $(WSHR)\tiletext.c
+$(O)tiletext$(HOST).o: $(WSHR)\tiletext.c  $(CONFIG_H) $(TILE_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -I$(WSHR) -Fo$@ $(WSHR)\tiletext.c
 
-$(O)tilete32.o: $(WSHR)\tiletext.c  $(CONFIG_H) $(TILE_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tiletext.c
+$(O)tilete32$(HOST).o: $(WSHR)\tiletext.c  $(CONFIG_H) $(TILE_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -I$(WSHR) /DTILE_X=32 /DTILE_Y=32 -Fo$@ $(WSHR)\tiletext.c
 
 #==========================================
 # Optional Tile Utilities
@@ -1320,32 +1334,33 @@ $(U)txt2ppm.exe: $(PPMWRITERS) $(TEXT_IO)
 $(TILEBMP16): $(TILEUTIL16) $(TILEFILES)
 	@echo Creating 16x16 binary tile files (this may take some time)
 	@$(U)tile2bmp $(TILEBMP16)
+
 #$(TILEBMP32): $(TILEUTIL32) $(TILEFILES32)
 #	@echo Creating 32x32 binary tile files (this may take some time)
 #	@$(U)til2bm32 $(TILEBMP32)
 
 
-$(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXT_IO)
+$(U)tile2bmp.exe: $(O)tile2bmp$(HOST).o $(TEXT_IO)
     	@echo Linking $(@:\=/)
 	@$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
-		$(O)tile2bmp.o
+		$(O)tile2bmp$(HOST).o
 		$(TEXT_IO:^  =^
 		)
 <<
 
-$(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32)
+$(U)til2bm32.exe: $(O)til2bm32$(HOST).o $(TEXT_IO32)
     	@echo Linking $(@:\=/)
 	@$(link) $(lflagsBuild) /PDB:"$(O)$(@B).PDB" /MAP:"$(O)$(@B).MAP" -out:$@ @<<$(@B).lnk
-		$(O)til2bm32.o
+		$(O)til2bm32$(HOST).o
 		$(TEXT_IO32:^  =^
 		)
 <<
 
-$(O)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)\win32api.h
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)\tile2bmp.c
+$(O)tile2bmp$(HOST).o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)\win32api.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)\tile2bmp.c
 
-$(O)til2bm32.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)\win32api.h
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)\tile2bmp.c
+$(O)til2bm32$(HOST).o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(MSWSYS)\win32api.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)\tile2bmp.c
 
 #===============================================================================
 # PDCurses
@@ -1355,7 +1370,7 @@ $(O)pdcurses.lib : $(PDCLIBOBJS) $(PDCOBJS)
 	lib -nologo /out:$@ $(PDCLIBOBJS) $(PDCOBJS)
 
 $(O)pdcscrn.o : $(PDCURSES_HEADERS) $(PDCWINCON)\pdcscrn.c $(MSWSYS)\stub-pdcscrn.c
-	$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $(MSWSYS)\stub-pdcscrn.c
+	$(cc) $(PDCINCL) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(MSWSYS)\stub-pdcscrn.c
 
 #===============================================================================
 # LUA
@@ -1376,7 +1391,7 @@ $(O)lua$(LUAVER)-static.lib: $(LUAOBJFILES)
 $(O)lua.o: $(LUASRC)\lua.c
 $(O)luac.o: $(LUASRC)\luac.c
 $(O)lapi.o: $(LUASRC)\lapi.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -wd4244 -Fo$@ $(LUASRC)\lapi.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -wd4244 -Fo$@ $(LUASRC)\lapi.c
 
 #===============================================================================
 # CROSSCOMPILE
@@ -1392,9 +1407,14 @@ $(O)lapi.o: $(LUASRC)\lapi.c
 # data file.
 #
 
+!IFDEF CROSSCOMPILE_HOST
+$(O)mdlib$(HOST).o: $(SRC)\mdlib.c
+	$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSDEFINE_HOST) -Fo$@ $(SRC)\mdlib.c
+!ENDIF
+
 $(O)mdlib.o: $(SRC)\mdlib.c
-	$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSDEFINE_TARGET) -DMAKEDEFS_MDOBJ -Fo$@ $(SRC)\mdlib.c
-#	$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSDEFINE_TARGET) -DMAKEDEFS_MDOBJ /EP -Fo$@ $(SRC)\mdlib.c >mdlib.c.preprocessed
+	$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(SRC)\mdlib.c
+#	$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) /EP -Fo$@ $(SRC)\mdlib.c >mdlib.c.preprocessed
 
 #===============================================================================
 # Housekeeping
@@ -1541,32 +1561,32 @@ $(DAT)\dungeon: $(O)utility.tag  $(DAT)\dungeon.def
 #
 
 $(O)nttty.o:   $(HACK_H) $(TILE_H) $(MSWSYS)\win32api.h $(MSWSYS)\nttty.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(WSHR) -Fo$@  $(MSWSYS)\nttty.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -I$(WSHR) -Fo$@  $(MSWSYS)\nttty.c
 $(O)winnt.o: $(HACK_H) $(MSWSYS)\win32api.h $(MSWSYS)\winnt.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(MSWSYS) -I$(MSWIN) -Fo$@ $(MSWSYS)\win10.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@  $(MSWSYS)\winnt.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -I$(MSWSYS) -I$(MSWIN) -Fo$@ $(MSWSYS)\win10.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@  $(MSWSYS)\winnt.c
 $(O)ntsound.o: $(HACK_H) $(MSWSYS)\ntsound.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $(MSWSYS)\ntsound.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(MSWSYS)\ntsound.c
 $(O)windmain.o: $(MSWSYS)\windmain.c $(HACK_H)
 
 #if you aren't linking in the full gui then
 #include the following stub for proper linkage.
 
 $(O)guistub.o: $(HACK_H) $(MSWSYS)\stubs.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -DGUISTUB -Fo$@ $(MSWSYS)\stubs.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -DGUISTUB -Fo$@ $(MSWSYS)\stubs.c
 
 #
 # WIN32 dependencies
 #
 
 $(O)NetHackW.o: $(HACK_H) $(MSWIN)\NetHackW.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -I$(MSWSYS) -I$(MSWIN) -Fo$@ $(MSWIN)\NetHackW.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -I$(MSWSYS) -I$(MSWIN) -Fo$@ $(MSWIN)\NetHackW.c
 
 #if you aren't linking in the full tty then
 #include the following stub for proper linkage.
 
 $(O)ttystub.o: $(HACK_H) $(MSWSYS)\stubs.c
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -DTTYSTUB -Fo$@ $(MSWSYS)\stubs.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -DTTYSTUB -Fo$@ $(MSWSYS)\stubs.c
 
 #
 #============================================
@@ -1595,28 +1615,26 @@ $(SRC)\sfdata.c: $(U)readtags.exe $(U)nethack.tags
 $(INCL)\sfproto.h: $(U)readtags.exe $(U)nethack.tags
         $(U)readtags.exe
 
-$(U)readtags.exe: $(O)readtags.o
+$(U)readtags.exe: $(O)readtags$(HOST).o
 	@$(link) $(lflagsBuild) -out:$@ $(O)readtags.o
 
-$(O)readtags.o: $(U)readtags.c $(U)nethack.tags $(CONFIG_H) $(PATCHLEVEL_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) $(TEMPL)  -Fo$@ $(U)readtags.c
+$(O)readtags$(HOST).o: $(U)readtags.c $(U)nethack.tags $(CONFIG_H) $(PATCHLEVEL_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) $(TEMPL)  -Fo$@ $(U)readtags.c
 
 #
 #tested only with exuberant ctags from http://ctags.sourceforge.net
 #
-CTAGDEP = $(TINC)/align.h    $(TINC)/artifact.h $(TSRC)/artifact.c \
-	  $(TINC)/artilist.h $(TINC)/attrib.h   $(TSRC)/bones.c    \
-	  $(TINC)/context.h  $(TINC)/coord.h    $(TINC)/decl.h     \
-	  $(TSRC)/decl.c     $(TINC)/dungeon.h  $(TINC)/engrave.h  \
-	  $(TSRC)/engrave.c  $(TINC)/flag.h     $(TINC)/func_tab.h \
-	  $(TINC)/global.h   $(TINC)/hack.h     $(TINC)/lev.h      \
-	  $(TINC)/mextra.h   $(TINC)/mkroom.h   $(TINC)/monst.h    \
-	  $(TINC)/monsym.h   $(TINC)/obj.h      $(TINC)/objclass.h \
-	  $(TINC)/permonst.h $(TINC)/prop.h     $(TINC)/quest.h    \
-	  $(TINC)/rect.h     $(TINC)/region.h   $(TINC)/rm.h       \
-	  $(TINC)/skills.h   $(TINC)/spell.h    $(TINC)/sys.h      \
-	  $(TINC)/timeout.h  $(TINC)/trap.h     $(TINC)/you.h      \
-	  $(TINC)/onames.h   $(TINC)/wintype.h 
+CTAGDEP = ..\include\align.h  ..\include\artifact.h ..\include\artilist.h \
+	  ..\include\attrib.h ..\include\context.h  ..\include\coord.h    \
+	  ..\include\decl.h   ..\include\dungeon.h  ..\include\engrave.h  \
+	  ..\include\flag.h   ..\include\func_tab.h ..\include\global.h   \
+	  ..\include\hack.h   ..\include\lev.h      ..\include\mextra.h   \
+	  ..\include\mkroom.h ..\include\monst.h    ..\include\monsym.h   \
+	  ..\include\obj.h    ..\include\objclass.h ..\include\prop.h     \
+	  ..\include\quest.h  ..\include\rect.h     ..\include\region.h   \
+	  ..\include\rm.h     ..\include\skills.h   ..\include\spell.h    \
+	  ..\include\sys.h    ..\include\timeout.h  ..\include\trap.h     \
+	  ..\include\you.h    ..\include\onames.h   ..\include\wintype.h
 
 $(U)nethack.tags: $(CTAGDEP)
 	$(CTAGSCMD) $(CTAGSOPT) -f $(U)nethack.tags $(TINC)/align.h
@@ -1660,17 +1678,74 @@ $(U)nethack.tags: $(CTAGDEP)
 
 # 
 # util dependencies
+# These have dual-roles and need to be build for host and targt platforms.
 #
 
+!IFDEF CROSSCOMPILE_HOST
+$(O)panic$(HOST).o:  $(U)panic.c $(CONFIG_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ $(U)panic.c
+!ENDIF
+
 $(O)panic.o:  $(U)panic.c $(CONFIG_H)
-	@$(cc) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ $(U)panic.c
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ $(U)panic.c
+
+
+!IFDEF CROSSCOMPILE_HOST
+$(O)drawing$(HOST).o: drawing.c $(HACK_H) $(INCL)\tcap.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ drawing.c
+!ENDIF
+
+$(O)drawing.o: drawing.c $(HACK_H) $(INCL)\tcap.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ drawing.c
+
+!IFDEF CROSSCOMPILE_HOST
+$(O)decl$(HOST).o: decl.c $(HACK_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ decl.c
+!ENDIF
+
+$(O)decl.o: decl.c $(HACK_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ decl.c
+
+!IFDEF CROSSCOMPILE_HOST
+$(O)monst$(HOST).o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \
+		$(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \
+		$(INCL)\color.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ monst.c
+!ENDIF
+
+$(O)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \
+		$(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \
+		$(INCL)\color.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ monst.c
+
+!IFDEF CROSSCOMPILE_HOST
+$(O)objects$(HOST).o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \
+		$(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_HOST) -Fo$@ objects.c
+!ENDIF
+
+$(O)objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \
+		$(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ objects.c
+
+!IFDEF CROSSCOMPILE_HOST
+$(O)alloc$(HOST).o: alloc.c $(CONFIG_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ alloc.c
+!ENDIF
+
+$(O)alloc.o: alloc.c $(CONFIG_H)
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ alloc.c
+
+$(O)version.o: version.c $(HACK_H) $(INCL)\dlb.h $(INCL)\date.h \
+		$(INCL)\patchlevel.h
+	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ version.c
 
 # 
 # sys/share dependencies
 #
 
 (O)cppregex.o:	$(O)cppregex.cpp $(HACK_H)
-	@$(CC) $(cflagsBuild) $(CROSSDEFINES) -Fo$@ ..\sys\share\cppregex.cpp
+	@$(CC) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSCOMPILE_TARGET) -Fo$@ ..\sys\share\cppregex.cpp
 
 # 
 # curses window port dependencies
@@ -1820,7 +1895,6 @@ $(O)wc_trace.o: ..\win\chain\wc_trace.c $(HACK_H) $(INCL)\func_tab.h
 #	@$(cc) $(cflagsBuild) -Fo$@ ..\win\chain\wc_trace.c
 $(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)
 $(O)apply.o: apply.c $(HACK_H)
 $(O)artifact.o: artifact.c $(HACK_H) $(INCL)\artifact.h $(INCL)\artilist.h
 $(O)attrib.o: attrib.c $(HACK_H)
@@ -1829,7 +1903,6 @@ $(O)bones.o: bones.c $(HACK_H) $(INCL)\lev.h
 $(O)botl.o: botl.c $(HACK_H)
 $(O)cmd.o: cmd.c $(HACK_H) $(INCL)\func_tab.h
 $(O)dbridge.o: dbridge.c $(HACK_H)
-$(O)decl.o: decl.c $(HACK_H)
 $(O)detect.o: detect.c $(HACK_H) $(INCL)\artifact.h
 $(O)dig.o: dig.c $(HACK_H)
 $(O)display.o: display.c $(HACK_H)
@@ -1841,7 +1914,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 $(HACK_H) $(INCL)\tcap.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)\lev.h $(INCL)\dlb.h
@@ -1871,9 +1943,6 @@ $(O)mkroom.o: mkroom.c $(HACK_H)
 $(O)mon.o: mon.c $(HACK_H) $(INCL)\mfndpos.h
 $(O)mondata.o: mondata.c $(HACK_H)
 $(O)monmove.o: monmove.c $(HACK_H) $(INCL)\mfndpos.h $(INCL)\artifact.h
-$(O)monst.o: monst.c $(CONFIG_H) $(INCL)\permonst.h $(INCL)\align.h \
-		$(INCL)\monattk.h $(INCL)\monflag.h $(INCL)\monsym.h \
-		$(INCL)\color.h
 $(O)mplayer.o: mplayer.c $(HACK_H)
 $(O)mthrowu.o: mthrowu.c $(HACK_H)
 $(O)muse.o: muse.c $(HACK_H)
@@ -1881,8 +1950,6 @@ $(O)music.o: music.c $(HACK_H) #interp.c
 $(O)nhlua.o: nhlua.c $(HACK_H)
 $(O)nhlsel.o: nhlsel.c $(HACK_H)
 $(O)o_init.o: o_init.c $(HACK_H) $(INCL)\lev.h
-$(O)objects.o: objects.c $(CONFIG_H) $(INCL)\obj.h $(INCL)\objclass.h \
-		$(INCL)\prop.h $(INCL)\skills.h $(INCL)\color.h
 $(O)objnam.o: objnam.c $(HACK_H)
 $(O)options.o: options.c $(CONFIG_H) $(INCL)\objclass.h $(INCL)\flag.h \
 		$(HACK_H) $(INCL)\tcap.h
@@ -1921,9 +1988,6 @@ $(O)trap.o: trap.c $(HACK_H)
 $(O)u_init.o: u_init.c $(HACK_H)
 $(O)uhitm.o: uhitm.c $(HACK_H)
 $(O)vault.o: vault.c $(HACK_H)
-$(O)version.o: version.c $(HACK_H) $(INCL)\dlb.h $(INCL)\date.h \
-		$(INCL)\patchlevel.h
-	@$(cc) $(cflagsBuild) $(CROSSCOMPILE) $(CROSSDEFINE_TARGET) -Fo$@ version.c
 $(O)vision.o: vision.c $(HACK_H) $(INCL)\vis_tab.h
 $(O)weapon.o: weapon.c $(HACK_H)
 $(O)were.o: were.c $(HACK_H)