diff --git a/network/Makefile.in b/network/Makefile.in
index b40ba64483a..fc9d98171c4 100644
--- a/network/Makefile.in
+++ b/network/Makefile.in
@@ -1,4 +1,3 @@
-#! gmake
 #
 # 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,32 +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	= \
-	cache		\
-	client		\
-	cnvts		\
-	mimetype	\
-	main		\
-	protocol
-
-DIRS	+= public module
-
-ifdef NU_CACHE
-DIRS += cache/nu
-endif
+DIRS		= cache client cnvts mimetype main protocol public module
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDE += $(PUBLIC)\ldap $(PUBLIC)\security
-
diff --git a/network/cache/Makefile.in b/network/cache/Makefile.in
index a16d0c1b06c..de5c79217d1 100644
--- a/network/cache/Makefile.in
+++ b/network/cache/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@@ -25,24 +25,18 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= netcache
 LIBRARY_NAME	= netcache
 
+REQUIRES	= network dbm util pref js java fileurl security layer img jtools cache
+
 CSRCS		= \
-	cachedump.c	\
-	extcache.c	\
-	mkcache.c	\
-	mkextcac.c	\
-	mkmemcac.c	\
-	$(NULL)
+		cachedump.c \
+		extcache.c \
+		mkcache.c \
+		mkextcac.c \
+		mkmemcac.c \
+		$(NULL)
 
-EXPORTS= netcache.h mkcache.h mkmemcac.h extcache.h
-EXPORTS:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	= network dbm util pref js java fileurl security layer img jtools
-
-ifdef NU_CACHE
-REQUIRES += \
-	cache \
-	$(NULL)
-endif
+EXPORTS		= netcache.h mkcache.h mkmemcac.h extcache.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/network/cache/nu/Makefile.in b/network/cache/nu/Makefile.in
index d5f7b053fe1..f1d1779a93d 100644
--- a/network/cache/nu/Makefile.in
+++ b/network/cache/nu/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,16 +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/network/cache/nu/include/Makefile.in b/network/cache/nu/include/Makefile.in
index fc31de7c698..b3edf31b539 100644
--- a/network/cache/nu/include/Makefile.in
+++ b/network/cache/nu/include/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,16 +13,14 @@
 # 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	= cache
-
 include $(topsrcdir)/config/rules.mk
+
diff --git a/network/cache/nu/public/Makefile.in b/network/cache/nu/public/Makefile.in
index 49e81d78b2d..5396e5c4063 100644
--- a/network/cache/nu/public/Makefile.in
+++ b/network/cache/nu/public/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,38 +13,38 @@
 # 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
 
-EXPORTS =               \
-    CacheStubs.h 		\
-	nsBkgThread.h       \
-	nsCacheBkgThd.h 	\
-	nsCacheIterator.h 	\
-	nsCacheManager.h	\
-	nsCacheModule.h 	\
-	nsCacheObject.h 	\
-    nsCachePref.h 		\
-    nsDiskModule.h 		\
-	nsEnumeration.h     \
-	nsFileStream.h      \
-	nsIterator.h        \
-	nsMemCacheObject.h  \
-	nsMemModule.h 		\
-    nsMemStream.h 		\
-    nsMonitorable.h 	\
-	nsStream.h 			\
-    $(NULL)
+MODULE		= cache
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= \
+		CacheStubs.h \
+		nsBkgThread.h \
+		nsCacheBkgThd.h \
+		nsCacheIterator.h \
+		nsCacheManager.h \
+		nsCacheModule.h \
+		nsCacheObject.h \
+		nsCachePref.h \
+		nsDiskModule.h \
+		nsEnumeration.h \
+		nsFileStream.h \
+		nsIterator.h \
+		nsMemCacheObject.h \
+		nsMemModule.h \
+		nsMemStream.h \
+		nsMonitorable.h \
+		nsStream.h \
+		$(NULL)
 
-MODULE = cache
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/network/cache/nu/src/Makefile.in b/network/cache/nu/src/Makefile.in
index eb6e7f0ccf0..0fef3bf243b 100644
--- a/network/cache/nu/src/Makefile.in
+++ b/network/cache/nu/src/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,58 +13,40 @@
 # 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
 
-TARGET = $(LIBRARY)
+MODULE		= cache
+LIBRARY_NAME	= cache
 
-LIBRARY_NAME=cache
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= dbm pref js xpcom
 
