diff --git a/mozilla/modules/libimg/Makefile.in b/mozilla/modules/libimg/Makefile.in
index c821ea48bf5..55c61b27fd9 100644
--- a/mozilla/modules/libimg/Makefile.in
+++ b/mozilla/modules/libimg/Makefile.in
@@ -22,10 +22,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+DIRS		= $(PNGDIR) public public_com src gifcom pngcom jpgcom
+
 ifndef MOZ_NATIVE_PNG
-DIRS = png
+PNGDIR		= png
 endif
 
-DIRS += public public_com src gifcom pngcom jpgcom
-
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libimg/gifcom/Makefile.in b/mozilla/modules/libimg/gifcom/Makefile.in
index 3c533ac4001..79842d4349e 100644
--- a/mozilla/modules/libimg/gifcom/Makefile.in
+++ b/mozilla/modules/libimg/gifcom/Makefile.in
@@ -14,9 +14,6 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 #
-ifndef MOZ_JAVA
-LOCAL_JMC_SUBDIR = .
-endif
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -28,26 +25,26 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= nsgif
 IS_COMPONENT	= 1
 
-LOCAL_INCLUDES	= -I$(srcdir) 
-EXTRA_LIBS	= 
+REQUIRES	= util img gif xpcom img
 
 CPPSRCS		= \
-	gif.cpp \
-	nsGIFModule.cpp \
-	nsGIFDecoder.cpp \
-	dllcompat.cpp \
-	$(NULL)
+		gif.cpp \
+		nsGIFModule.cpp \
+		nsGIFDecoder.cpp \
+		dllcompat.cpp \
+		$(NULL)
 
+LOCAL_INCLUDES	= -I$(srcdir)
 
-REQUIRES	+= util img gif xpcom img
+EXTRA_LIBS	= $(NSPR_LIBS)
 
-EXTRA_LIBS	+= $(NSPR_LIBS)
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
 
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk   
+include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
+
diff --git a/mozilla/modules/libimg/jpgcom/Makefile.in b/mozilla/modules/libimg/jpgcom/Makefile.in
index 37afda4ce17..4a49c3d4fd9 100644
--- a/mozilla/modules/libimg/jpgcom/Makefile.in
+++ b/mozilla/modules/libimg/jpgcom/Makefile.in
@@ -14,9 +14,6 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 #
-ifndef MOZ_JAVA
-LOCAL_JMC_SUBDIR = .
-endif
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -28,28 +25,28 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= nsjpg
 IS_COMPONENT 	= 1
 
-LOCAL_INCLUDES	= -I$(srcdir) 
-EXTRA_LIBS	= 
+REQUIRES	+= util jpeg xpcom img
 
 CPPSRCS		= \
-	jpeg.cpp \
-	nsJPGDecoder.cpp \
-	nsJPGCallback.cpp \
-	dllcompat.cpp \
-	$(NULL)
+		jpeg.cpp \
+		nsJPGDecoder.cpp \
+		nsJPGCallback.cpp \
+		dllcompat.cpp \
+		$(NULL)
 
+LOCAL_INCLUDES	= -I$(srcdir)
 
-REQUIRES	+= util jpeg  xpcom img
+EXTRA_DSO_LDOPTS = $(JPEG_LIBS)
 
-EXTRA_DSO_LDOPTS += $(JPEG_LIBS)
+EXTRA_LIBS	= $(NSPR_LIBS)
 
-EXTRA_LIBS	+= $(NSPR_LIBS)
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
 
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk   
+include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
+
diff --git a/mozilla/modules/libimg/png/Makefile.in b/mozilla/modules/libimg/png/Makefile.in
index 22b5b643642..c04d2f1a96e 100644
--- a/mozilla/modules/libimg/png/Makefile.in
+++ b/mozilla/modules/libimg/png/Makefile.in
@@ -13,49 +13,51 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-#  
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= png
 LIBRARY_NAME	= png
 
-CSRCS		= png.c \
-		  pngerror.c \
-		  pngget.c \
-		  pngmem.c \
-		  pngpread.c \
-		  pngread.c \
-		  pngrio.c \
-		  pngrutil.c \
-		  pngset.c \
-		  pngtrans.c \
-		  pngwio.c \
-		  pngwrite.c \
-		  pngwtran.c \
-		  pngrtran.c \
-		  pngwutil.c \
-		  $(NULL)
+REQUIRES	= util
 
-EXPORTS =	  png.h pngconf.h
+CSRCS		= \
+		png.c \
+		pngerror.c \
+		pngget.c \
+		pngmem.c \
+		pngpread.c \
+		pngread.c \
+		pngrio.c \
+		pngrutil.c \
+		pngset.c \
+		pngtrans.c \
+		pngwio.c \
+		pngwrite.c \
+		pngwtran.c \
+		pngrtran.c \
+		pngwutil.c \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= png.h pngconf.h
 
-REQUIRES	= util 
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+LOCAL_INCLUDES	= -I$(srcdir)
 
 ifndef MOZ_NATIVE_ZLIB
 REQUIRES	+= zlib
 EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lzlib
 endif
 
