diff --git a/mozilla/base/src/bufferRoutines.h b/mozilla/base/src/bufferRoutines.h
index f79115d59df..016a47fa207 100644
--- a/mozilla/base/src/bufferRoutines.h
+++ b/mozilla/base/src/bufferRoutines.h
@@ -52,6 +52,11 @@ inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
 //  The functions are differentiated by shift direction and the underlying charsize.
 //
 
+PRInt32 TrimChars2(char* aString,PRUint32 aLength,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+
+
 /**
  * This method shifts single byte characters left by a given amount from an given offset.
  * @update	gess 01/04/99
diff --git a/mozilla/base/src/nsStr.h b/mozilla/base/src/nsStr.h
index e55b802653a..02cc28c3b43 100644
--- a/mozilla/base/src/nsStr.h
+++ b/mozilla/base/src/nsStr.h
@@ -348,5 +348,8 @@ public:
 
 };
 
+char* GetSharedEmptyBuffer();
+nsIMemoryAgent* GetDefaultAgent(void);
+
 #endif
 
diff --git a/mozilla/base/src/nsString2.cpp b/mozilla/base/src/nsString2.cpp
index 44922f0d55a..2a1a057735c 100644
--- a/mozilla/base/src/nsString2.cpp
+++ b/mozilla/base/src/nsString2.cpp
@@ -1605,6 +1605,10 @@ public:
   nsDeque mDeque;
 };
 
+void Subsume(nsStr& aDest,nsStr& aSource);
+nsStringRecycler& GetRecycler(void);
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
 }
        
 
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   eCharSize theSize=(eCharSize)aStr.mMultibyte;
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);
diff --git a/mozilla/string/obsolete/nsStr.h b/mozilla/string/obsolete/nsStr.h
index e55b802653a..02cc28c3b43 100644
--- a/mozilla/string/obsolete/nsStr.h
+++ b/mozilla/string/obsolete/nsStr.h
@@ -348,5 +348,8 @@ public:
 
 };
 
+char* GetSharedEmptyBuffer();
+nsIMemoryAgent* GetDefaultAgent(void);
+
 #endif
 
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 44922f0d55a..2a1a057735c 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -1605,6 +1605,10 @@ public:
   nsDeque mDeque;
 };
 
+void Subsume(nsStr& aDest,nsStr& aSource);
+nsStringRecycler& GetRecycler(void);
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
 }
        
 
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   eCharSize theSize=(eCharSize)aStr.mMultibyte;
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);
diff --git a/mozilla/xpcom/ds/bufferRoutines.h b/mozilla/xpcom/ds/bufferRoutines.h
index f79115d59df..016a47fa207 100644
--- a/mozilla/xpcom/ds/bufferRoutines.h
+++ b/mozilla/xpcom/ds/bufferRoutines.h
@@ -52,6 +52,11 @@ inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
 //  The functions are differentiated by shift direction and the underlying charsize.
 //
 
+PRInt32 TrimChars2(char* aString,PRUint32 aLength,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+
+
 /**
  * This method shifts single byte characters left by a given amount from an given offset.
  * @update	gess 01/04/99
diff --git a/mozilla/xpcom/ds/nsStr.h b/mozilla/xpcom/ds/nsStr.h
index e55b802653a..02cc28c3b43 100644
--- a/mozilla/xpcom/ds/nsStr.h
+++ b/mozilla/xpcom/ds/nsStr.h
@@ -348,5 +348,8 @@ public:
 
 };
 
+char* GetSharedEmptyBuffer();
+nsIMemoryAgent* GetDefaultAgent(void);
+
 #endif
 
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index 44922f0d55a..2a1a057735c 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -1605,6 +1605,10 @@ public:
   nsDeque mDeque;
 };
 
+void Subsume(nsStr& aDest,nsStr& aSource);
+nsStringRecycler& GetRecycler(void);
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
 }
        
 
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   eCharSize theSize=(eCharSize)aStr.mMultibyte;
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);
diff --git a/mozilla/xpcom/string/obsolete/nsStr.h b/mozilla/xpcom/string/obsolete/nsStr.h
index e55b802653a..02cc28c3b43 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.h
+++ b/mozilla/xpcom/string/obsolete/nsStr.h
@@ -348,5 +348,8 @@ public:
 
 };
 
+char* GetSharedEmptyBuffer();
+nsIMemoryAgent* GetDefaultAgent(void);
+
 #endif
 
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 44922f0d55a..2a1a057735c 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -1605,6 +1605,10 @@ public:
   nsDeque mDeque;
 };
 
+void Subsume(nsStr& aDest,nsStr& aSource);
+nsStringRecycler& GetRecycler(void);
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
 }
        
 
+
+
 /**
  * 
  * @update	gess 01/04/99
@@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  */
 nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   eCharSize theSize=(eCharSize)aStr.mMultibyte;
-  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
+  nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
   Assign(aCString);