diff --git a/xtrn/tbd/GNUmakefile b/xtrn/tbd/GNUmakefile
index 89b8a4015d43e1c0aafbc57b65b7c788c10d3a87..a606d9dfa9993c632c114d582637b1921b0815e6 100644
--- a/xtrn/tbd/GNUmakefile
+++ b/xtrn/tbd/GNUmakefile
@@ -30,13 +30,13 @@ $(TBD): $(OBJS)
    endif
 	$(QUIET)$(CC) $(MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(LDFLAGS) $^ -o $@ $(XPDEV-MT_LIBS)
 
-$(MAPMAKER): mapmaker.o
+$(MAPMAKER): $(MAPMAKER_OBJS)
    ifndef bcc
 	@echo Linking $@
    endif
 	$(QUIET)$(CC) $(MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(LDFLAGS) $^ -o $@ $(XPDEV-MT_LIBS)
 
-$(REROLL): reroll.o
+$(REROLL): $(REROLL_OBJS)
    ifndef bcc
 	@echo Linking $@
    endif
diff --git a/xtrn/tbd/Makefile b/xtrn/tbd/Makefile
index 948bfad7763169d2c4bc40caaf154d294c3b72eb..ba3a7a857fa12b60b7b6e02f2db9732eedfe262f 100644
--- a/xtrn/tbd/Makefile
+++ b/xtrn/tbd/Makefile
@@ -24,7 +24,7 @@ $(TBD): $(OBJS)
 	@copy /y $(TBD) .
 
 # Main EXE Link Rule
-$(REROLL): reroll.obj
+$(REROLL): $(REROLL_OBJS)
     	@echo Linking $@
 	@$(CC) $(CFLAGS) $(XPDEV-MT_LDFLAGS) -e$@ $** $(XPDEV-MT_LIBS)
 	@copy /y $(REROLL) .
diff --git a/xtrn/tbd/objects.mk b/xtrn/tbd/objects.mk
index 1a46294419cb5e7f780d763e23de2ad5d790649d..599e597e65c78904bf6bd52bcc3b0d64472c06e6 100644
--- a/xtrn/tbd/objects.mk
+++ b/xtrn/tbd/objects.mk
@@ -2,3 +2,7 @@ OBJS       = $(MTOBJODIR)$(DIRSEP)tbd$(OFILE) \
 			$(MTOBJODIR)$(DIRSEP)tbd2$(OFILE) \
 			$(MTOBJODIR)$(DIRSEP)xsdk$(OFILE) \
 			$(MTOBJODIR)$(DIRSEP)xsdkvars$(OFILE)
+
+MAPMAKER_OBJS = $(MTOBJODIR)$(DIRSEP)mapmaker$(OFILE)
+
+REROLL_OBJS	= $(MTOBJODIR)$(DIRSEP)reroll$(OFILE)