diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak
index cdf7ef86e64..0a888131bb3 100644
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -214,7 +214,6 @@ CFLAGS=$(CFLAGS) -D_IMPL_NS_HTMLPARS
 CFLAGS=$(CFLAGS) -D_IMPL_NS_INTL
 CFLAGS=$(CFLAGS) -D_IMPL_NS_LAYOUT
 CFLAGS=$(CFLAGS) -D_IMPL_NS_MSG_BASE
-CFLAGS=$(CFLAGS) -D_IMPL_NS_NET
 CFLAGS=$(CFLAGS) -D_IMPL_NS_PICS
 CFLAGS=$(CFLAGS) -D_IMPL_NS_PLUGIN
 CFLAGS=$(CFLAGS) -D_IMPL_NS_RDF
diff --git a/mozilla/extensions/datetime/Makefile.in b/mozilla/extensions/datetime/Makefile.in
index 2ebfeb7323b..1fa2cb30e13 100644
--- a/mozilla/extensions/datetime/Makefile.in
+++ b/mozilla/extensions/datetime/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/extensions/finger/Makefile.in b/mozilla/extensions/finger/Makefile.in
index eb6a99772be..fe759471acd 100644
--- a/mozilla/extensions/finger/Makefile.in
+++ b/mozilla/extensions/finger/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/base/public/netCore.h b/mozilla/netwerk/base/public/netCore.h
index d1b6c610719..498429bb0c6 100644
--- a/mozilla/netwerk/base/public/netCore.h
+++ b/mozilla/netwerk/base/public/netCore.h
@@ -98,21 +98,6 @@
 #define NS_ERROR_REDIRECT_LOOP \
     NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 31)
 
-#undef NS_NET
-#ifdef _IMPL_NS_NET
-#if defined(XP_PC) && !defined(XP_OS2)
-#define NS_NET _declspec(dllexport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#else  /* !_IMPL_NS_NET */
-#if defined(XP_PC) && !defined(XP_OS2)
-#define NS_NET _declspec(dllimport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#endif /* !_IMPL_NS_NET */
-
 // Where most necko status messages come from:
 #define NECKO_MSGS_URL  "chrome://necko/locale/necko.properties"
 
diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in
index aab7004e901..4f9e6a6370d 100644
--- a/mozilla/netwerk/base/src/Makefile.in
+++ b/mozilla/netwerk/base/src/Makefile.in
@@ -94,8 +94,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -D_IMPL_NS_NET
-
 # For fruncate
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -D_BSD_SOURCE
diff --git a/mozilla/netwerk/base/src/makefile.win b/mozilla/netwerk/base/src/makefile.win
index 5dda629ffd0..020f4dc9e59 100644
--- a/mozilla/netwerk/base/src/makefile.win
+++ b/mozilla/netwerk/base/src/makefile.win
@@ -31,7 +31,7 @@ REQUIRES	= xpcom \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 LIBRARY_NAME=neckobase_s
 
diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in
index 1d4ef9e17a4..aa59129c3bb 100644
--- a/mozilla/netwerk/build/Makefile.in
+++ b/mozilla/netwerk/build/Makefile.in
@@ -98,7 +98,6 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES                += -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES                += -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/build/makefile.win b/mozilla/netwerk/build/makefile.win
index 73d586825b5..e4c2551a235 100644
--- a/mozilla/netwerk/build/makefile.win
+++ b/mozilla/netwerk/build/makefile.win
@@ -40,7 +40,7 @@ REQUIRES	= xpcom \
 
 include <$(DEPTH)/config/config.mak>
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 EXPORTS =          \
         nsNetCID.h \
