diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index a6be01d4cc7..6cdf0e73502 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -480,6 +480,10 @@ ifdef STANDALONE_IMAGE_LIB
 DEFINES		+= -DSTANDALONE_IMAGE_LIB
 endif
 
+ifdef MODULAR_NETLIB
+DEFINES 	+= -DMODULAR_NETLIB
+endif
+
 ######################################################################
 
 GARBAGE		= $(DEPENDENCIES) core $(wildcard core.[0-9]*)
diff --git a/mozilla/lib/xp/Makefile b/mozilla/lib/xp/Makefile
index 5be8ee5a829..7251202da0d 100644
--- a/mozilla/lib/xp/Makefile
+++ b/mozilla/lib/xp/Makefile
@@ -22,13 +22,14 @@ DEPTH		= ../..
 MODULE		= xp
 LIBRARY_NAME	= xp
 
-CSRCS		= xp_alloc.c \
+ifndef MODULAR_NETLIB
+CSRCS		= \
+		  xp_alloc.c \
 		  xp_cntxt.c \
 		  xp_core.c \
 		  xp_error.c \
-		  xp_file.c \
 		  xp_hash.c \
-		  xp_list.c \
+		  xp_intl.c \
 		  xp_ncent.c \
 		  xp_reg.c \
 		  xp_rgb.c \
@@ -41,11 +42,18 @@ CSRCS		= xp_alloc.c \
 		  xpassert.c \
 		  xplocale.c \
 		  $(NULL)
+else
+CSRCS =		  xp_stub.c 
+endif
+
+CSRCS +=          \
+	 	  xp_file.c \
+		  xp_list.c \
+		  allxpstr.c \
+		  $(NULL)
 
 REQUIRES	= js nspr dbm security img util jtools layer java lay style pref rdf
 
-CSRCS		+= allxpstr.c xp_intl.c
-
 ifeq ($(STAND_ALONE_JAVA),1)
 CSRCS		= xp_qsort.c
 endif
diff --git a/mozilla/network/Makefile b/mozilla/network/Makefile
index 2292af6decc..d0e34ca165e 100644
--- a/mozilla/network/Makefile
+++ b/mozilla/network/Makefile
@@ -24,8 +24,13 @@ DIRS	= \
 	cache		\
 	client		\
 	cnvts		\
+	mimetype	\
 	main		\
-	protocol	\
+	protocol
+
+ifdef MODULAR_NETLIB
+DIRS	+= module
+endif
 
 include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/network/cnvts/Makefile b/mozilla/network/cnvts/Makefile
index 7c4be9a8736..1617b557e2b 100644
--- a/mozilla/network/cnvts/Makefile
+++ b/mozilla/network/cnvts/Makefile
@@ -27,14 +27,19 @@ CSRCS		= \
 	cvdisk.c	\
 	cvextcon.c	\
 	cvjscfg.c	\
-	cvmime.c	\
-	cvpics.c	\
 	cvsimple.c	\
 	cvunzip.c	\
 	cvview.c	\
 	txview.c	\
 	$(NULL)
 
+ifndef MODULAR_NETLIB
+CSRCS += \
+	cvmime.c	\
+	cvpics.c	\
+	$(NULL)
+endif
+
 EXPORTS= \
 	cvactive.h	\
 	cvview.h	\
@@ -44,13 +49,18 @@ EXPORTS= \
     cvchunk.h   \
     cvcolor.h   \
     cvdisk.h    \
-    cvmime.h    \
-    cvpics.h    \
     cvsimple.h  \
     cvunzip.h   \
     cvjscfg.h
 
+ifndef MODULAR_NETLIB
+EXPORTS += \
+    cvmime.h    \
+    cvpics.h    \
+    $(NULL)
+endif
+
 REQUIRES	= network img lay layer util parse pref js \
-	security marimurl style zlib softupdt
+	security marimurl style zlib softupdt mimetype
 
 include $(DEPTH)/config/rules.mk
diff --git a/mozilla/network/main/Makefile b/mozilla/network/main/Makefile
index ccffba59cd7..238d998b07b 100644
--- a/mozilla/network/main/Makefile
+++ b/mozilla/network/main/Makefile
@@ -28,31 +28,36 @@ CSRCS		= \
 	jscookie.c	\
 	mkautocf.c	\
 	mkconect.c	\
-	mkformat.c	\
 	mkfsort.c	\
 	mkgeturl.c	\
 	mkhelp.c	\
