diff --git a/mozilla/xpcom/libxpt/tools/Makefile.in b/mozilla/xpcom/libxpt/tools/Makefile.in
index 760b4e90ef0..17834ada05b 100644
--- a/mozilla/xpcom/libxpt/tools/Makefile.in
+++ b/mozilla/xpcom/libxpt/tools/Makefile.in
@@ -32,5 +32,9 @@ LIBS		= 		\
 		  -lxpt 	\
 		  $(NULL)
 
+# build these xpt tools early so that it'll be
+# available along with xpidl, which also must be built early.
+export:: libs
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpcom/libxpt/tools/makefile.win b/mozilla/xpcom/libxpt/tools/makefile.win
index 3f85615ddb1..b5bf4073c88 100644
--- a/mozilla/xpcom/libxpt/tools/makefile.win
+++ b/mozilla/xpcom/libxpt/tools/makefile.win
@@ -26,22 +26,22 @@ PROGRAMS = $(PROG1) $(PROG2)
 
 LCFLAGS=-DUSE_NSREG
 
-DEFINES=-DWIN32_LEAN_AND_MEAN -DDEBUG
+DEFINES=-DWIN32_LEAN_AND_MEAN
 
-REQUIRES=xpcom libxpt
+REQUIRES=libxpt
 
-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\libxpt
+LINCS=-I$(PUBLIC)\libxpt
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
  $(DIST)\lib\libxpt32.lib		\
  $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(PROGRAMS)
+# build these xpt tools early so that it'll be
+# available along with xpidl, which also must be built early.
+export:: $(PROGRAMS)
 	-for %p in ($(PROGRAMS)) do $(MAKE_INSTALL) %p $(DIST)\bin
-	-for %p in ($(TESTCASES)) do $(MAKE_INSTALL) %p $(DIST)\bin
 
 # Move this into config/obj.inc when it's allowed
 .c{.\$(OBJDIR)\}.exe:
@@ -59,12 +59,10 @@ install:: $(PROGRAMS)
         $(CURDIR)$(*B).c
 <<KEEP
 
-
-
-clean :: clobber
-
 clobber::
-	-for %p in ($(PROGRAMS)) do $(RM) %p $(DIST)\bin\%p
+	-for %p in ($(PROGRAMS)) do $(RM) %p
+	-$(RM) $(DIST)\bin\xpt_dump.exe
+	-$(RM) $(DIST)\bin\xpt_link.exe
 
 $(PROG1): $(OBJDIR) xpt_dump.c
 
diff --git a/mozilla/xpcom/typelib/xpt/tools/Makefile.in b/mozilla/xpcom/typelib/xpt/tools/Makefile.in
index 760b4e90ef0..17834ada05b 100644
--- a/mozilla/xpcom/typelib/xpt/tools/Makefile.in
+++ b/mozilla/xpcom/typelib/xpt/tools/Makefile.in
@@ -32,5 +32,9 @@ LIBS		= 		\
 		  -lxpt 	\
 		  $(NULL)
 
+# build these xpt tools early so that it'll be
+# available along with xpidl, which also must be built early.
+export:: libs
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/xpcom/typelib/xpt/tools/makefile.win b/mozilla/xpcom/typelib/xpt/tools/makefile.win
index 3f85615ddb1..b5bf4073c88 100644
--- a/mozilla/xpcom/typelib/xpt/tools/makefile.win
+++ b/mozilla/xpcom/typelib/xpt/tools/makefile.win
@@ -26,22 +26,22 @@ PROGRAMS = $(PROG1) $(PROG2)
 
 LCFLAGS=-DUSE_NSREG
 
-DEFINES=-DWIN32_LEAN_AND_MEAN -DDEBUG
+DEFINES=-DWIN32_LEAN_AND_MEAN
 
-REQUIRES=xpcom libxpt
+REQUIRES=libxpt
 
-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\libxpt
+LINCS=-I$(PUBLIC)\libxpt
 
 LLIBS=					\
- $(DIST)\lib\xpcom32.lib		\
  $(DIST)\lib\libxpt32.lib		\
  $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(PROGRAMS)
+# build these xpt tools early so that it'll be
+# available along with xpidl, which also must be built early.
+export:: $(PROGRAMS)
 	-for %p in ($(PROGRAMS)) do $(MAKE_INSTALL) %p $(DIST)\bin
-	-for %p in ($(TESTCASES)) do $(MAKE_INSTALL) %p $(DIST)\bin
 
 # Move this into config/obj.inc when it's allowed
 .c{.\$(OBJDIR)\}.exe:
@@ -59,12 +59,10 @@ install:: $(PROGRAMS)
         $(CURDIR)$(*B).c
 <<KEEP
 
-
-
-clean :: clobber
-
 clobber::
-	-for %p in ($(PROGRAMS)) do $(RM) %p $(DIST)\bin\%p
+	-for %p in ($(PROGRAMS)) do $(RM) %p
+	-$(RM) $(DIST)\bin\xpt_dump.exe
+	-$(RM) $(DIST)\bin\xpt_link.exe
 
 $(PROG1): $(OBJDIR) xpt_dump.c