diff --git a/mozilla/netwerk/build2/Makefile.in b/mozilla/netwerk/build2/Makefile.in
index 0ac8949a595..67cef053102 100644
--- a/mozilla/netwerk/build2/Makefile.in
+++ b/mozilla/netwerk/build2/Makefile.in
@@ -61,7 +61,6 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES                += -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES                += -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/build2/makefile.win b/mozilla/netwerk/build2/makefile.win
index 48049b32fcb..8e1b5f8a08d 100644
--- a/mozilla/netwerk/build2/makefile.win
+++ b/mozilla/netwerk/build2/makefile.win
@@ -30,7 +30,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  $(NULL)
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS=                            \
         .\$(OBJDIR)\nsNetModule2.obj \
diff --git a/mozilla/netwerk/cache/src/Makefile.in b/mozilla/netwerk/cache/src/Makefile.in
index cb00dceb793..03f68bb2d9d 100644
--- a/mozilla/netwerk/cache/src/Makefile.in
+++ b/mozilla/netwerk/cache/src/Makefile.in
@@ -70,7 +70,6 @@ EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/cache/src/makefile.win b/mozilla/netwerk/cache/src/makefile.win
index cc4c00167f0..dd7116ca1bb 100755
--- a/mozilla/netwerk/cache/src/makefile.win
+++ b/mozilla/netwerk/cache/src/makefile.win
@@ -32,7 +32,7 @@ REQUIRES	= xpcom \
 
 include <$(DEPTH)/config/config.mak>
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 EXPORTS = \
 		nsCacheService.h \
diff --git a/mozilla/netwerk/dns/src/Makefile.in b/mozilla/netwerk/dns/src/Makefile.in
index c341b9f3606..de403e15cb8 100644
--- a/mozilla/netwerk/dns/src/Makefile.in
+++ b/mozilla/netwerk/dns/src/Makefile.in
@@ -46,7 +46,6 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/dns/src/makefile.win b/mozilla/netwerk/dns/src/makefile.win
index 8d210aaa926..6b835f24b15 100644
--- a/mozilla/netwerk/dns/src/makefile.win
+++ b/mozilla/netwerk/dns/src/makefile.win
@@ -25,7 +25,7 @@ REQUIRES	= xpcom \
 		  string \
 		  pref \
 		  $(NULL)
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 LIBRARY_NAME=neckodns_s
 
diff --git a/mozilla/netwerk/macbuild/NetwerkSharedPrefix.h b/mozilla/netwerk/macbuild/NetwerkSharedPrefix.h
index 96d644a38df..eca0f7b312d 100644
--- a/mozilla/netwerk/macbuild/NetwerkSharedPrefix.h
+++ b/mozilla/netwerk/macbuild/NetwerkSharedPrefix.h
@@ -20,7 +20,4 @@
  * Contributor(s): 
  */
 
-/* Defining the following causes NS_NET to be defined as NS_EXPORT. */
-#define _IMPL_NS_NET
-
 #include "MacSharedPrefix.h"
diff --git a/mozilla/netwerk/macbuild/NetwerkSharedPrefix_debug.h b/mozilla/netwerk/macbuild/NetwerkSharedPrefix_debug.h
index cf57c2f7c78..caf573fbcfe 100644
--- a/mozilla/netwerk/macbuild/NetwerkSharedPrefix_debug.h
+++ b/mozilla/netwerk/macbuild/NetwerkSharedPrefix_debug.h
@@ -20,8 +20,5 @@
  * Contributor(s): 
  */
 
-/* Defining the following causes NS_NET to be defined as NS_EXPORT. */
-#define _IMPL_NS_NET
-
 #include "MacSharedPrefix_debug.h"
 
diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in
index f246eba0743..325444af738 100644
--- a/mozilla/netwerk/mime/src/Makefile.in
+++ b/mozilla/netwerk/mime/src/Makefile.in
@@ -46,7 +46,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/mime/src/makefile.win b/mozilla/netwerk/mime/src/makefile.win
index 938c6c3d178..6cb4f139e86 100644
--- a/mozilla/netwerk/mime/src/makefile.win
+++ b/mozilla/netwerk/mime/src/makefile.win
@@ -34,7 +34,7 @@ LLIBS= $(LLIBS) \
         $(LIBNSPR) \
         $(NULL)
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                  \
         .\$(OBJDIR)\nsMIMEInfoImpl.obj      \
diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in
index 9cf71beed62..6259b94c93b 100644
--- a/mozilla/netwerk/protocol/about/src/Makefile.in
+++ b/mozilla/netwerk/protocol/about/src/Makefile.in
@@ -51,7 +51,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/about/src/makefile.win b/mozilla/netwerk/protocol/about/src/makefile.win
index b2f72121f8f..11dc38d6d35 100644
--- a/mozilla/netwerk/protocol/about/src/makefile.win
+++ b/mozilla/netwerk/protocol/about/src/makefile.win
@@ -32,7 +32,7 @@ include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkabout_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS=                                      \
 	.\$(OBJDIR)\nsAboutProtocolHandler.obj \
diff --git a/mozilla/netwerk/protocol/data/src/Makefile.in b/mozilla/netwerk/protocol/data/src/Makefile.in
index 9dff153e43b..a1bd3c02447 100644
--- a/mozilla/netwerk/protocol/data/src/Makefile.in
+++ b/mozilla/netwerk/protocol/data/src/Makefile.in
@@ -43,7 +43,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/data/src/makefile.win b/mozilla/netwerk/protocol/data/src/makefile.win
index 3193e5e4a51..b6dc85332cd 100644
--- a/mozilla/netwerk/protocol/data/src/makefile.win
+++ b/mozilla/netwerk/protocol/data/src/makefile.win
@@ -26,7 +26,7 @@ REQUIRES	= xpcom \
 
 LIBRARY_NAME=nkdata_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                 \
         .\$(OBJDIR)\nsDataHandler.obj      \
diff --git a/mozilla/netwerk/protocol/datetime/src/Makefile.in b/mozilla/netwerk/protocol/datetime/src/Makefile.in
index 2ebfeb7323b..1fa2cb30e13 100644
--- a/mozilla/netwerk/protocol/datetime/src/Makefile.in
+++ b/mozilla/netwerk/protocol/datetime/src/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/datetime/src/makefile.win b/mozilla/netwerk/protocol/datetime/src/makefile.win
index 75fd8438c9e..3f878794483 100644
--- a/mozilla/netwerk/protocol/datetime/src/makefile.win
+++ b/mozilla/netwerk/protocol/datetime/src/makefile.win
@@ -27,7 +27,7 @@ REQUIRES= xpcom \
 
 LIBRARY_NAME=nkdatetm_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                 \
         .\$(OBJDIR)\nsDateTimeHandler.obj      \
diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in
index 57d270d5ce7..4421193e6f2 100644
--- a/mozilla/netwerk/protocol/file/src/Makefile.in
+++ b/mozilla/netwerk/protocol/file/src/Makefile.in
@@ -46,7 +46,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/file/src/makefile.win b/mozilla/netwerk/protocol/file/src/makefile.win
index c1db5852250..a616aff9923 100644
--- a/mozilla/netwerk/protocol/file/src/makefile.win
+++ b/mozilla/netwerk/protocol/file/src/makefile.win
@@ -31,7 +31,7 @@ include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkfile_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS=                                      \
 	.\$(OBJDIR)\nsFileChannel.obj          \
diff --git a/mozilla/netwerk/protocol/finger/src/Makefile.in b/mozilla/netwerk/protocol/finger/src/Makefile.in
index eb6a99772be..fe759471acd 100644
--- a/mozilla/netwerk/protocol/finger/src/Makefile.in
+++ b/mozilla/netwerk/protocol/finger/src/Makefile.in
@@ -44,7 +44,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/finger/src/makefile.win b/mozilla/netwerk/protocol/finger/src/makefile.win
index b071a919c66..3aedee99501 100644
--- a/mozilla/netwerk/protocol/finger/src/makefile.win
+++ b/mozilla/netwerk/protocol/finger/src/makefile.win
@@ -28,7 +28,7 @@ REQUIRES= xpcom \
 
 LIBRARY_NAME=nkfinger_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                 \
         .\$(OBJDIR)\nsFingerHandler.obj      \
diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in
index d93c608d031..f6a9be29768 100644
--- a/mozilla/netwerk/protocol/ftp/src/Makefile.in
+++ b/mozilla/netwerk/protocol/ftp/src/Makefile.in
@@ -58,7 +58,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 ifndef MOZ_DEBUG
diff --git a/mozilla/netwerk/protocol/ftp/src/makefile.win b/mozilla/netwerk/protocol/ftp/src/makefile.win
index 3b52b66eb3d..ed66c6b4b0c 100644
--- a/mozilla/netwerk/protocol/ftp/src/makefile.win
+++ b/mozilla/netwerk/protocol/ftp/src/makefile.win
@@ -32,7 +32,7 @@ DEPTH = ..\..\..\..
 
 LIBRARY_NAME=nkftp_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 !ifndef MOZ_DEBUG
 !ifndef NO_LOGGING
diff --git a/mozilla/netwerk/protocol/gopher/src/Makefile.in b/mozilla/netwerk/protocol/gopher/src/Makefile.in
index eb43b6bd6da..ec6196a4e4c 100644
--- a/mozilla/netwerk/protocol/gopher/src/Makefile.in
+++ b/mozilla/netwerk/protocol/gopher/src/Makefile.in
@@ -45,7 +45,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/gopher/src/makefile.win b/mozilla/netwerk/protocol/gopher/src/makefile.win
index a229d5bb539..84dc5d830b2 100644
--- a/mozilla/netwerk/protocol/gopher/src/makefile.win
+++ b/mozilla/netwerk/protocol/gopher/src/makefile.win
@@ -29,7 +29,7 @@ REQUIRES	= xpcom \
 
 LIBRARY_NAME=nkgopher_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                 \
         .\$(OBJDIR)\nsGopherHandler.obj      \
diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in
index 3f9dda52eef..f2a1f192a94 100644
--- a/mozilla/netwerk/protocol/http/src/Makefile.in
+++ b/mozilla/netwerk/protocol/http/src/Makefile.in
@@ -64,7 +64,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/http/src/makefile.win b/mozilla/netwerk/protocol/http/src/makefile.win
index b1910164219..3e27ab4ec60 100644
--- a/mozilla/netwerk/protocol/http/src/makefile.win
+++ b/mozilla/netwerk/protocol/http/src/makefile.win
@@ -37,7 +37,7 @@ include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkhttp_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS=		                         \
 	.\$(OBJDIR)\nsHttp.obj		         \
diff --git a/mozilla/netwerk/protocol/jar/src/Makefile.in b/mozilla/netwerk/protocol/jar/src/Makefile.in
index a9a819bfaeb..fe7d5b6340b 100644
--- a/mozilla/netwerk/protocol/jar/src/Makefile.in
+++ b/mozilla/netwerk/protocol/jar/src/Makefile.in
@@ -51,7 +51,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/jar/src/makefile.win b/mozilla/netwerk/protocol/jar/src/makefile.win
index c74672f9603..c57966d8dc6 100644
--- a/mozilla/netwerk/protocol/jar/src/makefile.win
+++ b/mozilla/netwerk/protocol/jar/src/makefile.win
@@ -34,7 +34,7 @@ REQUIRES	= xpcom \
 
 LIBRARY_NAME=nkjar_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS=                                    \
 	.\$(OBJDIR)\nsJARURI.obj             \
diff --git a/mozilla/netwerk/protocol/res/src/Makefile.in b/mozilla/netwerk/protocol/res/src/Makefile.in
index 865ac163680..a0fa6bac1fb 100644
--- a/mozilla/netwerk/protocol/res/src/Makefile.in
+++ b/mozilla/netwerk/protocol/res/src/Makefile.in
@@ -49,7 +49,6 @@ LOCAL_INCLUDES =                        \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/res/src/makefile.win b/mozilla/netwerk/protocol/res/src/makefile.win
index 4fcf8ab8d35..fa0c4a6a1ff 100644
--- a/mozilla/netwerk/protocol/res/src/makefile.win
+++ b/mozilla/netwerk/protocol/res/src/makefile.win
@@ -28,7 +28,7 @@ REQUIRES	= xpcom \
 
 LIBRARY_NAME=nkres_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS=                                    \
 	.\$(OBJDIR)\nsResProtocolHandler.obj \
diff --git a/mozilla/netwerk/protocol/viewsource/src/Makefile.in b/mozilla/netwerk/protocol/viewsource/src/Makefile.in
index 62069543725..de2bd3fb253 100644
--- a/mozilla/netwerk/protocol/viewsource/src/Makefile.in
+++ b/mozilla/netwerk/protocol/viewsource/src/Makefile.in
@@ -45,7 +45,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/protocol/viewsource/src/makefile.win b/mozilla/netwerk/protocol/viewsource/src/makefile.win
index 07b4613d886..103de56e869 100644
--- a/mozilla/netwerk/protocol/viewsource/src/makefile.win
+++ b/mozilla/netwerk/protocol/viewsource/src/makefile.win
@@ -31,7 +31,7 @@ REQUIRES	= xpcom \
 
 LIBRARY_NAME=nkviewsource_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                 \
         .\$(OBJDIR)\nsViewSourceHandler.obj      \
diff --git a/mozilla/netwerk/streamconv/converters/Makefile.in b/mozilla/netwerk/streamconv/converters/Makefile.in
index f41c9506ae9..17af6653ad1 100644
--- a/mozilla/netwerk/streamconv/converters/Makefile.in
+++ b/mozilla/netwerk/streamconv/converters/Makefile.in
@@ -67,7 +67,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
 endif
diff --git a/mozilla/netwerk/streamconv/converters/makefile.win b/mozilla/netwerk/streamconv/converters/makefile.win
index fac26da5cfa..07e97ce5046 100644
--- a/mozilla/netwerk/streamconv/converters/makefile.win
+++ b/mozilla/netwerk/streamconv/converters/makefile.win
@@ -37,7 +37,7 @@ include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkcnvts_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET -DZLIB_DLL
+LCFLAGS = -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
 # Add this for performance TXT-HTML performance #'s: -DMOZ_PERF_METRICS
 
 EXPORTS =                 \
diff --git a/mozilla/netwerk/streamconv/src/Makefile.in b/mozilla/netwerk/streamconv/src/Makefile.in
index 19f1f8dddf7..5e9148c0f63 100644
--- a/mozilla/netwerk/streamconv/src/Makefile.in
+++ b/mozilla/netwerk/streamconv/src/Makefile.in
@@ -42,7 +42,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_NET
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 endif
diff --git a/mozilla/netwerk/streamconv/src/makefile.win b/mozilla/netwerk/streamconv/src/makefile.win
index a85b445d98d..0a90fda375a 100644
--- a/mozilla/netwerk/streamconv/src/makefile.win
+++ b/mozilla/netwerk/streamconv/src/makefile.win
@@ -27,7 +27,7 @@ include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME=nkconv_s
 
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
+LCFLAGS = -DWIN32_LEAN_AND_MEAN
 
 CPP_OBJS =                                       \
         .\$(OBJDIR)\nsStreamConverterService.obj \
diff --git a/mozilla/xpcom/base/nsComObsolete.h b/mozilla/xpcom/base/nsComObsolete.h
index 71af641b680..658196f04bc 100644
--- a/mozilla/xpcom/base/nsComObsolete.h
+++ b/mozilla/xpcom/base/nsComObsolete.h
@@ -43,12 +43,6 @@
 #define NS_BASE NS_IMPORT
 #endif
 
-#ifdef _IMPL_NS_NET
-#define NS_NET NS_EXPORT
-#else
-#define NS_NET NS_IMPORT
-#endif
-
 #ifdef _IMPL_NS_DOM
 #define NS_DOM NS_EXPORT
 #else