-MISCDEP = 		    \
-    $(NSPR_LIBS)  	    \
-    $(DIST)/lib/dbm32.lib \
-    $(DIST)/lib/plc3.lib \
-    $(DIST)/lib/xpcom32.lib \
-    $(DIST)/lib/libpref.lib \
-    $(NULL)
-
-MODULE = cache
-
-CPPSRCS	= nsCacheObject.cpp 	\
-		  nsCacheModule.cpp 	\
-		  nsCacheManager.cpp 	\
-		  nsMemModule.cpp 		\
-		  nsDiskModule.cpp 		\
-		  nsCacheTrace.cpp 		\
-		  nsCachePref.cpp 		\
-		  nsMemCacheObject.cpp	\
-		  nsBkgThread.cpp		\
-		  nsCacheBkgThd.cpp		\
-		  CacheStubs.cpp		\
-		  nsFileStream.cpp		\
-		  nsMemStream.cpp		\
-		  nsMonitorable.cpp		\
-	 	  $(NULL)
-
-REQUIRES = dbm pref js xpcom 
-
-LLIBS =				 \
-    $(DIST)/lib/dbm32.lib 		\
-    $(DIST)/lib/plc3.lib 	\
- 	$(DIST)/lib/xpcom32.lib  	\
- 	$(DIST)/lib/libpref.lib  	\
-	$(NSPR_LIBS)		 			\
-	$(NULL)
+CPPSRCS		= \
+		nsCacheObject.cpp \
+		nsCacheModule.cpp \
+		nsCacheManager.cpp \
+		nsMemModule.cpp \
+		nsDiskModule.cpp \
+		nsCacheTrace.cpp \
+		nsCachePref.cpp \
+		nsMemCacheObject.cpp \
+		nsBkgThread.cpp \
+		nsCacheBkgThd.cpp \
+		CacheStubs.cpp \
+		nsFileStream.cpp \
+		nsMemStream.cpp \
+		nsMonitorable.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(srcdir)/../include	\
-			-I$(srcdir)/../public		\
-			$(NULL)
+DEFINES		+= -D_IMPL_NS_NET
+
+INCLUDES	+= -I$(srcdir)/../include -I$(srcdir)/../public
 
diff --git a/network/cache/nu/tests/Makefile.in b/network/cache/nu/tests/Makefile.in
index b1acbbced8b..5f9331e4a68 100644
--- a/network/cache/nu/tests/Makefile.in
+++ b/network/cache/nu/tests/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,14 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH   = ../../../..
-topsrcdir       = @top_srcdir@
-VPATH           = @srcdir@
-srcdir          = @srcdir@
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS    = fftest
+DIRS		= fftest
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/network/cache/nu/tests/fftest/Makefile.in b/network/cache/nu/tests/fftest/Makefile.in
index a5d914c0075..093fbe8d401 100644
--- a/network/cache/nu/tests/fftest/Makefile.in
+++ b/network/cache/nu/tests/fftest/Makefile.in
@@ -24,11 +24,11 @@ include $(DEPTH)/config/autoconf.mk
 
 PROGRAM		= FlatFile
 
-CPPSRCS		= FlatFileTest.cpp
-
 REQUIRES	= cache
 
-LOCAL_INCLUDES	+= -I../../include
+CPPSRCS		= FlatFileTest.cpp
+
+LOCAL_INCLUDES	= -I../../include
 
 LIBS		= \
 		-lcache \
diff --git a/network/client/Makefile.in b/network/client/Makefile.in
index c196049b366..6e6b2ae7624 100644
--- a/network/client/Makefile.in
+++ b/network/client/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,18 +13,18 @@
 # 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		= cnetinit
 
-EXPORTS= $(srcdir)/cnetinit.h
-
-REQUIRES	= netcache network img layer fileurl httpurl ftpurl abouturl \
-	gophurl jsurl remoturl dataurl util security
+EXPORTS		= $(srcdir)/cnetinit.h
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/network/cnvts/Makefile.in b/network/cnvts/Makefile.in
index a619444be2c..ac06b2b02ad 100644
--- a/network/cnvts/Makefile.in
+++ b/network/cnvts/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@@ -25,49 +25,46 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= netcnvts
 LIBRARY_NAME	= netcnvts
 
-DEFINES         += -D_IMPL_NS_NET
-
-CPPSRCS		= \
-	cvplugin.cpp	\
-	nsNetConverterStream.cpp \
-	$(NULL)
+REQUIRES	= network img lay layer util parse pref js security marimurl style mimetype ldap zlib
 
 CSRCS		= \
-	cvactive.c	\
-	cvchunk.c	\
-	cvcolor.c	\
-	cvdisk.c	\
-	cvextcon.c	\
-	cvjscfg.c	\
-	cvsimple.c	\
-	cvunzip.c	\
-	txview.c	\
-	$(NULL)
+		cvactive.c \
+		cvchunk.c \
+		cvcolor.c \
+		cvdisk.c \
+		cvextcon.c \
+		cvjscfg.c \
+		cvsimple.c \
+		cvunzip.c \
+		txview.c \
+		$(NULL)
 
