--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -30,47 +30,46 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-LIBRARY_NAME	= necko
+MODULE         = necko
+LIBRARY_NAME   = necko
 EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= necko
-GRE_MODULE	= 1
+IS_COMPONENT   = 1
+MODULE_NAME    = necko
+GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
 
-
-CPPSRCS		= nsNetModule.cpp
-EXPORTS		= nsNetCID.h
+CPPSRCS = nsNetModule.cpp
+EXPORTS = nsNetCID.h
 
 SHARED_LIBRARY_LIBS = \
-		../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
-		../dns/src/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
-		../socket/base/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
-		../streamconv/src/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
-		../streamconv/converters/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
-		../mime/src/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
-		../cache/src/$(LIB_PREFIX)nkcache_s.$(LIB_SUFFIX) \
-		../protocol/about/src/$(LIB_PREFIX)nkabout_s.$(LIB_SUFFIX) \
-		$(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
-			../protocol/$(d)/src/$(LIB_PREFIX)nk$(d)_s.$(LIB_SUFFIX)) \
-		$(NULL)
+  ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
+  ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
+  ../socket/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
+  ../streamconv/src/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
+  ../streamconv/converters/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
+  ../mime/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
+  ../cache/$(LIB_PREFIX)nkcache_s.$(LIB_SUFFIX) \
+  ../protocol/about/$(LIB_PREFIX)nkabout_s.$(LIB_SUFFIX) \
+  $(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
+    ../protocol/$(d)/$(LIB_PREFIX)nk$(d)_s.$(LIB_SUFFIX)) \
+  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
     SHARED_LIBRARY_LIBS += \
         ../system/win32/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
 endif
 
 ifeq ($(OS_ARCH),WINCE)
     SHARED_LIBRARY_LIBS += \
@@ -82,28 +81,28 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
         ../system/mac/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_ENABLE_LIBCONIC
     SHARED_LIBRARY_LIBS += \
         ../system/maemo/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
 endif
 
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/../base/src \
-		-I$(srcdir)/../dns/src \
-		-I$(srcdir)/../socket/base \
-		-I$(srcdir)/../streamconv/src \
-		-I$(srcdir)/../streamconv/converters \
-		-I$(srcdir)/../mime/src \
-		-I$(srcdir)/../cache/src \
-		-I$(srcdir)/../protocol/about/src \
-		$(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
-			-I$(srcdir)/../protocol/$(d)/src) \
-		$(NULL)
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../base/src \
+  -I$(srcdir)/../dns \
+  -I$(srcdir)/../socket \
+  -I$(srcdir)/../streamconv/src \
+  -I$(srcdir)/../streamconv/converters \
+  -I$(srcdir)/../mime \
+  -I$(srcdir)/../cache \
+  -I$(srcdir)/../protocol/about \
+  $(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
+    -I$(srcdir)/../protocol/$(d)) \
+  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
     LOCAL_INCLUDES += -I$(srcdir)/../system/win32
 endif
 
 ifeq ($(OS_ARCH),WINCE)
     LOCAL_INCLUDES += -I$(srcdir)/../system/wince
 endif
@@ -113,67 +112,67 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 endif
 
 ifdef MOZ_ENABLE_LIBCONIC
     LOCAL_INCLUDES += -I$(srcdir)/../system/maemo
 endif
 
 ifdef NECKO_COOKIES
 SHARED_LIBRARY_LIBS += \
-		../cookie/src/$(LIB_PREFIX)neckocookie_s.$(LIB_SUFFIX) \
-                $(NULL)
-LOCAL_INCLUDES	+= -I$(srcdir)/../cookie/src
+  ../cookie/$(LIB_PREFIX)neckocookie_s.$(LIB_SUFFIX) \
+  $(NULL)
+LOCAL_INCLUDES += -I$(srcdir)/../cookie
 endif
 
 ifdef NECKO_WIFI
 SHARED_LIBRARY_LIBS += \
-		../wifi/src/$(LIB_PREFIX)neckowifi_s.$(LIB_SUFFIX) \
-                $(NULL)
-LOCAL_INCLUDES	+= -I$(srcdir)/../wifi/src
+  ../wifi/$(LIB_PREFIX)neckowifi_s.$(LIB_SUFFIX) \
+  $(NULL)
+LOCAL_INCLUDES += -I$(srcdir)/../wifi
 
 ifeq ($(OS_ARCH),SunOS)
 OS_LIBS += $(GLIB_LIBS)
 endif
 
 endif
 
 
 ifdef MOZ_STORAGE
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif
 
 EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(ZLIB_LIBS) \
