diff --git a/nav-java/stubs/include/Makefile.in b/nav-java/stubs/include/Makefile.in
index eb2a1798e4c0..98169ef92238 100644
--- a/nav-java/stubs/include/Makefile.in
+++ b/nav-java/stubs/include/Makefile.in
@@ -13,18 +13,20 @@
 # 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	= java
+MODULE		= java
 
-EXPORTS	= java.h javasec.h lj.h edtplug.h
+EXPORTS		= java.h javasec.h lj.h edtplug.h
 
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/nav-java/stubs/jri/Makefile.in b/nav-java/stubs/jri/Makefile.in
index 2ebfb48a73fe..48268d048d55 100644
--- a/nav-java/stubs/jri/Makefile.in
+++ b/nav-java/stubs/jri/Makefile.in
@@ -13,31 +13,34 @@
 # 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	= java
+MODULE		= java
 
-EXPORTS	= netscape_applet_EmbeddedObjectNatives.h \
-	  netscape_applet_MozillaAppletContext.h \
-	  netscape_javascript_JSObject.h \
-	  netscape_javascript_JSException.h \
-	  netscape_plugin_Plugin.h \
-	  netscape_plugin_composer_Composer.h \
-	  netscape_plugin_composer_PluginManager.h \
-	  netscape_security_Principal.h \
-	  netscape_security_Privilege.h \
-	  netscape_security_PrivilegeManager.h \
-	  netscape_security_PrivilegeTable.h \
-	  netscape_security_Target.h \
-	  netscape_security_Zig.h \
-	  $(NULL)
+EXPORTS		= \
+		netscape_applet_EmbeddedObjectNatives.h \
+		netscape_applet_MozillaAppletContext.h \
+		netscape_javascript_JSObject.h \
+		netscape_javascript_JSException.h \
+		netscape_plugin_Plugin.h \
+		netscape_plugin_composer_Composer.h \
+		netscape_plugin_composer_PluginManager.h \
+		netscape_security_Principal.h \
+		netscape_security_Privilege.h \
+		netscape_security_PrivilegeManager.h \
+		netscape_security_PrivilegeTable.h \
+		netscape_security_Target.h \
+		netscape_security_Zig.h \
+		$(NULL)
 
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/nav-java/stubs/src/Makefile.in b/nav-java/stubs/src/Makefile.in
index 37616629555d..9e1f648619c1 100644
--- a/nav-java/stubs/src/Makefile.in
+++ b/nav-java/stubs/src/Makefile.in
@@ -13,11 +13,12 @@
 # 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
 
@@ -31,3 +32,4 @@ CSRCS		= stubnj.c
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(DEPTH)/dist/public/img -I$(DEPTH)/dist/public/util -I$(DEPTH)/dist/public/layer
+
diff --git a/netwerk/Makefile.in b/netwerk/Makefile.in
index 4f1a63a066d9..da3a48e8a1d7 100644
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -22,8 +22,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-
 DIRS		= \
 		base \
 		dns \
diff --git a/netwerk/base/Makefile.in b/netwerk/base/Makefile.in
index ff4593745a1e..f2fb37485a78 100644
--- a/netwerk/base/Makefile.in
+++ b/netwerk/base/Makefile.in
@@ -22,8 +22,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-
 DIRS		= public src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in
index ad3de8547f68..a5ef015219dd 100644
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@@ -15,16 +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@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= public obj mgr pref module tests
+DIRS		= public obj mgr pref module tests
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/mgr/Makefile.in b/netwerk/cache/mgr/Makefile.in
index 3b75ed451703..c7bec8ec03c6 100644
--- a/netwerk/cache/mgr/Makefile.in
+++ b/netwerk/cache/mgr/Makefile.in
@@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@@ -15,41 +13,31 @@
 # 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
 
