diff --git a/mozilla/gfx/src/xprint/Makefile.in b/mozilla/gfx/src/xprint/Makefile.in
index f9960a3bd59..df0a7de1f3c 100644
--- a/mozilla/gfx/src/xprint/Makefile.in
+++ b/mozilla/gfx/src/xprint/Makefile.in
@@ -23,7 +23,7 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@:@srcdir@/../xlib
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -52,18 +52,22 @@ CSRCS		= \
 		xprintutil_printtofile.c \
 		$(NULL)
 
-# nsDrawingSurfaceXlib only required for staticbuild 
-CPPSRCS		= \
-		nsDeviceContextXP.cpp \
+XLIB_LCPPSRCS	= \
 		nsDrawingSurfaceXlib.cpp \
 		nsFontMetricsXlib.cpp \
 		nsRenderingContextXlib.cpp \
-		nsGfxFactoryXP.cpp \
-		nsXPrintContext.cpp \
 		nsRegionXlib.cpp \
 		nsGCCache.cpp \
 		$(NULL)
 
+# nsDrawingSurfaceXlib only required for staticbuild 
+CPPSRCS		= \
+		$(XLIB_CPPSRCS) \
+		nsDeviceContextXP.cpp \
+		nsGfxFactoryXP.cpp \
+		nsXPrintContext.cpp \
+		$(NULL)
+
 EXPORTS		= \
 		nsIDeviceContextXPrint.h \
 		nsGfxXPrintCID.h \
@@ -76,13 +80,7 @@ CXXFLAGS	 += $(MOZ_XPRINT_CFLAGS)
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-# use different MDDEPDIR & OBJ_SUFFIX to work around objs in srcdir/VPATH 
-# issue (bug 87422 & 100851)
-# Turn off compiler dependencies as 'gcc -MD' 
-# cannot handle our obj_suffix renaming. (bug 105005)
-MDDEPDIR       := $(MDDEPDIR)_vpath
-OBJ_SUFFIX	:= xp.$(OBJ_SUFFIX)
-COMPILER_DEPEND :=
+GARBAGE		+= $(XLIB_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
@@ -101,9 +99,12 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-INCLUDES	+= \
+LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../xlib \
 		-I$(srcdir)/../xlibrgb \
 		-I$(srcdir)/.. \
 		$(NULL)
+
+export:: $(addprefix $(srcdir)/../xlib/,$(XLIB_LCPPSRCS))
+	$(INSTALL) $^ .
diff --git a/mozilla/modules/libjar/standalone/Makefile.in b/mozilla/modules/libjar/standalone/Makefile.in
index 0efe7ace09a..ea5db88b006 100644
--- a/mozilla/modules/libjar/standalone/Makefile.in
+++ b/mozilla/modules/libjar/standalone/Makefile.in
@@ -23,7 +23,7 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@:@srcdir@/..
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../objs.mk
@@ -47,9 +47,7 @@ FORCE_STATIC_LIB = 1
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozz_s.$(LIB_SUFFIX)
 #endif
 
-MDDEPDIR	:= $(MDDEPDIR)_S
-OBJ_SUFFIX	:= S.$(OBJ_SUFFIX)
-COMPILER_DEPEND :=
+GARBAGE		+= $(MODULES_LIBJAR_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
@@ -58,3 +56,8 @@ DEFINES	+= -D_BSD_SOURCE
 endif
 
 DEFINES += -DSTANDALONE
+
+LOCAL_INCLUDES	= -I$(srcdir)/..
+
+export:: $(MODULES_LIBJAR_CPPSRCS)
+	$(INSTALL) $^ .
diff --git a/mozilla/modules/libreg/standalone/Makefile.in b/mozilla/modules/libreg/standalone/Makefile.in
index ffdc762efc4..6ed02957cf7 100644
--- a/mozilla/modules/libreg/standalone/Makefile.in
+++ b/mozilla/modules/libreg/standalone/Makefile.in
@@ -35,11 +35,12 @@ CSRCS		= $(MODULES_LIBREG_SRC_LCSRCS)
 
 FORCE_STATIC_LIB = 1
 
-MDDEPDIR	:= $(MDDEPDIR)_S
-OBJ_SUFFIX	:= S.$(OBJ_SUFFIX)
-COMPILER_DEPEND :=
+GARBAGE		+= $(MODULES_LIBREG_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DSTANDALONE_REGISTRY
 
+export:: $(MODULES_LIBREG_SRC_CSRCS)
+	$(INSTALL) $^ .
+
diff --git a/mozilla/modules/zlib/standalone/Makefile.in b/mozilla/modules/zlib/standalone/Makefile.in
index 30a5c57b576..4e13a3a8d69 100644
--- a/mozilla/modules/zlib/standalone/Makefile.in
+++ b/mozilla/modules/zlib/standalone/Makefile.in
@@ -23,7 +23,7 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@:@srcdir@/../src/
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../src/objs.mk
@@ -32,7 +32,7 @@ MODULE		= zlib
 LIBRARY_NAME	= mozz_s
 
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
-EXPORTS		= $(MODULES_ZLIB_SRC_LEXPORTS)
+EXPORTS		= $(MODULES_ZLIB_SRC_EXPORTS)
 
 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 FORCE_STATIC_LIB = 1
@@ -40,9 +40,11 @@ endif
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
 
-MDDEPDIR	:= $(MDDEPDIR)_S
-OBJ_SUFFIX	:= S.$(OBJ_SUFFIX)
-COMPILER_DEPEND :=
+GARBAGE		+= $(MODULES_ZLIB_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
+LOCAL_INCLUDES = -I$(srcdir)/../src
+
+export:: $(MODULES_ZLIB_SRC_CSRCS)
+	$(INSTALL) $^ .