-	mkinit.c	\
 	mkmessag.c	\
 	mkpadpac.c	\
 	mkparse.c	\
 	mkselect.c	\
 	mksockrw.c	\
 	mksort.c	\
-	mkstream.c	\
 	mktrace.c	\
 	mkutils.c	\
 	prefetch.c	\
 	unix-dns.c	\
 	$(NULL)
 
-EXPORTS= mkstream.h mkformat.h mkparse.h mkfsort.h mksort.h mkgeturl.h \
+ifndef MODULAR_NETLIB
+CSRCS += \
+	mkinit.c	\
+	mkstream.c	\
+	$(NULL)
+endif
+
+EXPORTS= mkstream.h mkparse.h mkfsort.h mksort.h mkgeturl.h \
 	mkselect.h mktcp.h netutils.h mkpadpac.h mkautocf.h mkhelp.h \
         mkutils.h mktrace.h
 
 
 REQUIRES	= jtools nspr2 dbm util js parse lay style pref htmldlgs java \
-	libfont netcache httpurl cnetinit security img layer netcnvts network
+	libfont netcache httpurl cnetinit security img layer netcnvts network \
+	mimetype
 
 include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/network/mimetype/Makefile b/mozilla/network/mimetype/Makefile
index ccffba59cd7..bef5e2f4607 100644
--- a/mozilla/network/mimetype/Makefile
+++ b/mozilla/network/mimetype/Makefile
@@ -17,53 +17,67 @@
 
 DEPTH		= ../..
 
-MODULE		= network
-LIBRARY_NAME	= network
-
-ifdef MOZ_MAIL_NEWS
-CPPSRCS= mkabook.cpp	
-endif
+MODULE		= mimetype
+LIBRARY_NAME	= mimetype
 
 CSRCS		= \
-	jscookie.c	\
-	mkautocf.c	\
-	mkconect.c	\
 	mkformat.c	\
-	mkfsort.c	\
-	mkgeturl.c	\
-	mkhelp.c	\
-	mkinit.c	\
-	mkmessag.c	\
-	mkpadpac.c	\
-	mkparse.c	\
-	mkselect.c	\
-	mksockrw.c	\
-	mksort.c	\
-	mkstream.c	\
-	mktrace.c	\
-	mkutils.c	\
-	prefetch.c	\
-	unix-dns.c	\
 	$(NULL)
 
-EXPORTS= mkstream.h mkformat.h mkparse.h mkfsort.h mksort.h mkgeturl.h \
-	mkselect.h mktcp.h netutils.h mkpadpac.h mkautocf.h mkhelp.h \
-        mkutils.h mktrace.h
+EXPORTS=mkformat.h
 
+include $(DEPTH)/config/config.mk
 
-REQUIRES	= jtools nspr2 dbm util js parse lay style pref htmldlgs java \
-	libfont netcache httpurl cnetinit security img layer netcnvts network
+REQUIRES	= nspr2 network img layer util
 
 include $(DEPTH)/config/rules.mk
 
-TEST_LIBS	= $(LIBRARY) \
-		  $(DIST)/lib/liburl.$(LIB_SUFFIX) \
-		  $(DIST)/lib/libsec-us.$(LIB_SUFFIX) \
-		  $(DIST)/lib/libdbm.$(LIB_SUFFIX) \
-		  $(DIST)/lib/libxp.$(LIB_SUFFIX) \
-		  $(DIST)/lib/nspr.$(LIB_SUFFIX)
+#
+# This converts mime.types to C source code,
+#  and also to an HTML table that shows what's in it.
+#
+MIME_TYPES		= ./mime.types
+MIME_TYPES_UNIX		= ./mime.types-unix
+MIME_TYPES_NONUNIX	= ./mime.types-nonunix
+AD2C			= sh $(DEPTH)/cmd/xfe/ad2c
 