-LOCAL_INCLUDES	= -I$(srcdir)
-
-# need static lib for the components to link with
+override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libimg/pngcom/Makefile.in b/mozilla/modules/libimg/pngcom/Makefile.in
index 0ffa9a48791..eac02d61a54 100644
--- a/mozilla/modules/libimg/pngcom/Makefile.in
+++ b/mozilla/modules/libimg/pngcom/Makefile.in
@@ -14,9 +14,6 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 #
-ifndef MOZ_JAVA
-LOCAL_JMC_SUBDIR = .
-endif
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -26,31 +23,30 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= nspng
-IS_COMPONENT 	= 1
+IS_COMPONENT	= 1
 
-LOCAL_INCLUDES	= -I$(srcdir) 
-EXTRA_LIBS =
+REQUIRES	= util png zlib xpcom img
 
 CPPSRCS		= \
-	ipng.cpp \
-	nsPNGDecoder.cpp \
-	nsPNGCallback.cpp \
-	dllcompat.cpp \
-	$(NULL)
+		ipng.cpp \
+		nsPNGDecoder.cpp \
+		nsPNGCallback.cpp \
+		dllcompat.cpp \
+		$(NULL)
 
+LOCAL_INCLUDES	= -I$(srcdir)
 
-REQUIRES	+= util png zlib xpcom img
+EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS)
 
-EXTRA_DSO_LDOPTS += $(PNG_LIBS) 
-EXTRA_DSO_LDOPTS += $(ZLIB_LIBS) 
+EXTRA_LIBS	= $(NSPR_LIBS)
 
-EXTRA_LIBS	+= $(NSPR_LIBS)
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
 
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk   
+include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
+
diff --git a/mozilla/modules/libimg/public/Makefile.in b/mozilla/modules/libimg/public/Makefile.in
index 0bda62cedfb..e37f0fa3014 100644
--- a/mozilla/modules/libimg/public/Makefile.in
+++ b/mozilla/modules/libimg/public/Makefile.in
@@ -15,11 +15,6 @@
 # Reserved.
 #
 
-ifndef MOZ_JAVA
-LOCAL_JMC_SUBDIR = .
-endif
-
-
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
@@ -29,12 +24,26 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= img
 
+EXPORTS		= \
+		il_types.h \
+		ni_pixmp.h \
+		libimg.h \
+		il_icons.h \
+		il_strm.h \
+		il_util.h \
+		ilINetContext.h \
+		ilIURL.h \
+		ilINetReader.h \
+		ilIImageRenderer.h \
+		ilISystemServices.h \
+		dummy_nc.h \
+		$(NULL)
 
-EXPORTS		= il_types.h ni_pixmp.h libimg.h il_icons.h il_strm.h il_util.h \
-    ilINetContext.h ilIURL.h ilINetReader.h ilIImageRenderer.h \
-    ilISystemServices.h dummy_nc.h  \
-		  $(NULL)
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libimg/public_com/Makefile.in b/mozilla/modules/libimg/public_com/Makefile.in
index a72db416337..c7344bbe167 100644
--- a/mozilla/modules/libimg/public_com/Makefile.in
+++ b/mozilla/modules/libimg/public_com/Makefile.in
@@ -15,11 +15,6 @@
 # Reserved.
 #
 
-ifndef MOZ_JAVA
-LOCAL_JMC_SUBDIR = .
-endif
-
-
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
@@ -29,13 +24,22 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= img
 
-
 # XXX nsImgDCallbk.h should go into libimg/src instead of being here
-EXPORTS		=	il.h dllcompat.h if_struct.h il_utilp.h \
-			nsIImgDecoder.h nsIImgDCallbk.h \
-			nsImgDCallbk.h \
-			$(NULL)
+EXPORTS		= \
+		il.h \
+		dllcompat.h \
+		if_struct.h \
+		il_utilp.h \
+		nsIImgDecoder.h \
+		nsIImgDCallbk.h \
+		nsImgDCallbk.h \
+		$(NULL)
 
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
 
 include $(topsrcdir)/config/rules.mk 
+
diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in
index 7a192944360..7ae70c42c58 100644
--- a/mozilla/modules/libimg/src/Makefile.in
+++ b/mozilla/modules/libimg/src/Makefile.in
@@ -14,9 +14,6 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 #
-ifndef MOZ_JAVA
-LOCAL_JMC_SUBDIR = .
-endif
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -28,32 +25,32 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= img
 LIBRARY_NAME	= img_s
 
-LOCAL_INCLUDES	= -I$(srcdir)
+REQUIRES	= util img xpcom
 
 CPPSRCS		= \
-	ilNetReader.cpp \
-	color.cpp \
-	colormap.cpp \
-	dither.cpp \
-	if.cpp \
-	ilclient.cpp \
-	il_util.cpp \
-	scale.cpp \
-	$(NULL)
+		ilNetReader.cpp \
+		color.cpp \
+		colormap.cpp \
+		dither.cpp \
+		if.cpp \
+		ilclient.cpp \
+		il_util.cpp \
+		scale.cpp \
+		xpcompat.cpp \
+		$(NULL)
 
+LOCAL_INCLUDES	= -I$(srcdir)
 