-EXPORTS= \
-    nsINetPlugin.h \
-    nsINetPluginInstance.h \
-    nsINetOStream.h	\
-	cvactive.h	\
-	cvview.h	\
-	cvproxy.h	\
-	cvextcon.h	\
-	txview.h	\
-    cvchunk.h   \
-    cvcolor.h   \
-    cvdisk.h    \
-    cvsimple.h  \
-    cvplugin.h  \
-    cvunzip.h   \
-    cvjscfg.h
+CPPSRCS		= \
+		cvplugin.cpp \
+		nsNetConverterStream.cpp \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= \
+		nsINetPlugin.h \
+		nsINetPluginInstance.h \
+		nsINetOStream.h \
+		cvactive.h \
+		cvview.h \
+		cvproxy.h \
+		cvextcon.h \
+		txview.h \
+		cvchunk.h \
+		cvcolor.h \
+		cvdisk.h \
+		cvsimple.h \
+		cvplugin.h \
+		cvunzip.h \
+		cvjscfg.h \
+		$(NULL)
 
-REQUIRES	= network img lay layer util parse pref js \
-	security marimurl style mimetype ldap
-
-ifndef MOZ_NATIVE_ZLIB
-REQUIRES	+= zlib
-endif
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/cstream/Makefile.in b/network/cstream/Makefile.in
index 1899c0903a5..9ef2ae6ee19 100644
--- a/network/cstream/Makefile.in
+++ b/network/cstream/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,27 +13,24 @@
 # 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		= cstream
 LIBRARY_NAME	= cstream
 
-CSRCS		= \
-	cstream.c	\
-	$(NULL)
+REQUIRES	= network dbm util pref js java fileurl security layer img jtools netcnvts
 
-EXPORTS= cstream.h strmutil.h
+CSRCS		= cstream.c
 
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	= network dbm util pref js java fileurl security \
-	layer img jtools netcnvts
+EXPORTS		= cstream.h strmutil.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/network/main/Makefile.in b/network/main/Makefile.in
index 608cd4842d4..a88944bd96d 100644
--- a/network/main/Makefile.in
+++ b/network/main/Makefile.in
@@ -25,6 +25,37 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= network
 LIBRARY_NAME	= network
 
+REQUIRES	= \
+		ldapurl \
+		imap4url \
+		jtools \
+		progress \
+		dbm \
+		util \
+		js \
+		parse \
+		lay \
+		style \
+		pref \
+		htmldlgs \
+		java \
+		libfont \
+		netcache \
+		httpurl \
+		cnetinit \
+		security \
+		img \
+		layer \
+		netcnvts \
+		network \
+		mimetype \
+		ldap \
+		net \
+		sockstuburl \
+		cache \
+		progress \
+		$(NULL)
+
 CSRCS		= \
 		jscookie.c \
 		mkautocf.c \
@@ -68,54 +99,20 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-REQUIRES	= \
-		ldapurl \
-		imap4url \
-		jtools \
-		progress \
-		dbm \
-		util \
-		js \
-		parse \
-		lay \
-		style \
-		pref \
-		htmldlgs \
-		java \
-		libfont \
-		netcache \
-		httpurl \
-		cnetinit \
-		security \
-		img \
-		layer \
-		netcnvts \
-		network \
-		mimetype \
-		ldap \
-		net \
-		sockstuburl \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
-ifdef NU_CACHE
-REQUIRES	+= cache
-endif
-
-ifdef MOZ_SMOOTH_PROGRESS
-REQUIRES	+= progress
-endif
-
 DEFINES		+= -D_IMPL_NS_NET
 
-TEST_LIBS	= $(LIBRARY) \
-		  $(DIST)/lib/liburl.$(LIB_SUFFIX) \
-		  $(DIST)/lib/libsec-us.$(LIB_SUFFIX) \
-		  $(DIST)/lib/libdbm.$(LIB_SUFFIX) \
-		  $(DIST)/lib/libxp.$(LIB_SUFFIX) \
-		  $(NSPR_LIBS)
+TEST_LIBS	= \
+		$(LIBRARY) \
+		$(DIST)/lib/liburl.$(LIB_SUFFIX) \
+		$(DIST)/lib/libsec-us.$(LIB_SUFFIX) \
+		$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
+		$(DIST)/lib/libxp.$(LIB_SUFFIX) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 test:
 	$(CC) -g -o style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS)
 	$(CC) -g -o stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS)
+
diff --git a/network/mimetype/Makefile.in b/network/mimetype/Makefile.in
index 5ae65a330ae..8b543b1c11c 100644
--- a/network/mimetype/Makefile.in
+++ b/network/mimetype/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@@ -25,28 +25,24 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= mimetype
 LIBRARY_NAME	= mimetype
 