-test:
-	$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS)
-	$(CC) -g -o $(OBJDIR)/stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS)
+mktypes.h: $(MIME_TYPES) $(MIME_TYPES_UNIX) $(MIME_TYPES_NONUNIX)
+	rm -f $@
+	@echo "generating $@ from $<..."			; \
+	 (echo '/* Generated file - do not edit! */'		; \
+	  echo ''						; \
+	  cat $(MIME_TYPES) | grep -v '^#' | $(AD2C)		; \
+	  echo ''						; \
+	  echo '#ifdef XP_UNIX'					; \
+	  cat $(MIME_TYPES_UNIX) | grep -v '^#' | $(AD2C)	; \
+	  echo '#else  /* !XP_UNIX */'				; \
+	  cat $(MIME_TYPES_NONUNIX) | grep -v '^#' | $(AD2C)	; \
+	  echo '#endif /* !XP_UNIX */'				; \
+	 ) > $@
+
+mime-types.html: $(MIME_TYPES) $(MIME_TYPES_UNIX)
+	rm -f $@
+	@echo "generating $@ from $<..."				; \
+	 (echo '<TITLE>Netscape MIME Types</TITLE>'			; \
+	  echo '<H1 ALIGN=CENTER>Netscape MIME Types</H1>'		; \
+	  echo '<CENTER>'						; \
+	  echo '<TABLE BORDER CELLSPACING=0 CELLPADDING=5>'		; \
+	  echo '<TR><TH></TH><TH>Content Type:</TH>'			; \
+	  echo '<TH>Extensions:</TH><TH>Description:</TH></TR>'		; \
+	  echo '<TR></TR><TR></TR><TR></TR>'	; \
+	  cat $(MIME_TYPES) $(MIME_TYPES_UNIX) | grep -v '^#' |		   \
+	  sed  's@exts="\([^"]*\)"[ 	]*[\]*@<TR><TD><TT>\1</TT></TD>@;  \
+		s@desc="\([^"]*\)"[ 	]*[\]*@<TD>\1</TD>@;		   \
+		s@enc=\([^ 	]*\)[ 	]*[\]*$$@<TD>encoding/\1</TD>@;	   \
+		s@type=\([^ 	]*\)[ 	]*[\]*$$@<TD>\1</TD>@;		   \
+		s@icon=\([^ 	]*\)[ 	]*[\]*$$@<TD><IMG SRC=\1></TD></TR>@'\
+	  | sed 's/,/ /g'						  \
+	  | awk '{if ( $$0 ~ /^<TR/ ) {printf "%s" , $$0}		  \
+		  else {printf "%s\n" , $$0} }'				  \
+	  | sed 's@\(<TR>\)\(<TD>.*</TD>\)\(<TD>.*</TD>\)\(<TD>.*</TD>\)\(<TD>.*</TD>\)\(</TR>\)$$@\1\5!\3!\2!\4\6@' \
+	  | tr '!' '\012'						  \
+	  | sed 's@<TD></TD>@<TD>\&nbsp;</TD>@'				; \
+	  echo '</TABLE>'						; \
+	  echo '</CENTER>'						; \
+	 ) > $@
 
diff --git a/mozilla/network/module/Makefile b/mozilla/network/module/Makefile
new file mode 100644
index 00000000000..923dab4780c
--- /dev/null
+++ b/mozilla/network/module/Makefile
@@ -0,0 +1,49 @@
+#!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
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH			= ../..
+
+MODULE			= netlib
+LIBRARY_NAME		= netlib
+
+CPPSRCS			= \
+			  nsNetService.cpp    \
+			  nsNetStream.cpp     \
+			  nsURL.cpp           \
+			  nsHttpUrl.cpp       \
+			  nsStubContext.cpp   \
+			  nsNetStubs.cpp      \
+			  $(NULL)
+
+REQUIRES		= raptor js dbm nspr security pref xpcom util img \
+			  layer network netcache fileurl ftpurl abouturl \
+			  httpurl gophurl remoturl
+
+EXPORTS = nsIStreamListener.h           \
+          nsINetService.h               \
+          nsIURL.h                      \
+          nsIPostToServer.h             \
+          nsIHttpUrl.h                  \
+          $(NULL)
+
+include $(DEPTH)/config/config.mk
+
+include $(DEPTH)/config/rules.mk
+
+$(LIBRARY): \
+	$(OBJS)
+
diff --git a/mozilla/network/module/nsNetService.cpp b/mozilla/network/module/nsNetService.cpp
index 7f53e03ef1f..5e8ffec0192 100644
--- a/mozilla/network/module/nsNetService.cpp
+++ b/mozilla/network/module/nsNetService.cpp
@@ -38,8 +38,13 @@ extern "C" {
 #include "remoturl.h"
 #include "netcache.h"
 
+#if defined(XP_WIN) || defined(XP_OS2)
 extern char *XP_AppCodeName;
 extern char *XP_AppVersion;
+#else
+extern const char *XP_AppCodeName;
+extern const char *XP_AppVersion;
+#endif
 };
 
 /*
@@ -70,11 +75,9 @@ nsNetlibService::nsNetlibService()
     /* Initialize netlib with 32 sockets... */
     NET_InitNetLib(0, 32);
 
