diff --git a/mozilla/parser/htmlparser/public/nsHTMLTags.h b/mozilla/parser/htmlparser/public/nsHTMLTags.h
index 4b66899f635..21b35348e36 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTags.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTags.h
@@ -38,7 +38,7 @@
 #ifndef nsHTMLTags_h___
 #define nsHTMLTags_h___
 
-#include "nsAString.h"
+#include "nsStringGlue.h"
 
 class nsIAtom;
 
diff --git a/mozilla/parser/htmlparser/public/nsIContentSink.h b/mozilla/parser/htmlparser/public/nsIContentSink.h
index 675b9543ff4..da9df992d03 100644
--- a/mozilla/parser/htmlparser/public/nsIContentSink.h
+++ b/mozilla/parser/htmlparser/public/nsIContentSink.h
@@ -49,7 +49,7 @@
  * about more, which is the IHTMLContentSink interface. (See that file for details).
  */
 #include "nsISupports.h"
-#include "nsString.h"
+#include "nsStringGlue.h"
 #include "mozFlushType.h"
 
 class nsIParser;
diff --git a/mozilla/parser/htmlparser/public/nsIDTD.h b/mozilla/parser/htmlparser/public/nsIDTD.h
index 0df42aa2f9d..abf9dda9c9e 100644
--- a/mozilla/parser/htmlparser/public/nsIDTD.h
+++ b/mozilla/parser/htmlparser/public/nsIDTD.h
@@ -54,7 +54,7 @@
  * */
 
 #include "nsISupports.h"
-#include "nsString.h"
+#include "nsStringGlue.h"
 #include "prtypes.h"
 #include "nsITokenizer.h"
 
diff --git a/mozilla/parser/htmlparser/public/nsILoggingSink.h b/mozilla/parser/htmlparser/public/nsILoggingSink.h
index ba39191a333..14b7a09b4a8 100644
--- a/mozilla/parser/htmlparser/public/nsILoggingSink.h
+++ b/mozilla/parser/htmlparser/public/nsILoggingSink.h
@@ -38,7 +38,7 @@
 #define nsILoggingSink_h___
 
 #include "nsIHTMLContentSink.h"
-#include "nsString.h"
+#include "nsStringGlue.h"
 #include "prprf.h"
 
 // IID for nsILoggingSink
diff --git a/mozilla/parser/htmlparser/public/nsIParser.h b/mozilla/parser/htmlparser/public/nsIParser.h
index 6b2a28be875..b36d721e89a 100644
--- a/mozilla/parser/htmlparser/public/nsIParser.h
+++ b/mozilla/parser/htmlparser/public/nsIParser.h
@@ -51,7 +51,7 @@
 #include "nsIStreamListener.h"
 #include "nsIDTD.h"
 #include "nsIInputStream.h"
-#include "nsHashtable.h"
+#include "nsStringGlue.h"
 #include "nsVoidArray.h"
 
 // {22039D29-2798-4412-9EA6-A11B41BA27D0}
diff --git a/mozilla/parser/htmlparser/public/nsIParserNode.h b/mozilla/parser/htmlparser/public/nsIParserNode.h
index cb17e96f145..78f46c0d7a8 100644
--- a/mozilla/parser/htmlparser/public/nsIParserNode.h
+++ b/mozilla/parser/htmlparser/public/nsIParserNode.h
@@ -57,7 +57,7 @@
 
 #include "nsISupports.h"
 #include "prtypes.h"
-#include "nsString.h"
+#include "nsStringGlue.h"
 #include "nsDebug.h"
 
 //#define HEAP_ALLOCATED_NODES