-DEFINES		+= -D_IMPL_NS_NET
-
-CSRCS		= \
-	mkformat.c	\
-	$(NULL)
-
-EXPORTS=$(srcdir)/mkformat.h
-
-include $(topsrcdir)/config/config.mk
-
 REQUIRES	= network img layer util
 
+CSRCS		= mkformat.c
+
+EXPORTS		= $(srcdir)/mkformat.h
+
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
 #
 # This converts mime.types to C source code,
 #  and also to an HTML table that shows what's in it.
 #
-MIME_TYPES		= $(srcdir)/mime.types
-MIME_TYPES_UNIX		= $(srcdir)/mime.types-unix
-MIME_TYPES_NONUNIX	= $(srcdir)/mime.types-nonunix
-AD2C			= sh $(topsrcdir)/cmd/xfe/ad2c
+MIME_TYPES	= $(srcdir)/mime.types
+MIME_TYPES_UNIX	= $(srcdir)/mime.types-unix
+MIME_TYPES_NONUNIX = $(srcdir)/mime.types-nonunix
+AD2C		= sh $(topsrcdir)/cmd/xfe/ad2c
 
 mktypes.h: $(MIME_TYPES) $(MIME_TYPES_UNIX) $(MIME_TYPES_NONUNIX)
 	rm -f $@
diff --git a/network/module/Makefile.in b/network/module/Makefile.in
index b8332aececa..60c18b856dd 100644
--- a/network/module/Makefile.in
+++ b/network/module/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@@ -25,58 +25,59 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= netlib
 LIBRARY_NAME	= netlib
 
-DEFINES		+= -D_IMPL_NS_NET
 INHIBIT_STRIP_NOT_EXPORTED = 1
 
-CPPSRCS		= \
-		  nsNetService.cpp \
-		  nsNetThread.cpp \
-		  nsNetStream.cpp \
-		  nsNetStreamLoader.cpp \
-		  nsHttpUrl.cpp \
-		  nsStubContext.cpp \
-		  nsNetStubs.cpp \
-		  nsNetFile.cpp \
-		  nsNetIDs.cpp \
-		  nsLoadAttribs.cpp \
-		  nsNetFactory.cpp \
-		  nsHttpURLFactory.cpp \
-		  nsSocketTransport.cpp \
-		  $(NULL)
-
-EXPORTS		= \
-		  nsINetService.h \
-		  nsINetSupport.h \
-		  nsIRelatedLinks.h \
-		  nsIRefreshUrl.h \
-		  nsIConnectionInfo.h \
-		  nsIURLGroup.h \
-		  nsINetlibURL.h \
-		  nsIProtocol.h \
-		  nsIProtocolURLFactory.h \
-		  nsIUnicharStreamLoader.h \
-		  nsSocketTransport.h \
-		  $(NULL)
-
 ifdef ENABLE_TESTS
 DIRS		+= tests
 endif
 
+CPPSRCS		= \
+		nsNetService.cpp \
+		nsNetThread.cpp \
+		nsNetStream.cpp \
+		nsNetStreamLoader.cpp \
+		nsHttpUrl.cpp \
+		nsStubContext.cpp \
+		nsNetStubs.cpp \
+		nsNetFile.cpp \
+		nsNetIDs.cpp \
+		nsLoadAttribs.cpp \
+		nsNetFactory.cpp \
+		nsHttpURLFactory.cpp \
+		nsSocketTransport.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsINetService.h \
+		nsINetSupport.h \
+		nsIRelatedLinks.h \
+		nsIRefreshUrl.h \
+		nsIConnectionInfo.h \
+		nsIURLGroup.h \
+		nsINetlibURL.h \
+		nsIProtocol.h \
+		nsIProtocolURLFactory.h \
+		nsIUnicharStreamLoader.h \
+		nsSocketTransport.h \
+		$(NULL)
+
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
+IMAGES		= \
+		$(srcdir)/res/gopher-audio.gif \
+		$(srcdir)/res/gopher-binary.gif \
+		$(srcdir)/res/gopher-find.gif \
+		$(srcdir)/res/gopher-image.gif \
+		$(srcdir)/res/gopher-menu.gif \
+		$(srcdir)/res/gopher-movie.gif \
+		$(srcdir)/res/gopher-telnet.gif \
+		$(srcdir)/res/gopher-text.gif \
+		$(srcdir)/res/gopher-unknown.gif \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
-IMAGES		= \
-		  $(srcdir)/res/gopher-audio.gif \
-		  $(srcdir)/res/gopher-binary.gif \
-		  $(srcdir)/res/gopher-find.gif \
-		  $(srcdir)/res/gopher-image.gif \
-		  $(srcdir)/res/gopher-menu.gif \
-		  $(srcdir)/res/gopher-movie.gif \
-		  $(srcdir)/res/gopher-telnet.gif \
-		  $(srcdir)/res/gopher-text.gif \
-		  $(srcdir)/res/gopher-unknown.gif \
-		  $(NULL)
+DEFINES		+= -D_IMPL_NS_NET
 
 GARBAGE		+= $(wildcard $(DIST)/bin/res/network/gopher-*.gif)
 
