diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in
index 422e780a38a..a52b5930ab0 100644
--- a/mozilla/extensions/cookie/Makefile.in
+++ b/mozilla/extensions/cookie/Makefile.in
@@ -54,3 +54,4 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/extensions/cookie/tests/Makefile.in b/mozilla/extensions/cookie/tests/Makefile.in
index 1b75a1a94ef..c4deb5db4af 100644
--- a/mozilla/extensions/cookie/tests/Makefile.in
+++ b/mozilla/extensions/cookie/tests/Makefile.in
@@ -27,9 +27,7 @@ CPPSRCS		= TestCookie.cpp
 
 REQUIRES	= js cookie pref xpcom include
 
-LIBS		= \
-		-lxpcom \
-		$(NSPR_LIBS) \
-		$(NULL)
+LIBS		= -lxpcom $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/extensions/pics/Makefile.in b/mozilla/extensions/pics/Makefile.in
index 48fc8b6a832..64cb7d73cac 100644
--- a/mozilla/extensions/pics/Makefile.in
+++ b/mozilla/extensions/pics/Makefile.in
@@ -15,19 +15,18 @@
 # Reserved.
 # 
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public src
+DIRS		= public src
 
 ifdef ENABLE_TESTS
-DIRS += tests
+DIRS		+= tests
 endif
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/extensions/pics/public/Makefile.in b/mozilla/extensions/pics/public/Makefile.in
index 1b042ca0dbc..55a04048f47 100644
--- a/mozilla/extensions/pics/public/Makefile.in
+++ b/mozilla/extensions/pics/public/Makefile.in
@@ -15,23 +15,22 @@
 # Reserved.
 # 
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= pics
+MODULE		= pics
 
-EXPORTS	=                       \
-        nspics.h                \
-        nsIPICS.h               \
-        nsPICSElementObserver.h \
-        $(NULL)
+EXPORTS		= \
+		nspics.h \
+		nsIPICS.h \
+		nsPICSElementObserver.h \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/extensions/pics/src/Makefile.in b/mozilla/extensions/pics/src/Makefile.in
index 32f6cc485fc..d4f300ffb11 100644
--- a/mozilla/extensions/pics/src/Makefile.in
+++ b/mozilla/extensions/pics/src/Makefile.in
@@ -43,3 +43,4 @@ override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/extensions/pics/tests/Makefile.in b/mozilla/extensions/pics/tests/Makefile.in
index 29017e9394a..0d1d93a15e6 100644
--- a/mozilla/extensions/pics/tests/Makefile.in
+++ b/mozilla/extensions/pics/tests/Makefile.in
@@ -34,9 +34,8 @@ LIBS		= \
 		$(NSPR_LIBS) \
 		$(NULL)
 
-EXPORT_SAMPLES	= samples/picstest1.html
-
 include $(topsrcdir)/config/rules.mk
 
 install::
-	$(INSTALL) $(EXPORT_SAMPLES) $(DIST)/bin/res/samples
+	$(INSTALL) samples/picstest1.html $(DIST)/bin/res/samples
+
diff --git a/mozilla/extensions/wallet/Makefile.in b/mozilla/extensions/wallet/Makefile.in
index 2aee2018273..59cd8d5e022 100644
--- a/mozilla/extensions/wallet/Makefile.in
+++ b/mozilla/extensions/wallet/Makefile.in
@@ -25,3 +25,4 @@ include $(DEPTH)/config/autoconf.mk
 DIRS		= public src editor signonviewer cookieviewer walletpreview build
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/extensions/wallet/build/Makefile.in b/mozilla/extensions/wallet/build/Makefile.in
index cd62d0cc3e3..00444400415 100644
--- a/mozilla/extensions/wallet/build/Makefile.in
+++ b/mozilla/extensions/wallet/build/Makefile.in
@@ -22,8 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= walletviewers
 MODULE		= walletviewers
+LIBRARY_NAME	= walletviewers
 IS_COMPONENT	= 1
 
 CPPSRCS		= nsWalletViewerFactory.cpp
@@ -38,7 +38,8 @@ SHARED_LIBRARY_LIBS = \
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL)
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/extensions/wallet/cookieviewer/Makefile.in b/mozilla/extensions/wallet/cookieviewer/Makefile.in
index 30948e31f11..8ea0ec16a5d 100644
--- a/mozilla/extensions/wallet/cookieviewer/Makefile.in
+++ b/mozilla/extensions/wallet/cookieviewer/Makefile.in
@@ -41,3 +41,4 @@ include $(topsrcdir)/config/rules.mk
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/CookieViewer.xul $(srcdir)/CookieViewer.js $(DIST)/bin/chrome/wallet/content/default
 	$(INSTALL) $(srcdir)/CookieViewer.properties $(DIST)/bin/chrome/wallet/locale/en-US
+
diff --git a/mozilla/extensions/wallet/public/Makefile.in b/mozilla/extensions/wallet/public/Makefile.in
index dcb1e31cee2..75a2ea2623f 100644
--- a/mozilla/extensions/wallet/public/Makefile.in
+++ b/mozilla/extensions/wallet/public/Makefile.in
@@ -28,3 +28,4 @@ EXPORTS		= nsIWalletService.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/extensions/wallet/signonviewer/Makefile.in b/mozilla/extensions/wallet/signonviewer/Makefile.in
index b1c3c8633fc..3488542ec35 100644
--- a/mozilla/extensions/wallet/signonviewer/Makefile.in
+++ b/mozilla/extensions/wallet/signonviewer/Makefile.in
@@ -41,3 +41,4 @@ include $(topsrcdir)/config/rules.mk
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/SignonViewer.xul $(srcdir)/SignonViewer.js $(DIST)/bin/chrome/wallet/content/default
 	$(INSTALL) $(srcdir)/SignonViewer.properties $(DIST)/bin/chrome/wallet/locale/en-US
+
diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in
index 2375f439042..90b545f7f3f 100644
--- a/mozilla/extensions/wallet/src/Makefile.in
+++ b/mozilla/extensions/wallet/src/Makefile.in
@@ -56,3 +56,4 @@ include $(topsrcdir)/config/rules.mk
 install::
 	$(INSTALL) $(RES_FILES) $(DIST)/bin/res
 	$(INSTALL) $(CHROME_FILES) $(DIST)/bin/chrome/wallet/locale/en-US
+
diff --git a/mozilla/extensions/wallet/walletpreview/Makefile.in b/mozilla/extensions/wallet/walletpreview/Makefile.in
index f4162f92db6..a046b3dd477 100644
--- a/mozilla/extensions/wallet/walletpreview/Makefile.in
+++ b/mozilla/extensions/wallet/walletpreview/Makefile.in
@@ -41,3 +41,4 @@ include $(topsrcdir)/config/rules.mk
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/WalletPreview.xul $(srcdir)/WalletPreview.js $(DIST)/bin/chrome/wallet/content/default
 	$(INSTALL) $(srcdir)/WalletPreview.properties $(DIST)/bin/chrome/wallet/locale/en-US
+