-CPPSRCS		+= xpcompat.cpp \
-		  $(NULL)
+ifndef MOZ_JAVA
+LOCAL_JMC_SUBDIR = .
+endif
 
-REQUIRES	+= util img xpcom
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MKSHLIB :=
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
 ifeq ($(OS_ARCH), Linux)
-DEFINES         += -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
+DEFINES		+= -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
 endif
+
diff --git a/mozilla/modules/libjar/Makefile.in b/mozilla/modules/libjar/Makefile.in
index 75361f5c4b6..71678fb27e1 100644
--- a/mozilla/modules/libjar/Makefile.in
+++ b/mozilla/modules/libjar/Makefile.in
@@ -17,36 +17,37 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE          = jar
-LIBRARY_NAME    = jar$(VERSION_NUMBER)
-IS_COMPONENT    = 1
+MODULE		= jar
+LIBRARY_NAME	= jar$(VERSION_NUMBER)
+IS_COMPONENT	= 1
 
-XPIDLSRCS=nsIZip.idl \
-          nsIJAR.idl \
-          $(NULL)
+CPPSRCS		= \
+		nsZipArchive.cpp \
+		nsJAR.cpp \
+		nsJARFactory.cpp \
+		nsWildCard.cpp \
+		$(NULL)
 
-CPPSRCS = \
-	nsZipArchive.cpp \
-	nsJAR.cpp \
-	nsJARFactory.cpp \
-	nsWildCard.cpp	\
-	$(NULL)
+EXPORTS		= zipfile.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+XPIDLSRCS	= \
+		nsIZip.idl \
+		nsIJAR.idl \
+		$(NULL)
 
 
-EXPORTS = zipfile.h 
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-EXTRA_DSO_LDOPTS =\
+EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		$(ZLIB_LIBS) \
-		-lxpcom	\
-		$(NSPR_LIBS)	\
+		-lxpcom \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libpref/Makefile.in b/mozilla/modules/libpref/Makefile.in
index 04fda38ec83..27ecd5b1e21 100644
--- a/mozilla/modules/libpref/Makefile.in
+++ b/mozilla/modules/libpref/Makefile.in
@@ -13,15 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public admin src
+DIRS		= public admin src
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libpref/admin/Makefile.in b/mozilla/modules/libpref/admin/Makefile.in
index 7165eb51c2e..070056a7fcb 100644
--- a/mozilla/modules/libpref/admin/Makefile.in
+++ b/mozilla/modules/libpref/admin/Makefile.in
@@ -13,7 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -23,33 +23,27 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef POLARIS
-SHARED_LIBRARY	= libAutoAdmin.so
-endif
-
-XFEDIR		= $(DEPTH)/cmd/xfe
-
+LIBRARY_NAME	= AutoAdmin
 CSRCS		= prefldap.c icondata.c
+endif
 
 REQUIRES	= ldap js pref
 
+XFEDIR		= $(DEPTH)/cmd/xfe/icons
+
+override NO_SHARED_LIB=
+override NO_STATIC_LIB=1
+
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(topsrcdir)/cmd/xfe/icons -I$(DEPTH)/cmd/xfe/icons
+INCLUDES	+= -I$(topsrcdir)/cmd/xfe/icons -I$(XFEDIR)
 DEFINES		+= -DPOLARIS
 GARBAGE		+= icondata.c
 