diff --git a/network/module/tests/Makefile.in b/network/module/tests/Makefile.in
index d6189d5074d..46d6bae5c97 100644
--- a/network/module/tests/Makefile.in
+++ b/network/module/tests/Makefile.in
@@ -27,7 +27,7 @@ CPPSRCS		= nettest.cpp
 
 REQUIRES	= raptor netlib xpcom pref
 
-LOCAL_INCLUDES	:= -I$(srcdir)/../src
+LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 LIBS		= \
 		-lnetlib \
diff --git a/network/protocol/Makefile.in b/network/protocol/Makefile.in
index a9fb3385e64..b70f3380ab7 100644
--- a/network/protocol/Makefile.in
+++ b/network/protocol/Makefile.in
@@ -1,4 +1,3 @@
-#! gmake
 #
 # 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,58 +13,34 @@
 # 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
-
-DEFINES		+= -D_IMPL_NS_NET
-
-DIRS	= about	\
-	file	\
-	ftp	\
-	gopher	\
-	remote  \
-        sockstub \
-	$(NULL)
+DIRS		= about file ftp gopher remote sockstub
 
 ifdef MOZ_LDAP
-DIRS += ldap \
-	$(NULL)
+DIRS		+= ldap
 endif
 
 ifdef SMART_MAIL
-DIRS += \
-      pop3 \
-      $(NULL)
+DIRS		+= pop3
 endif
 
-
 ifdef OLD_MOZ_MAIL_NEWS
-DIRS += \
-	mailbox \
-	smtp \
-#	nntp \
-	pop3 \
-	imap4 \
-	certld \
-	$(NULL)
+DIRS		+= mailbox smtp pop3 imap4 certld
 else
 ifdef MOZ_MAIL_COMPOSE
-DIRS += \
-	smtp \
-	$(NULL)
+DIRS		+= smtp
 endif
 endif
 
-DIRS += http
+DIRS		+= http
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/network/protocol/about/Makefile.in b/network/protocol/about/Makefile.in
index b5b23675298..c4f00589a16 100644
--- a/network/protocol/about/Makefile.in
+++ b/network/protocol/about/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,17 +13,17 @@
 # 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		= abouturl
 LIBRARY_NAME	= abouturl
-DEFINES		+= -D_IMPL_NS_NET
 
 CSRCS		= mkabout.c
 
@@ -32,3 +31,5 @@ EXPORTS		= $(srcdir)/abouturl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/certld/Makefile.in b/network/protocol/certld/Makefile.in
index ca7844b69ee..72a07bcee82 100644
--- a/network/protocol/certld/Makefile.in
+++ b/network/protocol/certld/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,16 +25,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= crtldurl
 LIBRARY_NAME	= crtldurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= ldap network dbm util pref js java fileurl security layer img httpurl
 
-CSRCS		= \
-	mkcertld.c	\
-	$(NULL)
+CSRCS		= mkcertld.c
 
-EXPORTS= $(srcdir)/mkcertld.h
-
-REQUIRES	= ldap network dbm util pref js java fileurl \
-	security layer img httpurl
+EXPORTS		= $(srcdir)/mkcertld.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/dataurl/Makefile.in b/network/protocol/dataurl/Makefile.in
index 3b3775aef16..abc6054ed9e 100644
--- a/network/protocol/dataurl/Makefile.in
+++ b/network/protocol/dataurl/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,27 +13,25 @@
 # 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		= dataurl
 LIBRARY_NAME	= dataurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= network dbm util pref js java fileurl security layer img httpurl netcnvts
 
-CSRCS		= \
-	mkdaturl.c	\
-	$(NULL)
+CSRCS		= mkdaturl.c
 
-EXPORTS= $(srcdir)/dataurl.h
-
-REQUIRES	= network dbm util pref js java fileurl \
-	security layer img httpurl netcnvts
+EXPORTS		= $(srcdir)/dataurl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/file/Makefile.in b/network/protocol/file/Makefile.in
index 71883e9671e..838f7e9fb9a 100644
--- a/network/protocol/file/Makefile.in
+++ b/network/protocol/file/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,31 +13,25 @@
 # 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		= fileurl
 LIBRARY_NAME	= fileurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= network dbm util pref js java fileurl security layer img httpurl jtools mimetype progress
 
