diff --git a/mozilla/embedding/tests/Makefile.in b/mozilla/embedding/tests/Makefile.in
index 664a2084222..ef298d8ed65 100644
--- a/mozilla/embedding/tests/Makefile.in
+++ b/mozilla/embedding/tests/Makefile.in
@@ -51,10 +51,12 @@ endif
 ifndef BUILD_STATIC_LIBS
 ifndef GNU_CC
 ifndef NO_MFC
+ifndef MOZ_NO_XPCOM_OBSOLETE
 DIRS += mfcembed/components mfcembed
 endif
 endif
 endif
+endif
 
 endif
 
diff --git a/mozilla/gfx/src/thebes/Makefile.in b/mozilla/gfx/src/thebes/Makefile.in
index b763b003085..0a95ddb7da1 100644
--- a/mozilla/gfx/src/thebes/Makefile.in
+++ b/mozilla/gfx/src/thebes/Makefile.in
@@ -89,7 +89,6 @@ CPPSRCS		= \
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 EXTRA_DSO_LIBS	= gkgfx thebes
@@ -138,13 +137,13 @@ LOCAL_INCLUDES	= \
 
 EXTRA_DSO_LDOPTS += \
 		$(EXTRA_DSO_LIBS) \
+		../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
 
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS  += $(TK_CFLAGS)
diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in
index 890f8b8a574..7be0eadb0e2 100644
--- a/mozilla/toolkit/library/Makefile.in
+++ b/mozilla/toolkit/library/Makefile.in
@@ -157,7 +157,7 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32)
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32)
 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
 endif
diff --git a/mozilla/toolkit/library/libxul-config.mk b/mozilla/toolkit/library/libxul-config.mk
index 166934b77fa..5a2684879fc 100644
--- a/mozilla/toolkit/library/libxul-config.mk
+++ b/mozilla/toolkit/library/libxul-config.mk
@@ -198,7 +198,9 @@ endif
 endif
 
 ifdef MOZ_ENABLE_CAIRO_GFX
+STATIC_LIBS += thebes
 COMPONENT_LIBS += gkgfxthebes
+
 else # Platform-specific GFX layer
   ifeq (windows,$(MOZ_GFX_TOOLKIT))
   COMPONENT_LIBS += gkgfxwin