diff --git a/string/obsolete/nsString.h b/string/obsolete/nsString.h
index d928602d75c..3b097d70adc 100644
--- a/string/obsolete/nsString.h
+++ b/string/obsolete/nsString.h
@@ -494,7 +494,7 @@ private:
   void InsertWithConversion( char, PRUint32 );
 };
 
-NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
+// NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
 
 extern NS_COM int fputs(const nsCString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsCString& aString);
diff --git a/string/obsolete/nsString2.h b/string/obsolete/nsString2.h
index 3cb8102a06c..5f11ea6b585 100644
--- a/string/obsolete/nsString2.h
+++ b/string/obsolete/nsString2.h
@@ -570,7 +570,7 @@ private:
   void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 );
 };
 
-NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
+// NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
 
 extern NS_COM int fputs(const nsString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsString& aString);
diff --git a/string/public/nsAReadableString.h b/string/public/nsAReadableString.h
index 3c071f4dc84..cb08fbc7e73 100644
--- a/string/public/nsAReadableString.h
+++ b/string/public/nsAReadableString.h
@@ -821,7 +821,7 @@ class basic_nsLiteralString
       const CharT* mEnd;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString<CharT>, CharT)
 
 template <class CharT>
 const CharT*
@@ -1050,7 +1050,7 @@ class nsPromiseConcatenation
       PRUint32 mFragmentIdentifierMask;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation<CharT>, CharT)
 
 template <class CharT>
 PRUint32
@@ -1198,7 +1198,7 @@ class nsPromiseSubstring
       PRUint32 mLength;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring<CharT>, CharT)
 
 template <class CharT>
 PRUint32
diff --git a/xpcom/ds/nsAReadableString.h b/xpcom/ds/nsAReadableString.h
index 3c071f4dc84..cb08fbc7e73 100644
--- a/xpcom/ds/nsAReadableString.h
+++ b/xpcom/ds/nsAReadableString.h
@@ -821,7 +821,7 @@ class basic_nsLiteralString
       const CharT* mEnd;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString<CharT>, CharT)
 
 template <class CharT>
 const CharT*
@@ -1050,7 +1050,7 @@ class nsPromiseConcatenation
       PRUint32 mFragmentIdentifierMask;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation<CharT>, CharT)
 
 template <class CharT>
 PRUint32
@@ -1198,7 +1198,7 @@ class nsPromiseSubstring
       PRUint32 mLength;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring<CharT>, CharT)
 
 template <class CharT>
 PRUint32
diff --git a/xpcom/ds/nsString.h b/xpcom/ds/nsString.h
index d928602d75c..3b097d70adc 100644
--- a/xpcom/ds/nsString.h
+++ b/xpcom/ds/nsString.h
@@ -494,7 +494,7 @@ private:
   void InsertWithConversion( char, PRUint32 );
 };
 
-NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
+// NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
 
 extern NS_COM int fputs(const nsCString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsCString& aString);
diff --git a/xpcom/ds/nsString2.h b/xpcom/ds/nsString2.h
index 3cb8102a06c..5f11ea6b585 100644
--- a/xpcom/ds/nsString2.h
+++ b/xpcom/ds/nsString2.h
@@ -570,7 +570,7 @@ private:
   void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 );
 };
 
-NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
+// NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
 
 extern NS_COM int fputs(const nsString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsString& aString);
diff --git a/xpcom/string/obsolete/nsString.h b/xpcom/string/obsolete/nsString.h
index d928602d75c..3b097d70adc 100644
--- a/xpcom/string/obsolete/nsString.h
+++ b/xpcom/string/obsolete/nsString.h
@@ -494,7 +494,7 @@ private:
   void InsertWithConversion( char, PRUint32 );
 };
 
-NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
+// NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
 
 extern NS_COM int fputs(const nsCString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsCString& aString);
diff --git a/xpcom/string/obsolete/nsString2.h b/xpcom/string/obsolete/nsString2.h
index 3cb8102a06c..5f11ea6b585 100644
--- a/xpcom/string/obsolete/nsString2.h
+++ b/xpcom/string/obsolete/nsString2.h
@@ -570,7 +570,7 @@ private:
   void InsertWithConversion( const PRUnichar*, PRUint32, PRInt32=-1 );
 };
 
-NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
+// NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
 
 extern NS_COM int fputs(const nsString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsString& aString);
diff --git a/xpcom/string/public/nsAReadableString.h b/xpcom/string/public/nsAReadableString.h
index 3c071f4dc84..cb08fbc7e73 100644
--- a/xpcom/string/public/nsAReadableString.h
+++ b/xpcom/string/public/nsAReadableString.h
@@ -821,7 +821,7 @@ class basic_nsLiteralString
       const CharT* mEnd;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString<CharT>, CharT)
 
 template <class CharT>
 const CharT*
@@ -1050,7 +1050,7 @@ class nsPromiseConcatenation
       PRUint32 mFragmentIdentifierMask;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation<CharT>, CharT)
 
 template <class CharT>
 PRUint32
@@ -1198,7 +1198,7 @@ class nsPromiseSubstring
       PRUint32 mLength;
   };
 
-NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring<CharT>, CharT)
+// NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring<CharT>, CharT)
 
 template <class CharT>
 PRUint32