-ifeq ($(OS_ARCH),AIX)
-MKSHLIB		= svld -berok $(DSO_LDOPTS)
-endif
-
-ifeq ($(OS_ARCH),OSF1)
-MKSHLIB		= $(LD) $(DSO_LDOPTS)
-endif
-
-polaris: $(SHARED_LIBRARY)
-	$(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin
+polaris: libs install
 
 icondata.c:
-	@rm -f icondata.c $(NOSUCHFILE)
-	@cd $(XFEDIR)/icons; $(MAKE)
-	@ln -s $(XFEDIR)/icons/icondata.c $@
+	@rm -f $@
+	@cd $(XFEDIR); $(MAKE)
+	@ln -s $(XFEDIR)/icondata.c $@
+
diff --git a/mozilla/modules/libpref/l10n/Makefile.in b/mozilla/modules/libpref/l10n/Makefile.in
index ee375d300e2..1bb8bcdf5c5 100644
--- a/mozilla/modules/libpref/l10n/Makefile.in
+++ b/mozilla/modules/libpref/l10n/Makefile.in
@@ -13,7 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -24,10 +24,10 @@ include $(DEPTH)/config/autoconf.mk
 
 REQUIRES	= security
 
-include $(topsrcdir)/config/rules.mk
-
 LIBS		= -L$(DIST)/lib -lhash
 
+include $(topsrcdir)/config/rules.mk
+
 all:: other-stuff resources un-obscure
 
 other-stuff:
@@ -37,3 +37,4 @@ other-stuff:
 	
 resources: resources.o
 	$(CC) -o $@ $< $(LIBS)
+
diff --git a/mozilla/modules/libpref/public/Makefile.in b/mozilla/modules/libpref/public/Makefile.in
index 92143788db8..d78b05b42e0 100644
--- a/mozilla/modules/libpref/public/Makefile.in
+++ b/mozilla/modules/libpref/public/Makefile.in
@@ -13,20 +13,21 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPIDLSRCS = nsIPref.idl
+MODULE		= pref
 
-MODULE	= pref
+XPIDLSRCS	= nsIPref.idl
 
-EXPORTS	= prefapi.h prefldap.h
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= prefapi.h prefldap.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in
index 221676ef14f..c7b3dbcf747 100644
--- a/mozilla/modules/libpref/src/Makefile.in
+++ b/mozilla/modules/libpref/src/Makefile.in
@@ -13,7 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,77 +21,63 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-IS_COMPONENT=1
+
 MODULE		= pref
 LIBRARY_NAME	= pref
+IS_COMPONENT	= 1
 
 REQUIRES	= js pref security ldap img layer xpcom util
 
+CSRCS		= $(OS2CSRCS) prefapi.c
 
-PREF_JS_EXPORTS	= 	$(srcdir)/initpref.js \
-			$(srcdir)/init/all.js 	\
-			$(srcdir)/init/mailnews.js \
-			$(srcdir)/init/editor.js \
-			$(srcdir)/init/config.js \
-			$(NULL)
+CPPSRCS		= nsPref.cpp
 
+PREF_JS_EXPORTS	= \
+		$(srcdir)/initpref.js \
+		$(srcdir)/init/all.js \
+		$(srcdir)/init/mailnews.js \
+		$(srcdir)/init/editor.js \
+		$(srcdir)/init/config.js \
+		$(NULL)
 
 ifneq ($(subst /,_,$(shell uname -s)),OS2)
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-PREF_JS_EXPORTS		+= $(srcdir)/beos/beos.js
+PREF_JS_EXPORTS	+= $(srcdir)/beos/beos.js
 else
-PREF_JS_EXPORTS		+= $(srcdir)/unix/unix.js
+PREF_JS_EXPORTS	+= $(srcdir)/unix/unix.js
 endif
 else
-PREF_JS_EXPORTS		+= $(srcdir)/win/winpref.js $(srcdir)/os2/os2pref.js
-CSRCS		= prefldap.c
+PREF_JS_EXPORTS	+= $(srcdir)/win/winpref.js $(srcdir)/os2/os2pref.js
+OS2CSRCS	= prefldap.c
 LIBRARY		= xppref32.$(LIB_SUFFIX)
-OS2_IMPLIB    	= 1
-DEF_FILE      	= xpOS2.def
-EXTRA_LIBS    	= 	$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib \
-			$(LIBNSPR) \
-			$(DIST)/lib/libldap.lib $(DIST)/lib/liblber.lib \
-			$(DIST)/lib/libldap.lib $(DIST)/lib/libhash.lib \
-			$(NULL)
+OS2_IMPLIB	= 1
+DEF_FILE	= xpOS2.def
+EXTRA_LIBS	= \
+		$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib \
+		$(LIBNSPR) \
+		$(DIST)/lib/libldap.lib \
+		$(DIST)/lib/liblber.lib \
+		$(DIST)/lib/libldap.lib \
+		$(DIST)/lib/libhash.lib \
+		$(NULL)
 endif
 
-CSRCS		+= prefapi.c
-
-CPPSRCS		+= nsPref.cpp
-
-EXTRA_DSO_LDOPTS =\
-				-L$(DIST)/bin \
-				$(NSPR_LIBS)	\
-				-lxpcom		\
-				-lmozjs	\
-				-lsecfree	\
-				$(NULL)
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		$(NSPR_LIBS) \
+		-lxpcom \
+		-lmozjs \
+		-lsecfree \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-#INCLUDES	+= -I$(srcdir)/unix -Iunix
-
 DEFINES		+= -DB1M
 
-GARBAGE	+=		$(DIST)/bin/components/initpref.js	\
-			$(DIST)/bin/components/all.js	\
-			$(DIST)/bin/components/mailnews.js	\
-			$(DIST)/bin/components/editor.js	\
-			$(DIST)/bin/components/config.js	\
-			$(DIST)/bin/netscape.cfg		\
-			$(NULL)
-
-ifneq ($(subst /,_,$(shell uname -s)),OS2)
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-GARBAGE			+= $(DIST)/bin/components/beos.js
-else
-GARBAGE			+= $(DIST)/bin/components/unix.js
-endif
-else
-GARBAGE			+= $(DIST)/bin/components/winpref.js $(DIST)/bin/components/os2prefs.js
-endif
-
-$(LIBRARY): $(OBJS) 
+GARBAGE		+= $(addprefix $(DIST)/bin/components/, \
+			initpref.js all.js mailnews.js editor.js config.js beos.js unix.js winpref.js os2prefs.js) \
+			$(DIST)/bin/netscape.cfg
 
 install::
 	$(INSTALL) -m 444 $(srcdir)/init/netscape.cfg $(DIST)/bin
+
diff --git a/mozilla/modules/libreg/include/Makefile.in b/mozilla/modules/libreg/include/Makefile.in
index 8f3d3067d95..4aa761ca583 100644
--- a/mozilla/modules/libreg/include/Makefile.in
+++ b/mozilla/modules/libreg/include/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/mozilla/modules/libreg/src/Makefile.in b/mozilla/modules/libreg/src/Makefile.in
index be30967991d..2b649dcab86 100644
--- a/mozilla/modules/libreg/src/Makefile.in
+++ b/mozilla/modules/libreg/src/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -27,39 +27,30 @@ LIBRARY_NAME	= mozreg_s
 
 REQUIRES	= libreg pref js
 
-CSRCS		= reg.c VerReg.c vr_stubs.c 
+PROGRAM		= vreg
+
+CSRCS		= reg.c VerReg.c vr_stubs.c
 
 BIN_SRCS	= VerReg.c reg.c vr_stubs.c
 BIN_OBJS	= $(addprefix R_,$(BIN_SRCS:.c=.o))
 
-MKSHLIB :=
-
-include $(topsrcdir)/config/config.mk
-
-# Memory mapped files are not supported under QNX, Neutrino, HP-UX and BeOS
-ifeq (,$(filter BeOS HP-UX QNX,$(OS_ARCH)))
-DEFINES += -DUSE_MMAP_REGISTRY_IO
-CSRCS += mmapio.c
-endif
-
 # We don't want a shared lib.  Static lib only.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
-include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/config/config.mk
 
-# Override gtscc when building vreg on IRIX 5.3.
-ifeq ($(OS_ARCH)$(OS_RELEASE),IRIX5)
-ifneq ($(CC),gcc)
-CC		= cc
-endif
+# Memory mapped files are not supported under QNX, Neutrino, HP-UX and BeOS
+ifeq (,$(filter BeOS HP-UX QNX,$(OS_ARCH)))
+CSRCS		+= mmapio.c
+DEFINES		+= -DUSE_MMAP_REGISTRY_IO
 endif
 
+include $(topsrcdir)/config/rules.mk
+
 INCLUDES	+= -I$(topsrcdir)/include
 GARBAGE		+= $(PROGRAM) $(BIN_OBJS)
 
-PROGRAM		= vreg$(BIN_SUFFIX)
-
 $(PROGRAM): $(BIN_OBJS)
 ifeq ($(OS_ARCH), OS2)
 	$(LINK_EXE) -OUT:$@ $(BIN_OBJS) $(LDFLAGS) $(OS_LIBS)
@@ -99,5 +90,5 @@ endif
 $(BIN_OBJS): $(BIN_SRCS)
 
 install:: $(PROGRAM)
-	$(INSTALL) -m 444 $(PROGRAM) $(DIST)/bin
+	$(INSTALL) -m 444 $< $(DIST)/bin
 
diff --git a/mozilla/modules/libutil/Makefile.in b/mozilla/modules/libutil/Makefile.in
index 66729f99b61..f2fb37485a7 100644
--- a/mozilla/modules/libutil/Makefile.in
+++ b/mozilla/modules/libutil/Makefile.in
@@ -13,15 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public src
+DIRS		= public src
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libutil/public/Makefile.in b/mozilla/modules/libutil/public/Makefile.in
index acc65335ac5..060cf623f2d 100644
--- a/mozilla/modules/libutil/public/Makefile.in
+++ b/mozilla/modules/libutil/public/Makefile.in
@@ -13,17 +13,18 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= util
+MODULE		= util
 
-EXPORTS	= $(srcdir)/xp_obs.h
+EXPORTS		= $(srcdir)/xp_obs.h
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/libutil/src/Makefile.in b/mozilla/modules/libutil/src/Makefile.in
index e6e4ea6c47a..0402c661c5b 100644
--- a/mozilla/modules/libutil/src/Makefile.in
+++ b/mozilla/modules/libutil/src/Makefile.in
@@ -13,28 +13,28 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= util
 LIBRARY_NAME	= mozutil_s
 
-INHIBIT_STRIP_NOT_EXPORTED = 1
+REQUIRES	= util
 
 CSRCS		= obs.c
 
-REQUIRES	= util
+INHIBIT_STRIP_NOT_EXPORTED = 1
 
-MKSHLIB :=
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(DIST)/include/libutil
+
diff --git a/mozilla/modules/oji/Makefile.in b/mozilla/modules/oji/Makefile.in
index dc3b1c5852c..f2fb37485a7 100644
--- a/mozilla/modules/oji/Makefile.in
+++ b/mozilla/modules/oji/Makefile.in
@@ -1,36 +1,28 @@
-#//------------------------------------------------------------------------
-#//
-#// Makefile to build the MODULES/OJI tree
-#//
-#//------------------------------------------------------------------------
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
 
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-#//------------------------------------------------------------------------
-#//
-#// Specify any "command" targets. (ie. DIRS, INSTALL_FILES, ...)
-#// (these must come before the common makefiles are included)
-#// 
-#// DIRS          - There are subdirectories to process
-#//
-#//------------------------------------------------------------------------
-DIRS= public src
+DIRS		= public src
 
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/oji/public/Makefile.in b/mozilla/modules/oji/public/Makefile.in
index ef0a06949c1..78368b67cb7 100644
--- a/mozilla/modules/oji/public/Makefile.in
+++ b/mozilla/modules/oji/public/Makefile.in
@@ -13,35 +13,37 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-# 
+#
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPIDLSRCS = nsIJVMManager.idl
+MODULE		= oji
 
-MODULE	= oji
+XPIDLSRCS	= nsIJVMManager.idl
 
-EXPORTS	=			  \
-	nsjvm.h			  \
-	nsIJRIPlugin.h		  \
-	nsIJVMConsole.h		  \
-	nsIJVMPlugin.h		  \
-	nsIJVMPluginInstance.h	  \
-	nsIJVMPluginTagInfo.h	  \
-	nsIJVMPrefsWindow.h  	  \
-	nsIJVMWindow.h  	  \
-	nsISymantecDebugManager.h \
-	nsISymantecDebugger.h  \
-	nsISecureEnv.h \
-	ProxyJNI.h \
-	nsIThreadManager.h \
-	nsILiveConnectManager.h
+EXPORTS		= \
+		nsjvm.h \
+		nsIJRIPlugin.h \
+		nsIJVMConsole.h \
+		nsIJVMPlugin.h \
+		nsIJVMPluginInstance.h \
+		nsIJVMPluginTagInfo.h \
+		nsIJVMPrefsWindow.h \
+		nsIJVMWindow.h \
+		nsISymantecDebugManager.h \
+		nsISymantecDebugger.h \
+		nsISecureEnv.h \
+		ProxyJNI.h \
+		nsIThreadManager.h \
+		nsILiveConnectManager.h \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/oji/src/Makefile.in b/mozilla/modules/oji/src/Makefile.in
index dece5c3f934..46b08e4a4f3 100644
--- a/mozilla/modules/oji/src/Makefile.in
+++ b/mozilla/modules/oji/src/Makefile.in
@@ -1,51 +1,62 @@
-#//------------------------------------------------------------------------
-#//
-#// Makefile to build OJI
-#//
-#//------------------------------------------------------------------------
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
 
-DEPTH        = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
 MODULE		= ojiimpl
+IS_COMPONENT	= 1
 
-IS_COMPONENT = 1
+REQUIRES	= img java js lay layer plugin plugimpl pref style util xpcom raptor oji caps
 
 ifdef MOZ_OJI
 LIBRARY_NAME	= oji
 
-CPPSRCS         = jvmmgr.cpp \
-                  scd.cpp  \
-                  nsJVMManager.cpp	 \
-                  nsJVMPluginTagInfo.cpp \
-                  ProxyJNI.cpp \
-                  nsCSecurityContext.cpp \
-                  nsCJVMManagerFactory.cpp \
-                  lcglue.cpp 
+CPPSRCS		= \
+		jvmmgr.cpp \
+		scd.cpp \
+		nsJVMManager.cpp \
+		nsJVMPluginTagInfo.cpp \
+		ProxyJNI.cpp \
+		nsCSecurityContext.cpp \
+		nsCJVMManagerFactory.cpp \
+		lcglue.cpp \
+		$(NULL)
 
-REQUIRES	= img java js lay layer plugin plugimpl pref style util xpcom raptor oji caps
+EXPORTS		= \
+		jvmmgr.h \
+		nsJVMManager.h \
+		nsJVMPluginTagInfo.h \
+		$(NULL)
 
-
-ifeq ($(NSPR_INCLUDE_DIR),)
-INCLUDES +=            -I$(DIST)/include/private
-else
-INCLUDES +=            -I$(NSPR_INCLUDE_DIR)/private
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 endif
 
-CFLAGS += -DJSJDLL=\"$(JSJDLL)\" 
-endif # MOZ_OJI
-
-EXPORTS         = jvmmgr.h	 \
-		  nsJVMManager.h \
-		  nsJVMPluginTagInfo.h
-
-EXPORTS 	:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(NSPR_INCLUDE_DIR),)
+INCLUDES	+= -I$(DIST)/include/private
+else
+INCLUDES	+= -I$(NSPR_INCLUDE_DIR)/private
+endif
+
+CFLAGS		+= -DJSJDLL=\"$(JSJDLL)\"
+
diff --git a/mozilla/modules/plugin/Makefile.in b/mozilla/modules/plugin/Makefile.in
index 467311682f8..20c8107b9cd 100644
--- a/mozilla/modules/plugin/Makefile.in
+++ b/mozilla/modules/plugin/Makefile.in
@@ -1,41 +1,33 @@
-#//------------------------------------------------------------------------
-#//
-#// Makefile to build the MODULES/OJI tree
-#//
-#//------------------------------------------------------------------------
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
 
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-#//------------------------------------------------------------------------
-#//
-#// Specify any "command" targets. (ie. DIRS, INSTALL_FILES, ...)
-#// (these must come before the common makefiles are included)
-#// 
-#// DIRS          - There are subdirectories to process
-#//
-#//------------------------------------------------------------------------
+DIRS		= public nglsrc
 