-LIBRARY_NAME = cachemgr
-MODULE=cachemgr
-IS_COMPONENT=1
+MODULE		= cachemgr
+LIBRARY_NAME	= cachemgr
+IS_COMPONENT	= 1
 
-LOCAL_INCLUDES += \
-	-I$(srcdir)/../public \
-	-I$(srcdir)/../include \
-	$(NULL)
+REQUIRES	= nspr
 
-CPPSRCS = \
-	nsCacheManager.cpp	\
-	nsMonitorable.cpp \
-	nsCacheBkgThd.cpp \
-	nsBkgThread.cpp \
-	$(NULL)
+CPPSRCS		= \
+		nsCacheManager.cpp \
+		nsMonitorable.cpp \
+		nsCacheBkgThd.cpp \
+		nsBkgThread.cpp \
+		$(NULL)
 
-EXPORTS =               \
-		 $(NULL)
+LOCAL_INCLUDES	= -I$(srcdir)/../public -I$(srcdir)/../include
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/module/Makefile.in b/netwerk/cache/module/Makefile.in
index b85d4f96a45a..cbe2a7a1e49b 100644
--- a/netwerk/cache/module/Makefile.in
+++ b/netwerk/cache/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,21 +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
 
-EXPORTS =               \
-    $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-DIRS = disk memory
-
-include $(topsrcdir)/config/config.mk
+DIRS		= disk memory
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/module/disk/Makefile.in b/netwerk/cache/module/disk/Makefile.in
index bb04afa5b5b6..c558c828e3d3 100644
--- a/netwerk/cache/module/disk/Makefile.in
+++ b/netwerk/cache/module/disk/Makefile.in
@@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-# Generated automatically from Makefile.in by configure.
 #
 # 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
@@ -15,47 +13,29 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH = @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = diskcache
-
 MODULE		= diskcache
-IS_COMPONENT = 1
+LIBRARY_NAME	= diskcache
+IS_COMPONENT	= 1
 
-LOCAL_INCLUDES += \
-	-I../../public \
-	-I../../include \
-	-I../          \
-	$(NULL)
+CPPSRCS		= \
+		nsDiskModule.cpp \
+		nsMonitorable.cpp \
+		nsFileStream.cpp \
+		nsDiskModuleFactory.cpp \
+		$(NULL)
 
-CPPSRCS =			\
-	nsDiskModule.cpp 	\
-	nsMonitorable.cpp	\
-	nsFileStream.cpp	\
-	nsDiskModuleFactory.cpp	\
-	$(NULL)
-
-BASE_LIBS=
-
-NETLIB_LIBS =
-
-LIBS = 
-
-DEFINES		+= 
-
-DSO_LDOPTS += -ldb
-
-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
+LOCAL_INCLUDES	= -I../../public -I../../include -I..
 
 include $(topsrcdir)/config/rules.mk
+
+DSO_LDOPTS	+= -ldb
+
diff --git a/netwerk/cache/module/memory/Makefile.in b/netwerk/cache/module/memory/Makefile.in
index c044347714ba..3a2f2ebc41d4 100644
--- a/netwerk/cache/module/memory/Makefile.in
+++ b/netwerk/cache/module/memory/Makefile.in
@@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@@ -15,43 +13,37 @@
 # 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
 
-LIBRARY_NAME = memcache
-MODULE=memcache
-IS_COMPONENT=1
+MODULE		= memcache
+LIBRARY_NAME	= memcache
+IS_COMPONENT	= 1
 
-LOCAL_INCLUDES += \
-    -I$(srcdir) \
-	-I$(srcdir)/../../include \
-	-I$(srcdir)/../../public \
-	-I$(srcdir)/.. \
-	$(NULL)
+REQUIRES	= nspr
 
