diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 713ae8f560a..c6931e9ca09 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -73,7 +73,7 @@ ifdef ENABLE_TESTS
 tier_testharness_dirs += tools/test-harness
 endif
 
-GARBAGE_DIRS += dist _javagen _tests
+GARBAGE_DIRS += dist _javagen _tests staticlib
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
    unallmakefiles mozilla-config.h \
diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in
index ad4e303fa47..8bb7323c09e 100644
--- a/mozilla/config/Makefile.in
+++ b/mozilla/config/Makefile.in
@@ -135,7 +135,7 @@ install::
 	$(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir)
 
 GARBAGE += \
-	$(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) buildid
+	$(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) buildid $(srcdir)/*.pyc
 
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
diff --git a/mozilla/db/morkreader/external/Makefile.in b/mozilla/db/morkreader/external/Makefile.in
index 5a56f1ae298..33acaeabcbf 100755
--- a/mozilla/db/morkreader/external/Makefile.in
+++ b/mozilla/db/morkreader/external/Makefile.in
@@ -22,6 +22,7 @@
 # Contributor(s):
 #  Brian Ryner <bryner@brianryner.com>
 #
+#
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -59,3 +60,5 @@ include $(topsrcdir)/config/rules.mk
 
 nsMorkReader.cpp: $(srcdir)/../nsMorkReader.cpp
 	$(INSTALL) $^ .
+
+GARBAGE += nsMorkReader.cpp
diff --git a/mozilla/embedding/base/standalone/Makefile.in b/mozilla/embedding/base/standalone/Makefile.in
index b88657fdc87..7be9b3c4aa7 100644
--- a/mozilla/embedding/base/standalone/Makefile.in
+++ b/mozilla/embedding/base/standalone/Makefile.in
@@ -72,3 +72,5 @@ CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
 export::
 	$(INSTALL) $(addprefix $(srcdir)/../,$(EMBED_CPPSRCS)) .
+
+GARBAGE += $(EMBED_CPPSRCS)
diff --git a/mozilla/extensions/java/xpcom/interfaces/Makefile.in b/mozilla/extensions/java/xpcom/interfaces/Makefile.in
index 2cc3e8d4e29..fced5435bfa 100644
--- a/mozilla/extensions/java/xpcom/interfaces/Makefile.in
+++ b/mozilla/extensions/java/xpcom/interfaces/Makefile.in
@@ -73,7 +73,7 @@ JAVA_CLASSPATH += $(IFACES_JAR)
 # install jars into SDK
 SDK_LIBRARY = $(JAVA_LIBRARY_NAME).jar $(IFACES_JAR) $(IFACES_JAR_SRC)
 
-GARBAGE += $(IFACES_JAR) $(IFACES_JAR_SRC) IXPCOMError.java java.files
+GARBAGE += $(IFACES_JAR) $(IFACES_JAR_SRC) $(PACKAGE_DIR)/IXPCOMError.java java.files
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/intl/unicharutil/util/internal/Makefile.in b/mozilla/intl/unicharutil/util/internal/Makefile.in
index 8a94e52decc..b4492387c02 100755
--- a/mozilla/intl/unicharutil/util/internal/Makefile.in
+++ b/mozilla/intl/unicharutil/util/internal/Makefile.in
@@ -73,3 +73,5 @@ include $(topsrcdir)/config/rules.mk
 
 $(INTL_UNICHARUTIL_UTIL_LCPPSRCS): %: $(srcdir)/../%
 	$(INSTALL) $^ .
+
+GARBAGE += $(INTL_UNICHARUTIL_UTIL_LCPPSRCS)
diff --git a/mozilla/rdf/util/src/internal/Makefile.in b/mozilla/rdf/util/src/internal/Makefile.in
index 3572d5e025f..6d14f03b2a8 100644
--- a/mozilla/rdf/util/src/internal/Makefile.in
+++ b/mozilla/rdf/util/src/internal/Makefile.in
@@ -69,3 +69,4 @@ include $(topsrcdir)/config/rules.mk
 $(RDF_UTIL_SRC_LCPPSRCS): %: $(srcdir)/../%
 	$(INSTALL) $^ .
 
+GARBAGE += $(RDF_UTIL_SRC_LCPPSRCS)
diff --git a/mozilla/xpcom/glue/standalone/Makefile.in b/mozilla/xpcom/glue/standalone/Makefile.in
index 0e10aed62e9..933c9fa9cdf 100644
--- a/mozilla/xpcom/glue/standalone/Makefile.in
+++ b/mozilla/xpcom/glue/standalone/Makefile.in
@@ -123,4 +123,6 @@ endif
 export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(topsrcdir)/xpcom/glue/nsStringAPI.cpp
 	$(INSTALL) $^ .
 
+GARBAGE += nsStringAPI.cpp
+
 DEFINES		+= -DXPCOM_GLUE