diff --git a/mozilla/extensions/datetime/nsDateTimeChannel.h b/mozilla/extensions/datetime/nsDateTimeChannel.h
index e10f74e2f53..e80a83681c8 100644
--- a/mozilla/extensions/datetime/nsDateTimeChannel.h
+++ b/mozilla/extensions/datetime/nsDateTimeChannel.h
@@ -27,7 +27,7 @@
 #ifndef nsDateTimeChannel_h___
 #define nsDateTimeChannel_h___
 
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsILoadGroup.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
diff --git a/mozilla/extensions/finger/nsFingerChannel.h b/mozilla/extensions/finger/nsFingerChannel.h
index 10b18fdd4ef..8681a68cd17 100644
--- a/mozilla/extensions/finger/nsFingerChannel.h
+++ b/mozilla/extensions/finger/nsFingerChannel.h
@@ -23,7 +23,7 @@
 #ifndef nsFingerChannel_h___
 #define nsFingerChannel_h___
 
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsILoadGroup.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
diff --git a/mozilla/netwerk/mime/src/nsMIMEService.cpp b/mozilla/netwerk/mime/src/nsMIMEService.cpp
index 3ff96b712c6..e85066a58c5 100644
--- a/mozilla/netwerk/mime/src/nsMIMEService.cpp
+++ b/mozilla/netwerk/mime/src/nsMIMEService.cpp
@@ -22,7 +22,7 @@
 
 #include "nsMIMEService.h"
 #include "nsVoidArray.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsMIMEInfoImpl.h"
 #include "nsIURL.h"
 #include "nsCOMPtr.h"
diff --git a/mozilla/netwerk/protocol/data/src/nsDataChannel.h b/mozilla/netwerk/protocol/data/src/nsDataChannel.h
index 5efe010e876..c1694c237e3 100644
--- a/mozilla/netwerk/protocol/data/src/nsDataChannel.h
+++ b/mozilla/netwerk/protocol/data/src/nsDataChannel.h
@@ -27,7 +27,7 @@
 
 #include "nsIDataChannel.h"
 #include "nsIURI.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsIEventQueue.h"
 #include "nsILoadGroup.h"
 #include "nsIStreamListener.h"
diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h
index e10f74e2f53..e80a83681c8 100644
--- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h
+++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.h
@@ -27,7 +27,7 @@
 #ifndef nsDateTimeChannel_h___
 #define nsDateTimeChannel_h___
 
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsILoadGroup.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h
index 10b18fdd4ef..8681a68cd17 100644
--- a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h
+++ b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.h
@@ -23,7 +23,7 @@
 #ifndef nsFingerChannel_h___
 #define nsFingerChannel_h___
 
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsILoadGroup.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
diff --git a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.h b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.h
index 81162f9ee8a..b68a89b475d 100644
--- a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.h
+++ b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.h
@@ -24,7 +24,7 @@
 #define nsKeywordProtocolHandler_h___
 
 #include "nsIProtocolHandler.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 #define NS_KEYWORDPROTOCOLHANDLER_CID                  \
 { /* 2E4233C0-6FB4-11d3-A180-0050041CAF44 */         \
diff --git a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
index f8a319df03d..35bacc8ecfc 100644
--- a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
+++ b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
@@ -20,7 +20,7 @@
  * Contributor(s): 
  */
 
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsIServiceManager.h"
 
 #include "nsSocketProviderService.h"
diff --git a/mozilla/netwerk/test/TestStreamConv.cpp b/mozilla/netwerk/test/TestStreamConv.cpp
index 30d3a70763c..da5437369c6 100644
--- a/mozilla/netwerk/test/TestStreamConv.cpp
+++ b/mozilla/netwerk/test/TestStreamConv.cpp
@@ -59,14 +59,14 @@ public:
         nsresult rv = aFromStream->Read(buf, 1024, &read);
         if (NS_FAILED(rv) || read == 0) return rv;
 
-        nsString2 to(aToType);
+        nsString to(aToType);
         char *toMIME = to.ToNewCString();
         char toChar = *toMIME;
 
         for (PRUint32 i = 0; i < read; i++) 
             buf[i] = toChar;
 
-        nsString2 convDataStr(buf);
+        nsString convDataStr(buf);
         nsIInputStream *inputData = nsnull;
         nsISupports *inputDataSup = nsnull;
 
@@ -312,7 +312,7 @@ main(int argc, char* argv[])
     if (NS_FAILED(rv)) return rv;
 
     // use a dummy string as a stream to convert.
-    nsString2 dummyData("aaaaaaaaaaaaaaa");
+    nsString dummyData("aaaaaaaaaaaaaaa");
     nsIInputStream *inputData = nsnull;
     nsISupports *inputDataSup = nsnull;
     nsIInputStream *convertedData = nsnull;
@@ -321,9 +321,9 @@ main(int argc, char* argv[])
     if (NS_FAILED(rv)) return rv;
 
     PRUnichar *from, *to;
-    nsString2 fromStr("a/foo");
+    nsString fromStr("a/foo");
     from = fromStr.ToNewUnicode();
-    nsString2 toStr  ("e/foo");
+    nsString toStr  ("e/foo");
     to = toStr.ToNewUnicode();
 
     rv = inputDataSup->QueryInterface(NS_GET_IID(nsIInputStream), (void**)&inputData);