-DIRS= public nglsrc
-
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
 include $(topsrcdir)/config/rules.mk
 
 $(DIST)/bin/plugins:
-	mkdir $(DIST)/bin/plugins
+	mkdir $@
 
 export:: $(DIST)/bin/plugins
+
diff --git a/mozilla/modules/plugin/base/public/Makefile.in b/mozilla/modules/plugin/base/public/Makefile.in
index dc71f8329a5..4af85b1aa32 100644
--- a/mozilla/modules/plugin/base/public/Makefile.in
+++ b/mozilla/modules/plugin/base/public/Makefile.in
@@ -15,48 +15,51 @@
 # Reserved.
 # 
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= plugin
+MODULE		= plugin
 
-EXPORTS	=				\
-	nsIEventHandler.h		\
-	nsIFileUtilities.h		\
-	nsIJRILiveConnectPlugin.h	\
-	nsIJRILiveConnectPlugInstPeer.h	\
-	nsILiveConnectPlugin.h		\
-	nsILiveConnectPlugInstPeer.h	\
-	nsIMalloc.h			\
-	nsIPlugin.h			\
-	nsIPluginInstance.h		\
-	nsIPluginInstancePeer.h		\
-	nsIPluginInstancePeer2.h	\
-	nsIPluginManager.h		\
-	nsIPluginManager2.h		\
-	nsIPluginStream.h		\
-	nsIPluginTagInfo.h		\
-	nsIPluginTagInfo2.h		\
-	nsIWindowlessPlugInstPeer.h	\
-	nsIPluginInputStream.h          \
-	nsIPluginInputStream2.h         \
-	nsIPluginStreamListener.h       \
-	nsIPluginStreamInfo.h		\
-	nsplugin.h			\
-	nsplugindefs.h		\
-	nsICookieStorage.h
+EXPORTS		= \
+		nsIEventHandler.h \
+		nsIFileUtilities.h \
+		nsIJRILiveConnectPlugin.h \
+		nsIJRILiveConnectPlugInstPeer.h \
+		nsILiveConnectPlugin.h \
+		nsILiveConnectPlugInstPeer.h \
+		nsIMalloc.h \
+		nsIPlugin.h \
+		nsIPluginInstance.h \
+		nsIPluginInstancePeer.h \
+		nsIPluginInstancePeer2.h \
+		nsIPluginManager.h \
+		nsIPluginManager2.h \
+		nsIPluginStream.h \
+		nsIPluginTagInfo.h \
+		nsIPluginTagInfo2.h \
+		nsIWindowlessPlugInstPeer.h \
+		nsIPluginInputStream.h \
+		nsIPluginInputStream2.h \
+		nsIPluginStreamListener.h \
+		nsIPluginStreamInfo.h \
+		nsplugin.h \
+		nsplugindefs.h \
+		nsICookieStorage.h \
+		$(NULL)
 
 # DEPRECATED -- remove before we ship 5.0
