diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index df0e592b0dc..cffa493892d 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -84,6 +84,28 @@ ifdef GC_LEAK_DETECTOR
 LIBS += -lboehm
 endif
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
+CPPSRCS += nsNativeAppSupportPh.cpp
+LIBS += -lphexlib
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CPPSRCS += nsNativeAppSupportOS2.cpp
+CPPSRCS += nsNativeAppSupportBase.cpp
+OS2_PROGRAM_RESOURCE = $(srcdir)/splashos2.rc
+endif
+
+#ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+#CPPSRCS += nsNativeAppSupportGtk.cpp
+#LIBS += $(MOZ_GTK_LDFLAGS) -lgdk -lglib -lX11 
+#endif
+
+include $(topsrcdir)/config/rules.mk
+
 # This code removes the console from release builds
 # (unless you've set MOZ_WINCONSOLE=1).
 ifndef MOZ_WINCONSOLE
@@ -108,28 +130,6 @@ BIN_FLAGS	:= -Zlinker /PM:PM -Zlinker /Stack:0x30000
 endif
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
-CPPSRCS += nsNativeAppSupportPh.cpp
-LIBS += -lphexlib
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CPPSRCS += nsNativeAppSupportOS2.cpp
-CPPSRCS += nsNativeAppSupportBase.cpp
-OS2_PROGRAM_RESOURCE = $(srcdir)/splashos2.rc
-endif
-
-#ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
-#CPPSRCS += nsNativeAppSupportGtk.cpp
-#LIBS += $(MOZ_GTK_LDFLAGS) -lgdk -lglib -lX11 
-#endif
-
-include $(topsrcdir)/config/rules.mk
-
 XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
 
 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)