-CPPSRCS = \
-	nsMemModule.cpp	\
-	nsMemCacheObject.cpp \
-	nsMemStream.cpp	\
-	nsMonitorable.cpp \
-	nsMemModuleFactory.cpp \
-	$(NULL)
+CPPSRCS		= \
+		nsMemModule.cpp \
+		nsMemCacheObject.cpp \
+		nsMemStream.cpp \
+		nsMonitorable.cpp \
+		nsMemModuleFactory.cpp \
+		$(NULL)
 
-EXPORTS = 
+LOCAL_INCLUDES	= \
+		-I$(srcdir) \
+		-I$(srcdir)/../../include \
+		-I$(srcdir)/../../public \
+		-I$(srcdir)/.. \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/obj/Makefile.in b/netwerk/cache/obj/Makefile.in
index 1f40a0a0dae2..7a153e7356fc 100644
--- a/netwerk/cache/obj/Makefile.in
+++ b/netwerk/cache/obj/Makefile.in
@@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@@ -15,39 +13,30 @@
 # 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
 
-LIBRARY_NAME = cacheobj
-MODULE=cacheobj
-IS_COMPONENT=1
+MODULE		= cacheobj
+LIBRARY_NAME	= cacheobj
+IS_COMPONENT	= 1
 
-LOCAL_INCLUDES += \
-	-I$(srcdir)/../include \
-	-I$(srcdir)/../public \
-	-I$(PUBLIC)/netlib \
-	$(NULL)
+CPPSRCS		= nsCacheObject.cpp
 
-CPPSRCS = \
-	nsCacheObject.cpp	\
-	$(NULL)
+REQUIRES	= nspr
 
-EXPORTS =               \
-		 $(NULL)
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../include \
+		-I$(srcdir)/../public \
+		-I$(PUBLIC)/netlib \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/pref/Makefile.in b/netwerk/cache/pref/Makefile.in
index 67ac188c0c2b..3242395b1b23 100644
--- a/netwerk/cache/pref/Makefile.in
+++ b/netwerk/cache/pref/Makefile.in
@@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-#!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
@@ -15,40 +13,30 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
-topsrcdir	=  @top_srcdir@
-VPATH = @srcdir@
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = cachepref
-MODULE=cachepref
-IS_COMPONENT=1
+MODULE		= cachepref
+LIBRARY_NAME	= cachepref
+IS_COMPONENT	= 1
 
-LOCAL_INCLUDES += \
-	-I$(srcdir)/../include \
-	-I$(srcdir)/../public \
-	-I$(PUBLIC)/netlib \
-	$(NULL)
+CPPSRCS		= nsCachePref.cpp
 
-CPPSRCS = \
-	nsCachePref.cpp	\
-#	nsCachePrefFactory.cpp \
-	$(NULL)
+REQUIRES	= nspr
 
-EXPORTS = \
-		  $(NULL)
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../include \
+		-I$(srcdir)/../public \
+		-I$(PUBLIC)/netlib \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES	+= nspr
-
-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-include $(topsrcdir)/config/config.mk
-
-#TARGETS = $(LIBRARY)
+EXTRA_LIBS	= $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/public/Makefile.in b/netwerk/cache/public/Makefile.in
index c2a7add777ec..01dc99404b73 100644
--- a/netwerk/cache/public/Makefile.in
+++ b/netwerk/cache/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,25 +13,23 @@
 # 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 =               \
-	nsICacheManager.h \
-    nsICacheObject.h \
-	nsICachePref.h \
-	nsICacheModule.h \
-    $(NULL)
+EXPORTS		= \
+		nsICacheManager.h \
+		nsICacheObject.h \
+		nsICachePref.h \
+		nsICacheModule.h \
+		$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-#MODULE = cache
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/tests/Makefile.in b/netwerk/cache/tests/Makefile.in
index e4b8f660b376..aea931fc2f28 100644
--- a/netwerk/cache/tests/Makefile.in
+++ b/netwerk/cache/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    = xptest
+DIRS		= xptest
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/cache/tests/xptest/Makefile.in b/netwerk/cache/tests/xptest/Makefile.in
index babba34db81d..62e2e6065938 100644
--- a/netwerk/cache/tests/xptest/Makefile.in
+++ b/netwerk/cache/tests/xptest/Makefile.in
@@ -1,5 +1,3 @@
-# Generated automatically from Makefile.in by configure.
-# Generated automatically from Makefile.in by configure.
 #
 # 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