-EXPORTS +=				\
-	nsIPluginStream.h		\
-	nsIPluginStreamPeer.h		\
-	nsIPluginStreamPeer2.h		\
-	nsISeekablePluginStreamPeer.h	\
+EXPORTS		+= \
+		nsIPluginStream.h \
+		nsIPluginStreamPeer.h \
+		nsIPluginStreamPeer2.h \
+		nsISeekablePluginStreamPeer.h \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index 2fbf8c4016a..0d97dc66ba1 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -44,9 +44,7 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_DSO_LDOPTS = \
-                -L$(DIST)/lib \
-                -lneckoutil_s
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in
index 2fbf8c4016a..0d97dc66ba1 100644
--- a/mozilla/modules/plugin/nglsrc/Makefile.in
+++ b/mozilla/modules/plugin/nglsrc/Makefile.in
@@ -44,9 +44,7 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_DSO_LDOPTS = \
-                -L$(DIST)/lib \
-                -lneckoutil_s
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/plugin/public/Makefile.in b/mozilla/modules/plugin/public/Makefile.in
index dc71f8329a5..4af85b1aa32 100644
--- a/mozilla/modules/plugin/public/Makefile.in
+++ b/mozilla/modules/plugin/public/Makefile.in
@@ -15,48 +15,51 @@
 # Reserved.
 # 
 
