diff --git a/mozilla/netwerk/protocol/about/public/Makefile.in b/mozilla/netwerk/protocol/about/public/Makefile.in
index 5721f321473..18cc959d500 100644
--- a/mozilla/netwerk/protocol/about/public/Makefile.in
+++ b/mozilla/netwerk/protocol/about/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,28 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-MODULE = necko
-
-DEPTH = ../../../..
-
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-XPIDL_MODULE = necko_about
-
-XPIDLSRCS =                \
-        nsIAboutModule.idl \
-        $(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= necko
+XPIDL_MODULE	= necko_about
 
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
+XPIDLSRCS	= nsIAboutModule.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in
index 193e74f07bd..f5b77c5c6d7 100644
--- a/mozilla/netwerk/protocol/about/src/Makefile.in
+++ b/mozilla/netwerk/protocol/about/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,36 +13,26 @@
 # 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@
 
-MODULE = necko
-
-LIBRARY_NAME = necko_about
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			   \
-        nsAboutProtocolHandler.cpp \
-        nsAboutProtocolFactory.cpp \
-        nsAboutBlank.cpp           \
-        $(NULL)
+MODULE		= necko
+LIBRARY_NAME	= necko_about
+IS_COMPONENT	= 1
 
-REQUIRES = xpcom necko 
+REQUIRES	= xpcom necko
 
-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-TARGET = $(LIBARY)
+CPPSRCS		= \
+		nsAboutProtocolHandler.cpp \
+		nsAboutProtocolFactory.cpp \
+		nsAboutBlank.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/protocol/file/public/Makefile.in b/mozilla/netwerk/protocol/file/public/Makefile.in
index e6260ab3374..c6003d71ef7 100644
--- a/mozilla/netwerk/protocol/file/public/Makefile.in
+++ b/mozilla/netwerk/protocol/file/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,22 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-MODULE = necko
-
-DEPTH = ../../../..
-
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-XPIDL_MODULE = necko_file
-
-XPIDLSRCS =				\
-	nsIFileChannel.idl		\
-	nsIFileProtocolHandler.idl	\
-	$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= necko
+XPIDL_MODULE	= necko_file
 
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
+XPIDLSRCS	= \
+		nsIFileChannel.idl \
+		nsIFileProtocolHandler.idl \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in
index 401c5994060..0cd6c44121d 100644
--- a/mozilla/netwerk/protocol/file/src/Makefile.in
+++ b/mozilla/netwerk/protocol/file/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,37 +13,27 @@
 # 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@
 
-MODULE = necko
-
-LIBRARY_NAME = necko_file
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			  \
-	nsDirectoryIndexStream.cpp\
-        nsFileChannel.cpp	  \
-        nsFileProtocolHandler.cpp \
-        nsFileProtocolFactory.cpp \
-        $(NULL)
+MODULE		= necko
+LIBRARY_NAME	= necko_file
+IS_COMPONENT	= 1
 
-REQUIRES = xpcom necko raptor
+REQUIRES	= xpcom necko raptor
 
-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-TARGET = $(LIBARY)
+CPPSRCS		= \
+		nsDirectoryIndexStream.cpp \
+		nsFileChannel.cpp \
+		nsFileProtocolHandler.cpp \
+		nsFileProtocolFactory.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/protocol/ftp/public/Makefile.in b/mozilla/netwerk/protocol/ftp/public/Makefile.in
index 28c86f4b8a7..fe8e50dd225 100644
--- a/mozilla/netwerk/protocol/ftp/public/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/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,32 +13,24 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-MODULE = necko
-
-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-XPIDL_MODULE = necko_ftp
-
-XPIDLSRCS =                 \
-        nsIFTPChannel.idl \
-	nsIFTPContext.idl \
-        $(NULL)
-
-EXPORTS =		\
-	ftpCore.h	\
-        $(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= necko
+XPIDL_MODULE	= necko_ftp
 
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
+XPIDLSRCS	= \
+		nsIFTPChannel.idl \
+		nsIFTPContext.idl \
+		$(NULL)
+
+EXPORTS		= ftpCore.h
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in
index 2d91fc7e9a1..b3d72dc83c6 100644
--- a/mozilla/netwerk/protocol/ftp/src/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/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,36 +13,26 @@
 # 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_ftp
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =                             \
-        nsFtpProtocolHandler.cpp      \
-        nsFTPChannel.cpp              \
-        nsFtpStreamListenerEvent.cpp  \
-        nsFtpConnectionThread.cpp     \
-        nsFtpFactory.cpp              \
-        $(NULL)
+MODULE		= necko
+LIBRARY_NAME	= necko_ftp
+IS_COMPONENT	= 1
 
-MODULE = necko
-
-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-TARGET = $(LIBARY)
+CPPSRCS		= \
+		nsFtpProtocolHandler.cpp \
+		nsFTPChannel.cpp \
+		nsFtpStreamListenerEvent.cpp \
+		nsFtpConnectionThread.cpp \
+		nsFtpFactory.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/protocol/http/public/Makefile.in b/mozilla/netwerk/protocol/http/public/Makefile.in
index db39925bc5c..c697ee24247 100644
--- a/mozilla/netwerk/protocol/http/public/Makefile.in
+++ b/mozilla/netwerk/protocol/http/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,36 +13,29 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-MODULE = necko
-
-DEPTH = ../../../..
-
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-XPIDL_MODULE = necko_http
-
-XPIDLSRCS =			   \
-        nsIHTTPHeader.idl	   \
-        nsIHTTPChannel.idl	   \
-	nsIHttpNotify.idl	   \
-	nsIHTTPProtocolHandler.idl \
-        $(NULL)
-
-EXPORTS =                       \
-        nsIHttpEventSink.h      \
-	nsHTTPEnums.h		\
-        $(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= necko
+XPIDL_MODULE	= necko_http
 
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
+XPIDLSRCS	= \
+		nsIHTTPHeader.idl \
+		nsIHTTPChannel.idl \
+		nsIHttpNotify.idl \
+		nsIHTTPProtocolHandler.idl \
+		$(NULL)
+
+EXPORTS		= \
+		nsIHttpEventSink.h \
+		nsHTTPEnums.h \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in
index c59dab95880..cdfdb6abc15 100644
--- a/mozilla/netwerk/protocol/http/src/Makefile.in
+++ b/mozilla/netwerk/protocol/http/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,48 +13,36 @@
 # 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_http
-
-IS_COMPONENT = 1
-
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS =			   				\
-        nsHTTPHandler.cpp	   		\
-        nsHTTPHandlerFactory.cpp    \
-        nsHTTPChannel.cpp	   		\
-        nsHTTPRequest.cpp	   		\
-        nsHTTPResponseListener.cpp  \
-        nsHTTPResponse.cpp	   		\
-        nsHTTPEncodeStream.cpp	    \
-        nsHTTPHeaderArray.cpp	    \
-        nsHTTPAtoms.cpp	            \
-		nsBasicAuth.cpp				\
-		nsAuth.cpp					\
-        $(NULL)
+MODULE		= necko
+LIBRARY_NAME	= necko_http
+IS_COMPONENT	= 1
 
-EXPORTS=			\
-	nsHTTPCID.h		\
-	$(NULL)
+REQUIRES	= xpcom necko raptor
 
-REQUIRES = xpcom necko raptor
+CPPSRCS		= \
+		nsHTTPHandler.cpp \
+		nsHTTPHandlerFactory.cpp \
+		nsHTTPChannel.cpp \
+		nsHTTPRequest.cpp \
+		nsHTTPResponseListener.cpp \
+		nsHTTPResponse.cpp \
+		nsHTTPEncodeStream.cpp \
+		nsHTTPHeaderArray.cpp \
+		nsHTTPAtoms.cpp \
+		nsBasicAuth.cpp \
+		nsAuth.cpp \
+		$(NULL)
 
-MODULE = necko
-
-include $(topsrcdir)/config/config.mk
-
-# hack until necko lands
-ifndef NECKO
-PUBLIC = $(DEPTH)/netwerk/dist/include
-endif
-
-TARGET = $(LIBARY)
+EXPORTS		= nsHTTPCID.h
 
 include $(topsrcdir)/config/rules.mk
+