-CSRCS		= \
-	mkfile.c	\
-	$(NULL)
+CSRCS		= mkfile.c
 
-EXPORTS= $(srcdir)/fileurl.h
-
-REQUIRES	= network dbm util pref js java fileurl \
-	security layer img httpurl jtools mimetype
-
-ifdef MOZ_SMOOTH_PROGRESS
-REQUIRES += progress
-endif
+EXPORTS		= $(srcdir)/fileurl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/ftp/Makefile.in b/network/protocol/ftp/Makefile.in
index af8e4758798..413720e8880 100644
--- a/network/protocol/ftp/Makefile.in
+++ b/network/protocol/ftp/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,31 +13,25 @@
 # 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		= ftpurl
 LIBRARY_NAME	= ftpurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= network dbm util pref js java fileurl security layer img httpurl mimetype progress
 
-CSRCS		= \
-	mkftp.c	\
-	$(NULL)
+CSRCS		= mkftp.c
 
-EXPORTS= $(srcdir)/ftpurl.h
-
-REQUIRES	= network dbm util pref js java fileurl \
-	security layer img httpurl mimetype
-
-ifdef MOZ_SMOOTH_PROGRESS
-REQUIRES	+= progress
-endif
+EXPORTS		= $(srcdir)/ftpurl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/gopher/Makefile.in b/network/protocol/gopher/Makefile.in
index 258bc3936cf..0dbc58daaaa 100644
--- a/network/protocol/gopher/Makefile.in
+++ b/network/protocol/gopher/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,27 +13,25 @@
 # 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		= gophurl
 LIBRARY_NAME	= gophurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= network dbm util pref js java fileurl security layer img httpurl remoturl mimetype
 
-CSRCS		= \
-	mkgopher.c	\
-	$(NULL)
+CSRCS		= mkgopher.c
 
-EXPORTS= $(srcdir)/gophurl.h
-
-REQUIRES	= network dbm util pref js java fileurl \
-	security layer img httpurl remoturl mimetype
+EXPORTS		= $(srcdir)/gophurl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/http/Makefile.in b/network/protocol/http/Makefile.in
index 06d0587424b..c0688d382da 100644
--- a/network/protocol/http/Makefile.in
+++ b/network/protocol/http/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,33 +13,32 @@
 # 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		= httpurl
 LIBRARY_NAME	= httpurl
 
-DEFINES		+= -D_IMPL_NS_NET
-
 CSRCS		= \
-	mkhttp.c	\
-	mkaccess.c	\
-	$(NULL)
+		mkhttp.c \
+		mkaccess.c \
+		$(NULL)
 
-CPPSRCS		= \
-		  nsCookie.cpp \
-		  $(NULL)
+CPPSRCS		= nsCookie.cpp
 
 ifdef MOZ_BRPROF
-CPPSRCS += nsGetBrowsingProfile.cpp
+CPPSRCS		+= nsGetBrowsingProfile.cpp
 endif
 
-EXPORTS = mkaccess.h httpurl.h httpauth.h cookies.h 
+EXPORTS		= mkaccess.h httpurl.h httpauth.h cookies.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/imap4/Makefile.in b/network/protocol/imap4/Makefile.in
index 36c65dc5f6e..689d8beb0ce 100644
--- a/network/protocol/imap4/Makefile.in
+++ b/network/protocol/imap4/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,29 +25,24 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= imap4url
 LIBRARY_NAME	= imap4url
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= util network security netcache network nspr2 dbm util pref js java fileurl security layer img httpurl mimetype htmldlgs
 
-CSRCS		= \
-	imap4url.c	\
-	$(NULL)
+CSRCS		= imap4url.c
 
 CPPSRCS		= \
-	imapbody.cpp	\
-	imapearl.cpp	\
-	imaphier.cpp	\
-	imappars.cpp	\
-	mkimap4.cpp	\
-	$(NULL)
+		imapbody.cpp \
+		imapearl.cpp \
+		imaphier.cpp \
+		imappars.cpp \
+		mkimap4.cpp \
+		$(NULL)
 
-EXPORTS= imap4pvt.h imap4url.h imapbody.h imaphier.h mkimap4.h
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	=  util network security \
-	netcache network nspr2 dbm util pref js java fileurl \
-	security layer img httpurl mimetype htmldlgs
+EXPORTS		= imap4pvt.h imap4url.h imapbody.h imaphier.h mkimap4.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(topsrcdir)/lib/libmsg
+DEFINES		+= -D_IMPL_NS_NET
+
+INCLUDES	+= -I$(topsrcdir)/lib/libmsg
 