-DEPTH	= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= plugin
+MODULE		= plugin
 
-EXPORTS	=				\
-	nsIEventHandler.h		\
-	nsIFileUtilities.h		\
-	nsIJRILiveConnectPlugin.h	\
-	nsIJRILiveConnectPlugInstPeer.h	\
-	nsILiveConnectPlugin.h		\
-	nsILiveConnectPlugInstPeer.h	\
-	nsIMalloc.h			\
-	nsIPlugin.h			\
-	nsIPluginInstance.h		\
-	nsIPluginInstancePeer.h		\
-	nsIPluginInstancePeer2.h	\
-	nsIPluginManager.h		\
-	nsIPluginManager2.h		\
-	nsIPluginStream.h		\
-	nsIPluginTagInfo.h		\
-	nsIPluginTagInfo2.h		\
-	nsIWindowlessPlugInstPeer.h	\
-	nsIPluginInputStream.h          \
-	nsIPluginInputStream2.h         \
-	nsIPluginStreamListener.h       \
-	nsIPluginStreamInfo.h		\
-	nsplugin.h			\
-	nsplugindefs.h		\
-	nsICookieStorage.h
+EXPORTS		= \
+		nsIEventHandler.h \
+		nsIFileUtilities.h \
+		nsIJRILiveConnectPlugin.h \
+		nsIJRILiveConnectPlugInstPeer.h \
+		nsILiveConnectPlugin.h \
+		nsILiveConnectPlugInstPeer.h \
+		nsIMalloc.h \
+		nsIPlugin.h \
+		nsIPluginInstance.h \
+		nsIPluginInstancePeer.h \
+		nsIPluginInstancePeer2.h \
+		nsIPluginManager.h \
+		nsIPluginManager2.h \
+		nsIPluginStream.h \
+		nsIPluginTagInfo.h \
+		nsIPluginTagInfo2.h \
+		nsIWindowlessPlugInstPeer.h \
+		nsIPluginInputStream.h \
+		nsIPluginInputStream2.h \
+		nsIPluginStreamListener.h \
+		nsIPluginStreamInfo.h \
+		nsplugin.h \
+		nsplugindefs.h \
+		nsICookieStorage.h \
+		$(NULL)
 
 # DEPRECATED -- remove before we ship 5.0