-
     /* XXX: How should the User Agent get initialized? */
     XP_AppCodeName = strdup("Mozilla");
     XP_AppVersion = strdup("5.0 Netscape/5.0 (Windows;I;x86;en)");
-
 }
 
 
diff --git a/mozilla/network/module/nsNetStream.cpp b/mozilla/network/module/nsNetStream.cpp
index 073e8783c9c..c108e933649 100644
--- a/mozilla/network/module/nsNetStream.cpp
+++ b/mozilla/network/module/nsNetStream.cpp
@@ -23,7 +23,7 @@
 
 /* XXX: Declare NET_PollSockets(...) for the blocking stream hack... */
 extern "C" {
-    PRBool NET_PollSockets(void);
+    XP_Bool NET_PollSockets(void);
 };
 
 
diff --git a/mozilla/network/protocol/Makefile b/mozilla/network/protocol/Makefile
index a7be1bc9571..b8ca67af59e 100644
--- a/mozilla/network/protocol/Makefile
+++ b/mozilla/network/protocol/Makefile
@@ -20,14 +20,19 @@
 DEPTH	= ../..
 
 DIRS	= about	\
-	dataurl	\
 	file	\
 	ftp	\
 	gopher	\
 	http	\
+	remote
+
+ifndef MODULAR_NETLIB
+DIRS += \
+	dataurl	\
 	js	\
 	marimba	\
-	remote
+	$(NULL)
+endif
 
 include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/network/protocol/file/Makefile b/mozilla/network/protocol/file/Makefile
index c5dd7d7c63a..ade291a93e0 100644
--- a/mozilla/network/protocol/file/Makefile
+++ b/mozilla/network/protocol/file/Makefile
@@ -27,7 +27,7 @@ CSRCS		= \
 EXPORTS= fileurl.h
 
 REQUIRES	= network nspr2 dbm util pref js java fileurl \
-	security layer img httpurl jtools
+	security layer img httpurl jtools mimetype
 
 include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/network/protocol/ftp/Makefile b/mozilla/network/protocol/ftp/Makefile
index d0d34482be3..ca29c02636f 100644
--- a/mozilla/network/protocol/ftp/Makefile
+++ b/mozilla/network/protocol/ftp/Makefile
@@ -27,7 +27,7 @@ CSRCS		= \
 EXPORTS= ftpurl.h
 
 REQUIRES	= network nspr2 dbm util pref js java fileurl \
-	security layer img httpurl
+	security layer img httpurl mimetype
 
 include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/network/protocol/gopher/Makefile b/mozilla/network/protocol/gopher/Makefile
index 61d34702890..8a5ddc3d944 100644
--- a/mozilla/network/protocol/gopher/Makefile
+++ b/mozilla/network/protocol/gopher/Makefile
@@ -27,7 +27,7 @@ CSRCS		= \
 EXPORTS= gophurl.h
 
 REQUIRES	= network nspr2 dbm util pref js java fileurl \
-	security layer img httpurl remoturl
+	security layer img httpurl remoturl mimetype
 
 include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/network/protocol/http/Makefile b/mozilla/network/protocol/http/Makefile
index 05ede882143..62d462884e6 100644
--- a/mozilla/network/protocol/http/Makefile
+++ b/mozilla/network/protocol/http/Makefile
@@ -28,7 +28,7 @@ CSRCS		= \
 EXPORTS= httpurl.h httpauth.h cookies.h jscookie.h
 
 REQUIRES	= netcache network nspr2 dbm util pref js java fileurl \
-	security layer img httpurl
+	security layer img httpurl mimetype
 
 include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/network/protocol/http/httpurl.h b/mozilla/network/protocol/http/httpurl.h
index 208505abd49..398e6345a58 100644
--- a/mozilla/network/protocol/http/httpurl.h
+++ b/mozilla/network/protocol/http/httpurl.h
@@ -20,7 +20,7 @@
 #define MKHTTP_H
 
 #ifndef MKGETURL_H
-#include "MKGetURL.h"
+#include "mkgeturl.h"
 #endif /* MKGETURL_H */
 
 #define DEF_HTTP_PORT 80