diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index 5163ece193f0..7c92625b4cab 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -158,6 +158,10 @@ LIBS	= \
 	$(EXTRA_DSO_LIBS) \
 	$(NULL)
 
+ifdef MOZ_ENABLE_XREMOTE
+LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX)
+LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/xremoteclient
+endif
 
 ifndef BUILD_STATIC_LIBS
 
@@ -352,11 +356,6 @@ ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 GARBAGE         += $(STACKWALK_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
 endif
 
-ifdef MOZ_ENABLE_XREMOTE
-LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX)
-LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/xremoteclient
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))