-EXPORTS +=				\
-	nsIPluginStream.h		\
-	nsIPluginStreamPeer.h		\
-	nsIPluginStreamPeer2.h		\
-	nsISeekablePluginStreamPeer.h	\
+EXPORTS		+= \
+		nsIPluginStream.h \
+		nsIPluginStreamPeer.h \
+		nsIPluginStreamPeer2.h \
+		nsISeekablePluginStreamPeer.h \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/modules/plugin/src/Makefile.in b/mozilla/modules/plugin/src/Makefile.in
index 50145942528..f12f653553d 100644
--- a/mozilla/modules/plugin/src/Makefile.in
+++ b/mozilla/modules/plugin/src/Makefile.in
@@ -42,5 +42,5 @@ REQUIRES	+= xp libfont os2font jtools
 INCLUDES	+= -I$(DEPTH)/cmd/os2fe/nfc/include -I$(DEPTH)/cmd/os2fe -I$(DEPTH)/cmd/winfe
 endif
 
-INCLUDES        += -I$(srcdir)/.
+INCLUDES	+= -I$(srcdir)
 
diff --git a/mozilla/modules/security/freenav/Makefile.in b/mozilla/modules/security/freenav/Makefile.in
index 22b7ea747cd..8c197b65359 100644
--- a/mozilla/modules/security/freenav/Makefile.in
+++ b/mozilla/modules/security/freenav/Makefile.in
@@ -1,4 +1,3 @@
-# -*- Mode: Makefile -*-
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,50 +13,50 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-
-
-DEPTH			= ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE			= security
-LIBRARY_NAME		= secfree
+MODULE		= security
+LIBRARY_NAME	= secfree
+
+REQUIRES	= js img layer util
+
+CSRCS		= \
+		secport.c \
+		navstubs.c \
+		$(NULL)
+
+EXPORTS		= \
+		base64.h \
+		cert.h \
+		preenc.h \
+		seccomon.h \
+		secerr.h \
+		sechash.h \
+		secnav.h \
+		secrng.h \
+		secstubn.h \
+		secstubs.h \
+		secstubt.h \
+		ssl.h \
+		sslerr.h \
+		zig.h \
+		rosetta.h \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 INHIBIT_STRIP_NOT_EXPORTED = 1
 
-EXPORTS			= base64.h \
-			  cert.h \
-			  preenc.h \
-			  seccomon.h \
-			  secerr.h \
-			  sechash.h \
-			  secnav.h \
-			  secrng.h \
-			  secstubn.h \
-			  secstubs.h \
-			  secstubt.h \
-			  ssl.h \
-			  sslerr.h \
-			  zig.h \
-			  rosetta.h \
-			  $(NULL)
-
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
-
-CSRCS			= secport.c \
-			  navstubs.c \
-			  $(NULL)
-
-REQUIRES		= js img layer util
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH), Linux)
-DEFINES += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
 
-$(LIBRARY): $(OBJS)
diff --git a/mozilla/modules/zlib/src/Makefile.in b/mozilla/modules/zlib/src/Makefile.in
index 58c9f40731e..07fb71bacf9 100644
--- a/mozilla/modules/zlib/src/Makefile.in
+++ b/mozilla/modules/zlib/src/Makefile.in
@@ -17,8 +17,8 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -27,27 +27,25 @@ LIBRARY_NAME	= zlib
 
 REQUIRES	= java
 
-LCFLAGS		=
+CSRCS		= \
+		adler32.c \
+		crc32.c \
+		compress.c \
+		uncompr.c \
+		deflate.c \
+		trees.c \
+		zutil.c \
+		inflate.c \
+		infblock.c \
+		inftrees.c \
+		infcodes.c \
+		infutil.c \
+		inffast.c \
+		$(NULL)
 
-CSRCS		= adler32.c \
-		  crc32.c \
-		  compress.c \
-		  uncompr.c \
-		  deflate.c \
-		  trees.c \
-		  zutil.c \
-		  inflate.c \
-		  infblock.c \
-		  inftrees.c \
-		  infcodes.c \
-		  infutil.c \
-		  inffast.c \
-		  $(NULL)
-
-# XXX JDK_GEN should add the _gen/* exports
 EXPORTS		= zlib.h zconf.h
 
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 # need a static lib for some components (pngcom, say)
 override NO_STATIC_LIB=