@@ -15,41 +13,34 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH = @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-#DIRS		= dynamic
+CPPSRCS		= \
+		disktest.cpp \
+		memtest.cpp \
+		$(NULL)
 
-CPPSRCS		=  \
-               disktest.cpp \
-			   memtest.cpp \
-			   $(NULL)
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
-#PROGRAM = cachetest  
-#LIBRARY_NAME = xpcomsample
-SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
+LIBS		= \
+		-lpref \
+		-lsecfree \
+		-lmozjs \
+		-lxpcom \
+		$(ZLIB_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
 
-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG -DCACHE
 LIBS_DIR 	+= -L$(DIST)/bin/components
 INCLUDES	+= -I$(srcdir)/../../public -I$(srcdir)/../../include -I..
-IS_COMPONENT = 
 
-LIBS	= \
-    -lpref \
-	-lsecfree \
-	-lmozjs \
-	-lxpcom \
-	$(ZLIB_LIBS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-#SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
-
-include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in
index ff4593745a1e..f2fb37485a78 100644
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -22,8 +22,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-
 DIRS		= public src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/protocol/Makefile.in b/netwerk/protocol/Makefile.in
index 9e6a6d9a4c6f..7e121c9329ed 100644
--- a/netwerk/protocol/Makefile.in
+++ b/netwerk/protocol/Makefile.in
@@ -22,16 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-
-DIRS		= \
-		about \
-		data \
-		file \
-		resource \
-		ftp \
-		http \
-		$(NULL)
+DIRS		= about data file resource ftp http
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/netwerk/protocol/data/src/Makefile.in b/netwerk/protocol/data/src/Makefile.in
index ca580d90e82a..e7c7f4248c19 100644
--- a/netwerk/protocol/data/src/Makefile.in
+++ b/netwerk/protocol/data/src/Makefile.in
@@ -1,3 +1,4 @@
+#
 # 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
@@ -12,29 +13,24 @@
 # 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@
 
-LIBRARY_NAME = necko_data
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =                             \
-        nsDataHandler.cpp      \
-        nsDataChannel.cpp              \
-        nsDataFactory.cpp              \
-        $(NULL)
+MODULE		= necko
+LIBRARY_NAME	= necko_data
+IS_COMPONENT	= 1
 
-MODULE = necko
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
+CPPSRCS		= \
+		nsDataHandler.cpp \
+		nsDataChannel.cpp \
+		nsDataFactory.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/netwerk/protocol/resource/src/Makefile.in b/netwerk/protocol/resource/src/Makefile.in
index 97955a078a4f..141bab912930 100644
--- a/netwerk/protocol/resource/src/Makefile.in
+++ b/netwerk/protocol/resource/src/Makefile.in
@@ -34,6 +34,8 @@ CPPSRCS		= \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
 ifeq ($(OS_ARCH), Linux)
-DEFINES         += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif
+
diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in
index 2b99878a9a4a..af9b402bf996 100644
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -28,12 +28,14 @@ IS_COMPONENT	= 1
 
 REQUIRES	= xpcom
 
-CPPSRCS		= nsMultiMixedConv.cpp \
+CPPSRCS		= \
+		nsMultiMixedConv.cpp \
 		nsFTPDirListingConv.cpp \
-		nsConvFactories.cpp	\
+		nsConvFactories.cpp \
 		$(NULL)
 
-EXPORTS		= nsMultiMixedConv.h \
+EXPORTS		= \
+		nsMultiMixedConv.h \
 		nsFTPDirListingConv.h \
 		$(NULL)