diff --git a/network/protocol/js/Makefile.in b/network/protocol/js/Makefile.in
index 6efb7ad550b..daf75e4e9e7 100644
--- a/network/protocol/js/Makefile.in
+++ b/network/protocol/js/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,27 +13,25 @@
 # 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		= jsurl
 LIBRARY_NAME	= jsurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= network dbm util pref js java fileurl security layer img httpurl lay parse style
 
-CSRCS		= \
-	mkmocha.c	\
-	$(NULL)
+CSRCS		= mkmocha.c
 
-EXPORTS= $(srcdir)/jsurl.h
-
-REQUIRES	= network dbm util pref js java fileurl \
-	security layer img httpurl lay parse style
+EXPORTS		= $(srcdir)/jsurl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/ldap/Makefile.in b/network/protocol/ldap/Makefile.in
index 927e8c0eec9..8a8839130a9 100644
--- a/network/protocol/ldap/Makefile.in
+++ b/network/protocol/ldap/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,18 +25,15 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= ldapurl
 LIBRARY_NAME	= ldapurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= ldap progress netcache network dbm util pref js java fileurl security layer img httpurl mimetype htmldlgs
 
-CSRCS		= \
-	mkldap.c	\
-	$(NULL)
-
-EXPORTS= $(srcdir)/mkldap.h
-
-REQUIRES	= ldap progress netcache network dbm util pref js java fileurl \
-	security layer img httpurl mimetype htmldlgs
+CSRCS		= mkldap.c
 
+EXPORTS		= $(srcdir)/mkldap.h
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(topsrcdir)/lib/libmsg
+DEFINES		+= -D_IMPL_NS_NET
+
+INCLUDES	+= -I$(topsrcdir)/lib/libmsg
+
diff --git a/network/protocol/mailbox/Makefile.in b/network/protocol/mailbox/Makefile.in
index 04a5ecc03e2..cb6b5df6dba 100644
--- a/network/protocol/mailbox/Makefile.in
+++ b/network/protocol/mailbox/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,20 +25,15 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= mailbxurl
 LIBRARY_NAME	= mailbxurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= imap4url netcache network dbm util pref js java fileurl security layer img httpurl mimetype htmldlgs
 
-include $(topsrcdir)/config/config.mk
+CSRCS		= mkmailbx.c
 
-CSRCS		= \
-	mkmailbx.c	\
-	$(NULL)
+EXPORTS		= $(srcdir)/mkmailbx.h
 
-EXPORTS= $(srcdir)/mkmailbx.h
-
-LOCAL_INCLUDES := -I$(topsrcdir)/network/protocol/imap4
-
-REQUIRES	= imap4url netcache network dbm util pref js java fileurl \
-	security layer img httpurl mimetype htmldlgs
+LOCAL_INCLUDES	= -I$(topsrcdir)/network/protocol/imap4
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/marimba/Makefile.in b/network/protocol/marimba/Makefile.in
index a6e784c8053..65adfddec7e 100644
--- a/network/protocol/marimba/Makefile.in
+++ b/network/protocol/marimba/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,27 +13,25 @@
 # 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		= marimurl
 LIBRARY_NAME	= marimurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= network dbm util pref js java fileurl security layer img httpurl
 
-CPPSRCS		= \
-	mkmarimb.cpp	\
-	$(NULL)
+CPPSRCS		= mkmarimb.cpp
 
-EXPORTS= $(srcdir)/marimurl.h
-
-REQUIRES	= network dbm util pref js java fileurl \
-	security layer img httpurl
+EXPORTS		= $(srcdir)/marimurl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/nntp/Makefile.in b/network/protocol/nntp/Makefile.in
index 60ce5abc7a0..12f13e3b024 100644
--- a/network/protocol/nntp/Makefile.in
+++ b/network/protocol/nntp/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,22 +25,17 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= nntpurl
 LIBRARY_NAME	= nntpurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= netcache network dbm util pref js java fileurl security layer img httpurl mimetype htmldlgs
 
 CPPSRCS		= \
-	mknews.cpp	\
-	mknewsgr.cpp	\
-	$(NULL)
-
-EXPORTS= \
-		mknews.h \
-		mknewsgr.h \
+		mknews.cpp \
+		mknewsgr.cpp \
 		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	= netcache network dbm util pref js java fileurl \
-	security layer img httpurl mimetype htmldlgs
+EXPORTS		= mknews.h mknewsgr.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/nntp/public/Makefile.in b/network/protocol/nntp/public/Makefile.in
index 458e47b556c..b3edf31b539 100644
--- a/network/protocol/nntp/public/Makefile.in
+++ b/network/protocol/nntp/public/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -22,7 +22,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS= \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
+
diff --git a/network/protocol/pop3/Makefile.in b/network/protocol/pop3/Makefile.in
index 7284fb35d65..4f1df684ee3 100644
--- a/network/protocol/pop3/Makefile.in
+++ b/network/protocol/pop3/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,16 +25,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= pop3url
 LIBRARY_NAME	= pop3url
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= netcache network dbm util pref js java fileurl security layer img httpurl mimetype htmldlgs
 