-		$(NULL)
+  $(LIBS_DIR) \
+  $(EXTRA_DSO_LIBS) \
+  $(MOZ_UNICHARUTIL_LIBS) \
+  $(MOZ_COMPONENT_LIBS) \
+  $(ZLIB_LIBS) \
+  $(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += \
-		-framework SystemConfiguration \
-		$(TK_LIBS) \
-	$(NULL)
+  -framework SystemConfiguration \
+  $(TK_LIBS) \
+  $(NULL)
 endif
 
 ifdef MOZ_ENABLE_LIBCONIC
 EXTRA_DSO_LDOPTS += \
-		$(LIBCONIC_LIBS) \
-		$(MOZ_DBUS_LIBS) \
-		$(NULL)
+  $(LIBCONIC_LIBS) \
+  $(MOZ_DBUS_LIBS) \
+  $(NULL)
 endif
 
 ifeq ($(OS_ARCH),AIX)
 EXTRA_DSO_LDOPTS += -lodm -lcfg
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
-OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
+OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 ifeq ($(OS_ARCH),WINCE)
-OS_LIBS	+= $(call EXPAND_LIBNAME,cellcore ws2)
+OS_LIBS += $(call EXPAND_LIBNAME,cellcore ws2)
 endif
 
 DEFINES += -DIMPL_NS_NET

--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -30,21 +30,73 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= nkcache
-DIRS	= public src
+MODULE         = nkcache
+LIBRARY_NAME   = nkcache_s
+LIBXUL_LIBRARY = 1
+XPIDL_MODULE   = necko_cache
+GRE_MODULE     = 1
+
+FORCE_STATIC_LIB = 1
+
+XPIDLSRCS = \
+  nsICache.idl \
+  nsICacheEntryDescriptor.idl \
+  nsICacheListener.idl \
+  nsICacheService.idl \
+  nsICacheSession.idl \
+  nsICacheVisitor.idl \
+  $(NULL)
+
+EXPORTS = \
+  nsCacheService.h \
+  $(NULL)
+
+CPPSRCS = \
+  nsCache.cpp \
+  nsCacheEntry.cpp \
+  nsCacheEntryDescriptor.cpp \
+  nsCacheMetaData.cpp \
+  nsCacheService.cpp \
+  nsCacheSession.cpp \
+  nsMemoryCacheDevice.cpp \
+  $(NULL)
+
+ifdef NECKO_DISK_CACHE
+CPPSRCS += \
+  nsDiskCacheBinding.cpp \
+  nsDiskCacheBlockFile.cpp \
+  nsDiskCacheDevice.cpp \
+  nsDiskCacheEntry.cpp \
+  nsDiskCacheMap.cpp \
+  nsDiskCacheStreams.cpp \
+  nsDeleteDir.cpp \
+  $(NULL)
+endif
+
+ifdef MOZ_STORAGE
+CPPSRCS += \
+  nsDiskCacheDeviceSQL.cpp \
+  $(NULL)
+
+DEFINES += -DNECKO_OFFLINE_CACHE
+endif
+
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../base/src \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET

rename from netwerk/cache/src/nsCache.cpp
rename to netwerk/cache/nsCache.cpp

rename from netwerk/cache/src/nsCache.h
rename to netwerk/cache/nsCache.h

rename from netwerk/cache/src/nsCacheDevice.h
rename to netwerk/cache/nsCacheDevice.h

rename from netwerk/cache/src/nsCacheEntry.cpp
rename to netwerk/cache/nsCacheEntry.cpp

rename from netwerk/cache/src/nsCacheEntry.h
rename to netwerk/cache/nsCacheEntry.h

rename from netwerk/cache/src/nsCacheEntryDescriptor.cpp
rename to netwerk/cache/nsCacheEntryDescriptor.cpp

rename from netwerk/cache/src/nsCacheEntryDescriptor.h
rename to netwerk/cache/nsCacheEntryDescriptor.h

rename from netwerk/cache/src/nsCacheMetaData.cpp
rename to netwerk/cache/nsCacheMetaData.cpp

rename from netwerk/cache/src/nsCacheMetaData.h
rename to netwerk/cache/nsCacheMetaData.h

rename from netwerk/cache/src/nsCacheRequest.h
rename to netwerk/cache/nsCacheRequest.h

rename from netwerk/cache/src/nsCacheService.cpp
rename to netwerk/cache/nsCacheService.cpp

rename from netwerk/cache/src/nsCacheService.h
rename to netwerk/cache/nsCacheService.h

rename from netwerk/cache/src/nsCacheSession.cpp
rename to netwerk/cache/nsCacheSession.cpp

rename from netwerk/cache/src/nsCacheSession.h
rename to netwerk/cache/nsCacheSession.h

rename from netwerk/cache/src/nsDeleteDir.cpp
rename to netwerk/cache/nsDeleteDir.cpp

rename from netwerk/cache/src/nsDeleteDir.h
rename to netwerk/cache/nsDeleteDir.h

rename from netwerk/cache/src/nsDiskCache.h
rename to netwerk/cache/nsDiskCache.h

rename from netwerk/cache/src/nsDiskCacheBinding.cpp
rename to netwerk/cache/nsDiskCacheBinding.cpp

rename from netwerk/cache/src/nsDiskCacheBinding.h
rename to netwerk/cache/nsDiskCacheBinding.h

rename from netwerk/cache/src/nsDiskCacheBlockFile.cpp
rename to netwerk/cache/nsDiskCacheBlockFile.cpp

rename from netwerk/cache/src/nsDiskCacheBlockFile.h
rename to netwerk/cache/nsDiskCacheBlockFile.h

rename from netwerk/cache/src/nsDiskCacheDevice.cpp
rename to netwerk/cache/nsDiskCacheDevice.cpp

rename from netwerk/cache/src/nsDiskCacheDevice.h
rename to netwerk/cache/nsDiskCacheDevice.h

rename from netwerk/cache/src/nsDiskCacheDeviceSQL.cpp
rename to netwerk/cache/nsDiskCacheDeviceSQL.cpp

rename from netwerk/cache/src/nsDiskCacheDeviceSQL.h
rename to netwerk/cache/nsDiskCacheDeviceSQL.h

rename from netwerk/cache/src/nsDiskCacheEntry.cpp
rename to netwerk/cache/nsDiskCacheEntry.cpp

rename from netwerk/cache/src/nsDiskCacheEntry.h
rename to netwerk/cache/nsDiskCacheEntry.h

rename from netwerk/cache/src/nsDiskCacheMap.cpp
rename to netwerk/cache/nsDiskCacheMap.cpp

rename from netwerk/cache/src/nsDiskCacheMap.h
rename to netwerk/cache/nsDiskCacheMap.h

rename from netwerk/cache/src/nsDiskCacheStreams.cpp
rename to netwerk/cache/nsDiskCacheStreams.cpp

rename from netwerk/cache/src/nsDiskCacheStreams.h
rename to netwerk/cache/nsDiskCacheStreams.h

rename from netwerk/cache/public/nsICache.idl
rename to netwerk/cache/nsICache.idl

rename from netwerk/cache/public/nsICacheEntryDescriptor.idl
rename to netwerk/cache/nsICacheEntryDescriptor.idl

rename from netwerk/cache/public/nsICacheListener.idl
rename to netwerk/cache/nsICacheListener.idl

rename from netwerk/cache/public/nsICacheService.idl
rename to netwerk/cache/nsICacheService.idl

rename from netwerk/cache/public/nsICacheSession.idl
rename to netwerk/cache/nsICacheSession.idl

rename from netwerk/cache/public/nsICacheVisitor.idl
rename to netwerk/cache/nsICacheVisitor.idl

rename from netwerk/cache/src/nsMemoryCacheDevice.cpp
rename to netwerk/cache/nsMemoryCacheDevice.cpp

rename from netwerk/cache/src/nsMemoryCacheDevice.h
rename to netwerk/cache/nsMemoryCacheDevice.h

deleted file mode 100644
--- a/netwerk/cache/public/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-MODULE		= nkcache
-XPIDL_MODULE	= necko_cache
-GRE_MODULE	= 1
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS	= \
-		nsICache.idl		      \
-		nsICacheEntryDescriptor.idl   \
-		nsICacheListener.idl	      \
-		nsICacheService.idl           \
-		nsICacheSession.idl           \
-		nsICacheVisitor.idl           \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

deleted file mode 100644
--- a/netwerk/cache/src/Makefile.in
+++ /dev/null
@@ -1,93 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= nkcache
-LIBRARY_NAME	= nkcache_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY  = 1
-
-
-EXPORTS		= \
-		nsCacheService.h \
-		$(NULL)
-
-CPPSRCS		= \
-	nsCache.cpp \
-	nsCacheEntry.cpp \
-	nsCacheEntryDescriptor.cpp \
-	nsCacheMetaData.cpp \
-	nsCacheService.cpp \
-	nsCacheSession.cpp \
-	nsMemoryCacheDevice.cpp \
-	$(NULL)
-
-ifdef NECKO_DISK_CACHE
-CPPSRCS += \
-	nsDiskCacheBinding.cpp \
-	nsDiskCacheBlockFile.cpp \
-	nsDiskCacheDevice.cpp \
-	nsDiskCacheEntry.cpp \
-	nsDiskCacheMap.cpp \
-	nsDiskCacheStreams.cpp \
-	nsDeleteDir.cpp \
-	$(NULL)
-endif
-
-ifdef MOZ_STORAGE
-CPPSRCS += \
-	nsDiskCacheDeviceSQL.cpp \
-	$(NULL)
-
-DEFINES += -DNECKO_OFFLINE_CACHE
-endif
-
-LOCAL_INCLUDES=-I$(srcdir)/../../base/src
-
-include $(topsrcdir)/config/config.mk
-
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -15,40 +15,61 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#   IBM Corp.
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # export required interfaces, even if --disable-cookies has been given
-DIRS		= public
+MODULE       = necko
+XPIDL_MODULE = necko_cookie
+GRE_MODULE   = 1
+
+SDK_XPIDLSRCS = \
+  nsICookie.idl \
+  nsICookieManager.idl \
+  $(NULL)
+
+XPIDLSRCS = \
+  nsICookie2.idl \
+  nsICookieManager2.idl \
+  nsICookiePermission.idl \
+  nsICookieService.idl \
+  $(NULL)
 
 ifdef NECKO_COOKIES
-DIRS		+= src
+LIBRARY_NAME     = neckocookie_s
+LIBXUL_LIBRARY   = 1
+FORCE_STATIC_LIB = 1
+CPPSRCS = \
+  nsCookie.cpp \
+  nsCookieService.cpp \
+  $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET

rename from netwerk/cookie/src/nsCookie.cpp
rename to netwerk/cookie/nsCookie.cpp

rename from netwerk/cookie/src/nsCookie.h
rename to netwerk/cookie/nsCookie.h

rename from netwerk/cookie/src/nsCookieService.cpp
rename to netwerk/cookie/nsCookieService.cpp

rename from netwerk/cookie/src/nsCookieService.h
rename to netwerk/cookie/nsCookieService.h

rename from netwerk/cookie/public/nsICookie.idl
rename to netwerk/cookie/nsICookie.idl

rename from netwerk/cookie/public/nsICookie2.idl
rename to netwerk/cookie/nsICookie2.idl

rename from netwerk/cookie/public/nsICookieManager.idl
rename to netwerk/cookie/nsICookieManager.idl

rename from netwerk/cookie/public/nsICookieManager2.idl
rename to netwerk/cookie/nsICookieManager2.idl

rename from netwerk/cookie/public/nsICookiePermission.idl
rename to netwerk/cookie/nsICookiePermission.idl

rename from netwerk/cookie/public/nsICookieService.idl
rename to netwerk/cookie/nsICookieService.idl

deleted file mode 100644
--- a/netwerk/cookie/public/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_cookie
-GRE_MODULE	= 1
-
-SDK_XPIDLSRCS   = \
-		nsICookieManager.idl \
-		nsICookie.idl \
-		$(NULL)
-
-XPIDLSRCS	= \
-		nsICookieService.idl \
-		nsICookie2.idl \
-		nsICookieManager2.idl \
-		nsICookiePermission.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

deleted file mode 100644
--- a/netwerk/cookie/src/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla.
-#
-# The Initial Developer of the Original Code is IBM Corporation.
-# Portions created by IBM Corporation are Copyright (C) 2003
-# IBM Corporation. All Rights Reserved.
-#
-# Contributor(s):
-#   IBM Corp.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= neckocookie_s
-FORCE_STATIC_LIB	= 1
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS		= \
-		nsCookie.cpp \
-		nsCookieService.cpp \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -30,20 +30,65 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+MODULE         = necko
+LIBRARY_NAME   = neckodns_s
+LIBXUL_LIBRARY = 1
+XPIDL_MODULE   = necko_dns
+GRE_MODULE     = 1
+
+XPIDLSRCS = \
+  nsIDNSListener.idl \
+  nsIDNSRecord.idl \
+  nsIDNSService.idl \
+  nsIEffectiveTLDService.idl \
+  nsIIDNService.idl \
+  nsPIDNSService.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsIDNService.cpp \
+  nsDNSService2.cpp \
+  nsHostResolver.cpp \
+  nsEffectiveTLDService.cpp \
+  $(NULL)
+
+CSRCS = \
+  race.c \
+  nameprep.c \
+  punycode.c \
+  $(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+FORCE_STATIC_LIB = 1
+
+# need to include etld_data.inc
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../base/src \
+  -I. \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
+
+# Generate the include file containing compact, static definitions
+# for effective TLD data.
+nsEffectiveTLDService.$(OBJ_SUFFIX): etld_data.inc
+
+etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
+	$(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc
+
+GARBAGE += etld_data.inc

rename from netwerk/dns/src/effective_tld_names.dat
rename to netwerk/dns/effective_tld_names.dat

rename from netwerk/dns/src/nameprep.c
rename to netwerk/dns/nameprep.c

rename from netwerk/dns/src/nameprep_template.c
rename to netwerk/dns/nameprep_template.c

rename from netwerk/dns/src/nameprepdata.c
rename to netwerk/dns/nameprepdata.c

rename from netwerk/dns/src/nsDNSService2.cpp
rename to netwerk/dns/nsDNSService2.cpp

rename from netwerk/dns/src/nsDNSService2.h
rename to netwerk/dns/nsDNSService2.h

rename from netwerk/dns/src/nsEffectiveTLDService.cpp
rename to netwerk/dns/nsEffectiveTLDService.cpp

rename from netwerk/dns/src/nsEffectiveTLDService.h
rename to netwerk/dns/nsEffectiveTLDService.h

rename from netwerk/dns/src/nsHostResolver.cpp
rename to netwerk/dns/nsHostResolver.cpp

rename from netwerk/dns/src/nsHostResolver.h
rename to netwerk/dns/nsHostResolver.h

rename from netwerk/dns/src/nsIDNKitInterface.h
rename to netwerk/dns/nsIDNKitInterface.h

rename from netwerk/dns/public/nsIDNSListener.idl
rename to netwerk/dns/nsIDNSListener.idl

rename from netwerk/dns/public/nsIDNSRecord.idl
rename to netwerk/dns/nsIDNSRecord.idl

rename from netwerk/dns/public/nsIDNSRequest.idl
rename to netwerk/dns/nsIDNSRequest.idl

rename from netwerk/dns/public/nsIDNSService.idl
rename to netwerk/dns/nsIDNSService.idl

rename from netwerk/dns/src/nsIDNService.cpp
rename to netwerk/dns/nsIDNService.cpp

rename from netwerk/dns/src/nsIDNService.h
rename to netwerk/dns/nsIDNService.h

rename from netwerk/dns/public/nsIEffectiveTLDService.idl
rename to netwerk/dns/nsIEffectiveTLDService.idl

rename from netwerk/dns/public/nsIIDNService.idl
rename to netwerk/dns/nsIIDNService.idl

rename from netwerk/dns/public/nsPIDNSService.idl
rename to netwerk/dns/nsPIDNSService.idl

rename from netwerk/dns/src/prepare_tlds.py
rename to netwerk/dns/prepare_tlds.py

deleted file mode 100644
--- a/netwerk/dns/public/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-# vim: noexpandtab ts=8 sw=8
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_dns
-GRE_MODULE	= 1
-
-XPIDLSRCS	= \
-		nsPIDNSService.idl \
-		nsIDNSService.idl \
-		nsIDNSListener.idl \
-		nsIDNSRecord.idl \
-		nsIIDNService.idl \
-		nsIEffectiveTLDService.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

rename from netwerk/dns/src/punycode.c
rename to netwerk/dns/punycode.c

rename from netwerk/dns/src/punycode.h
rename to netwerk/dns/punycode.h

rename from netwerk/dns/src/race.c
rename to netwerk/dns/race.c

deleted file mode 100644
--- a/netwerk/dns/src/Makefile.in
+++ /dev/null
@@ -1,83 +0,0 @@
-# vim: noexpandtab ts=8 sw=8
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= neckodns_s
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS		= nsIDNService.cpp \
-		  nsDNSService2.cpp \
-		  nsHostResolver.cpp \
-		  nsEffectiveTLDService.cpp \
-		  $(NULL)
-
-CSRCS		= race.c  \
-		  nameprep.c \
-		  punycode.c \
-		  $(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-# need to include etld_data.inc
-LOCAL_INCLUDES =  \
-                 -I$(srcdir)/../../base/src   \
-                 -I. \
-                 $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET
-
-# Generate the include file containing compact, static definitions
-# for effective TLD data.
-nsEffectiveTLDService.$(OBJ_SUFFIX): etld_data.inc
-
-etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
-	$(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc
-
-GARBAGE += etld_data.inc

--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -30,21 +30,38 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mimetype
-DIRS		= public src
+MODULE         = mimetype
+LIBRARY_NAME   = nkmime_s
+LIBXUL_LIBRARY = 1
+
+FORCE_STATIC_LIB = 1
+
+EXPORTS = \
+  nsMimeTypes.h \
+  $(NULL)
+
+XPIDLSRCS = \
+  nsIMIMEHeaderParam.idl \
+  nsIMIMEInfo.idl \
+  nsIMIMEService.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsMIMEHeaderParamImpl.cpp \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET

rename from netwerk/mime/public/nsIMIMEHeaderParam.idl
rename to netwerk/mime/nsIMIMEHeaderParam.idl

rename from netwerk/mime/public/nsIMIMEInfo.idl
rename to netwerk/mime/nsIMIMEInfo.idl

rename from netwerk/mime/public/nsIMIMEService.idl
rename to netwerk/mime/nsIMIMEService.idl

rename from netwerk/mime/src/nsMIMEHeaderParamImpl.cpp
rename to netwerk/mime/nsMIMEHeaderParamImpl.cpp

rename from netwerk/mime/src/nsMIMEHeaderParamImpl.h
rename to netwerk/mime/nsMIMEHeaderParamImpl.h

rename from netwerk/mime/public/nsMimeTypes.h
rename to netwerk/mime/nsMimeTypes.h

deleted file mode 100644
--- a/netwerk/mime/public/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mimetype
-XPIDL_MODULE	= mimetype
-
-XPIDLSRCS	= \
-		nsIMIMEService.idl \
-		nsIMIMEInfo.idl \
-		nsIMIMEHeaderParam.idl \
-		$(NULL)
-
-EXPORTS		= \
-		nsMimeTypes.h \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

deleted file mode 100644
--- a/netwerk/mime/src/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= mimetype
-LIBRARY_NAME	= nkmime_s
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS		= \
-		nsMIMEHeaderParamImpl.cpp \
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -30,20 +30,42 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+MODULE         = necko
+LIBRARY_NAME   = nkabout_s
+LIBXUL_LIBRARY = 1
+XPIDL_MODULE   = necko_about
+GRE_MODULE     = 1
+
+FORCE_STATIC_LIB = 1
+
+EXPORTS = nsAboutProtocolUtils.h
+
+XPIDLSRCS = nsIAboutModule.idl
+
+CPPSRCS = \
+  nsAboutProtocolHandler.cpp \
+  nsAboutBlank.cpp \
+  nsAboutBloat.cpp \
+  nsAboutCache.cpp \
+  nsAboutCacheEntry.cpp \
+  $(NULL)
+
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../../base/src \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET

rename from netwerk/protocol/about/src/nsAboutBlank.cpp
rename to netwerk/protocol/about/nsAboutBlank.cpp

rename from netwerk/protocol/about/src/nsAboutBlank.h
rename to netwerk/protocol/about/nsAboutBlank.h

rename from netwerk/protocol/about/src/nsAboutBloat.cpp
rename to netwerk/protocol/about/nsAboutBloat.cpp

rename from netwerk/protocol/about/src/nsAboutBloat.h
rename to netwerk/protocol/about/nsAboutBloat.h

rename from netwerk/protocol/about/src/nsAboutCache.cpp
rename to netwerk/protocol/about/nsAboutCache.cpp

rename from netwerk/protocol/about/src/nsAboutCache.h
rename to netwerk/protocol/about/nsAboutCache.h

rename from netwerk/protocol/about/src/nsAboutCacheEntry.cpp
rename to netwerk/protocol/about/nsAboutCacheEntry.cpp

rename from netwerk/protocol/about/src/nsAboutCacheEntry.h
rename to netwerk/protocol/about/nsAboutCacheEntry.h

rename from netwerk/protocol/about/src/nsAboutProtocolHandler.cpp
rename to netwerk/protocol/about/nsAboutProtocolHandler.cpp

rename from netwerk/protocol/about/src/nsAboutProtocolHandler.h
rename to netwerk/protocol/about/nsAboutProtocolHandler.h

rename from netwerk/protocol/about/public/nsAboutProtocolUtils.h
rename to netwerk/protocol/about/nsAboutProtocolUtils.h

rename from netwerk/protocol/about/public/nsIAboutModule.idl
rename to netwerk/protocol/about/nsIAboutModule.idl

deleted file mode 100644
--- a/netwerk/protocol/about/public/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_about
-GRE_MODULE	= 1
-
-XPIDLSRCS	= nsIAboutModule.idl
-
-EXPORTS		= nsAboutProtocolUtils.h
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

deleted file mode 100644
--- a/netwerk/protocol/about/src/Makefile.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= nkabout_s
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS		= \
-		nsAboutProtocolHandler.cpp \
-		nsAboutBlank.cpp \
-		nsAboutBloat.cpp \
-		nsAboutCache.cpp \
-		nsAboutCacheEntry.cpp \
-		$(NULL)
-
-LOCAL_INCLUDES=-I$(srcdir)/../../../base/src
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@@ -30,19 +30,31 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+MODULE         = necko
+LIBRARY_NAME   = nkdata_s
+LIBXUL_LIBRARY = 1
+
+FORCE_STATIC_LIB = 1
+
+CPPSRCS = \
+  nsDataHandler.cpp \
+  nsDataChannel.cpp \
+  $(NULL)
+
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../../base/src \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-

rename from netwerk/protocol/data/src/nsDataChannel.cpp
rename to netwerk/protocol/data/nsDataChannel.cpp

rename from netwerk/protocol/data/src/nsDataChannel.h
rename to netwerk/protocol/data/nsDataChannel.h

rename from netwerk/protocol/data/src/nsDataHandler.cpp
rename to netwerk/protocol/data/nsDataHandler.cpp

rename from netwerk/protocol/data/src/nsDataHandler.h
rename to netwerk/protocol/data/nsDataHandler.h

rename from netwerk/protocol/data/src/nsDataModule.cpp
rename to netwerk/protocol/data/nsDataModule.cpp

deleted file mode 100644
--- a/netwerk/protocol/data/src/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= nkdata_s
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS		= \
-		nsDataHandler.cpp \
-		nsDataChannel.cpp \
-		$(NULL)
-
-LOCAL_INCLUDES=-I$(srcdir)/../../../base/src
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -30,20 +30,41 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+MODULE         = necko
+LIBRARY_NAME   = nkfile_s
+LIBXUL_LIBRARY = 1
+XPIDL_MODULE   = necko_file
+GRE_MODULE     = 1
+
+FORCE_STATIC_LIB = 1
+
+XPIDLSRCS = \
+  nsIFileChannel.idl \
+  nsIFileProtocolHandler.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsFileProtocolHandler.cpp \
+  nsFileChannel.cpp \
+  $(NULL)
+
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../../base/src \
+  -I$(topsrcdir)/xpcom/ds \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET

rename from netwerk/protocol/file/src/nsFileChannel.cpp
rename to netwerk/protocol/file/nsFileChannel.cpp

rename from netwerk/protocol/file/src/nsFileChannel.h
rename to netwerk/protocol/file/nsFileChannel.h

rename from netwerk/protocol/file/src/nsFileProtocolHandler.cpp
rename to netwerk/protocol/file/nsFileProtocolHandler.cpp

rename from netwerk/protocol/file/src/nsFileProtocolHandler.h
rename to netwerk/protocol/file/nsFileProtocolHandler.h

rename from netwerk/protocol/file/public/nsIFileChannel.idl
rename to netwerk/protocol/file/nsIFileChannel.idl

rename from netwerk/protocol/file/public/nsIFileProtocolHandler.idl
rename to netwerk/protocol/file/nsIFileProtocolHandler.idl

deleted file mode 100644
--- a/netwerk/protocol/file/public/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_file
-GRE_MODULE	= 1
-
-XPIDLSRCS	= \
-		nsIFileProtocolHandler.idl \
-		nsIFileChannel.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET

deleted file mode 100644
--- a/netwerk/protocol/file/src/Makefile.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= nkfile_s
-LIBXUL_LIBRARY  = 1
-
-
-CPPSRCS		= \
-		nsFileProtocolHandler.cpp \
-		nsFileChannel.cpp \
-		$(NULL)
-
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-LOCAL_INCLUDES =                        \
-        -I$(srcdir)/../../../base/src   \
-        -I$(topsrcdir)/xpcom/ds         \
-        $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-DEFINES += -DIMPL_NS_NET

--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -30,20 +30,59 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+MODULE         = necko
+LIBRARY_NAME   = nkftp_s
+LIBXUL_LIBRARY = 1
+XPIDL_MODULE   = necko_ftp
+GRE_MODULE     = 1
+
+FORCE_STATIC_LIB = 1
+
+EXPORTS = ftpCore.h
+
+XPIDLSRCS = \
+  nsIFTPChannel.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsFtpProtocolHandler.cpp \
+  nsFTPChannel.cpp \
+  nsFtpConnectionThread.cpp \
+  nsFtpControlConnection.cpp \
+  $(NULL)
+
+# Use -g for Irix mipspro builds as workaround for bug 92099
+ifneq (,$(filter IRIX IRIX64,$(OS_ARCH)))
+ifndef GNU_CC
+MODULE_OPTIMIZE_FLAGS=-O -g
+endif
+endif
+
+LOCAL_INCLUDES = \
+  -I$(srcdir)/../../base/src \
+  -I$(topsrcdir)/xpcom/ds \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+ifndef MOZ_DEBUG
+ifndef NO_LOGGING
+DEFINES += -DFORCE_PR_LOG
+endif
+endif
+endif # WINNT
+
 DEFINES += -DIMPL_NS_NET

rename from netwerk/protocol/ftp/public/ftpCore.h
rename to netwerk/protocol/ftp/ftpCore.h

rename from netwerk/protocol/ftp/src/nsFTPChannel.cpp
rename to netwerk/protocol/ftp/nsFTPChannel.cpp

rename from netwerk/protocol/ftp/src/nsFTPChannel.h
rename to netwerk/protocol/ftp/nsFTPChannel.h

rename from netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
rename to netwerk/protocol/ftp/nsFtpConnectionThread.cpp

rename from netwerk/protocol/ftp/src/nsFtpConnectionThread.h
rename to netwerk/protocol/ftp/nsFtpConnectionThread.h

rename from netwerk/protocol/ftp/src/nsFtpControlConnection.cpp
rename to netwerk/protocol/ftp/nsFtpControlConnection.cpp

rename from netwerk/protocol/ftp/src/nsFtpControlConnection.h
rename to netwerk/protocol/ftp/nsFtpControlConnection.h

rename from netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
rename to netwerk/protocol/ftp/nsFtpProtocolHandler.cpp

rename from netwerk/protocol/ftp/src/nsFtpProtocolHandler.h
rename to netwerk/protocol/ftp/nsFtpProtocolHandler.h

rename from netwerk/protocol/ftp/public/nsIFTPChannel.idl
rename to netwerk/protocol/ftp/nsIFTPChannel.idl

deleted file mode 100644
--- a/netwerk/protocol/ftp/public/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_ftp
-GRE_MODULE	= 1
-
-XPIDLSRCS	= \
-	nsIFTPChannel.idl \
-	$(NULL)
-
-EXPORTS		= ftpCore.h
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET