diff --git a/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp b/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp
index 1df7a9f2a82..9489b708cea 100644
--- a/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp
+++ b/mozilla/mailnews/mime/tests/mimetest/mimetest.cpp
@@ -600,8 +600,8 @@ DoRFC822toHTMLConversion(char *filename, int numArgs, int outFormat)
   nsIChannel    *tChannel = nsnull;
 
   NewChannel(&tChannel, theURI);
-  mimeParser->AsyncConvertData(nsString2("message/rfc822").GetUnicode(), 
-                               nsString2("text/xul").GetUnicode(),
+  mimeParser->AsyncConvertData(nsString("message/rfc822").GetUnicode(), 
+                               nsString("text/xul").GetUnicode(),
                                out, tChannel);
 
 //  rv = mimeParser->Init(theURI, out, nsnull);
diff --git a/mozilla/modules/libjar/nsJAR.h b/mozilla/modules/libjar/nsJAR.h
index 4f755551b20..ba333d62611 100644
--- a/mozilla/modules/libjar/nsJAR.h
+++ b/mozilla/modules/libjar/nsJAR.h
@@ -40,7 +40,7 @@
 #include "nsRepository.h"
 #include "nsIComponentManager.h"
 #include "nsCOMPtr.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsIFile.h"
 #include "nsIEnumerator.h"
 #include "nsVoidArray.h"
diff --git a/mozilla/modules/plugin/samples/simple/npsimple.cpp b/mozilla/modules/plugin/samples/simple/npsimple.cpp
index 28df9c04947..97f4aed9054 100644
--- a/mozilla/modules/plugin/samples/simple/npsimple.cpp
+++ b/mozilla/modules/plugin/samples/simple/npsimple.cpp
@@ -509,7 +509,7 @@ NSRegisterSelf(nsISupports *aServMgr, const char *path)
 
     char buf[255];    // todo: use a const
 
-    nsString2 progID(NS_INLINE_PLUGIN_PROGID_PREFIX);
+    nsString progID(NS_INLINE_PLUGIN_PROGID_PREFIX);
 
     // We will use the service manager to obtain the component
     // manager, which will enable us to register a component
diff --git a/mozilla/modules/plugin/test/npsimple.cpp b/mozilla/modules/plugin/test/npsimple.cpp
index 28df9c04947..97f4aed9054 100644
--- a/mozilla/modules/plugin/test/npsimple.cpp
+++ b/mozilla/modules/plugin/test/npsimple.cpp
@@ -509,7 +509,7 @@ NSRegisterSelf(nsISupports *aServMgr, const char *path)
 
     char buf[255];    // todo: use a const
 
-    nsString2 progID(NS_INLINE_PLUGIN_PROGID_PREFIX);
+    nsString progID(NS_INLINE_PLUGIN_PROGID_PREFIX);
 
     // We will use the service manager to obtain the component
     // manager, which will enable us to register a component