-CSRCS		= \
-	mkpop3.c	\
-	$(NULL)
+CSRCS		= mkpop3.c
 
-EXPORTS= $(srcdir)/mkpop3.h
-
-REQUIRES	= netcache network dbm util pref js java fileurl \
-	security layer img httpurl mimetype htmldlgs
+EXPORTS		= $(srcdir)/mkpop3.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/remote/Makefile.in b/network/protocol/remote/Makefile.in
index 43412bf041c..94d408aeb25 100644
--- a/network/protocol/remote/Makefile.in
+++ b/network/protocol/remote/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,27 +13,25 @@
 # 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		= remoturl
 LIBRARY_NAME	= remoturl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= network dbm util pref js java fileurl security layer img httpurl
 
-CSRCS		= \
-	mkremote.c	\
-	$(NULL)
+CSRCS		= mkremote.c
 
-EXPORTS= $(srcdir)/remoturl.h
-
-REQUIRES	= network dbm util pref js java fileurl \
-	security layer img httpurl
+EXPORTS		= $(srcdir)/remoturl.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/smtp/Makefile.in b/network/protocol/smtp/Makefile.in
index d769522e6d9..6f903ca97cf 100644
--- a/network/protocol/smtp/Makefile.in
+++ b/network/protocol/smtp/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -25,16 +25,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= smtpurl
 LIBRARY_NAME	= smtpurl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= netcache network dbm util pref js java fileurl security layer img httpurl mimetype htmldlgs
 
-CSRCS		= \
-	mksmtp.c	\
-	$(NULL)
+CSRCS		= mksmtp.c
 
-EXPORTS= $(srcdir)/mksmtp.h
-
-REQUIRES	= netcache network dbm util pref js java fileurl \
-	security layer img httpurl mimetype htmldlgs
+EXPORTS		= $(srcdir)/mksmtp.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/protocol/sockstub/Makefile.in b/network/protocol/sockstub/Makefile.in
index 281dd8a7ecb..f8c205c8cd0 100644
--- a/network/protocol/sockstub/Makefile.in
+++ b/network/protocol/sockstub/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,34 +13,25 @@
 # 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		= sockstuburl
 LIBRARY_NAME	= sockstuburl
 
-DEFINES		+= -D_IMPL_NS_NET
+REQUIRES	= raptor js dbm nspr security pref xpcom util img layer network netcache fileurl ftpurl abouturl httpurl gophurl remoturl netcnvts netlib progress
 
-CPPSRCS		= \
-	sockstub.cpp	\
-	$(NULL)
+CPPSRCS		= sockstub.cpp
 
-EXPORTS= sockstub.h
-
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	= raptor js dbm nspr security pref xpcom util img \
-			  layer network netcache fileurl ftpurl abouturl \
-			  httpurl gophurl remoturl netcnvts netlib
-
-ifdef MOZ_SMOOTH_PROGRESS
-REQUIRES	+= progress
-endif
+EXPORTS		= $(srcdir)/sockstub.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_NET
+
diff --git a/network/public/Makefile.in b/network/public/Makefile.in
index 522064fcd56..1db2542cdc8 100644
--- a/network/public/Makefile.in
+++ b/network/public/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,29 +13,29 @@
 # 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
 
-MODULE			= netlib
+MODULE		= netlib
 
-EXPORTS = nsIStreamListener.h           \
-          nsIStreamObserver.h           \
-          nsIURL.h                      \
-          nsIPostToServer.h             \
-          nsIHttpURL.h                  \
-          nsILoadAttribs.h              \
-          nsITransport.h		\
-          nsIBlockingNotification.h     \
-          $(NULL)
+EXPORTS		= \
+		nsIStreamListener.h \
+		nsIStreamObserver.h \
+		nsIURL.h \
+		nsIPostToServer.h \
+		nsIHttpURL.h \
+		nsILoadAttribs.h \
+		nsITransport.h \
+		nsIBlockingNotification.h \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/network/util/Makefile.in b/network/util/Makefile.in
index 489c0e9c1e6..686818422dd 100644
--- a/network/util/Makefile.in
+++ b/network/util/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # 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,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@@ -25,19 +25,11 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= network
 LIBRARY_NAME	= netutil
 
-CSRCS		= \
-	mkbuf.c	\
-	$(NULL)
-
-EXPORTS=mkbuf.h
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
-
 REQUIRES	= network xp
 
+CSRCS		= mkbuf.c
+
+EXPORTS		= $(srcdir)/mkbuf.h
+
 include $(topsrcdir)/config/rules.mk
 
-
-