diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index 5898da75706..dbf5f01d5eb 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -39,12 +39,9 @@ REQUIRES	= xpcom \
 		  uconv \
 		  expat \
 		  layout \
-		  content \
 		  dom \
 		  pref \
-		  nkcache \
 		  intl \
-		  widget \
 		  $(NULL)
 
 SHARED_LIBRARY_LIBS = \
diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win
index 5932777455b..69d606ff2b9 100644
--- a/mozilla/htmlparser/src/makefile.win
+++ b/mozilla/htmlparser/src/makefile.win
@@ -31,11 +31,7 @@ REQUIRES	= xpcom \
 		  layout \
 		  dom \
 		  pref \
-		  nkcache \
 		  intl \
-		  widget \
-		  raptor \
-		  content \
 		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/htmlparser/src/nsParserMsgUtils.cpp b/mozilla/htmlparser/src/nsParserMsgUtils.cpp
index 4fa4efbffe2..80244f28447 100644
--- a/mozilla/htmlparser/src/nsParserMsgUtils.cpp
+++ b/mozilla/htmlparser/src/nsParserMsgUtils.cpp
@@ -37,7 +37,6 @@
 
 #include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
-#include "nsITextContent.h"
 #include "nsISupportsArray.h"
 #include "nsXPIDLString.h"
 #include "nsParserMsgUtils.h"
diff --git a/mozilla/htmlparser/src/nsViewSourceHTML.h b/mozilla/htmlparser/src/nsViewSourceHTML.h
index 6acae66a66c..56a15e7c17b 100644
--- a/mozilla/htmlparser/src/nsViewSourceHTML.h
+++ b/mozilla/htmlparser/src/nsViewSourceHTML.h
@@ -35,7 +35,6 @@
 #include "nsISupports.h"
 #include "nsHTMLTokens.h"
 #include "nsIHTMLContentSink.h"
-#include "nsIXMLContentSink.h"
 #include "nsDTDUtils.h"
 #include "nsParserNode.h"
 
diff --git a/mozilla/htmlparser/src/nsWellFormedDTD.cpp b/mozilla/htmlparser/src/nsWellFormedDTD.cpp
index 3db8e6ba2e0..706939a815a 100644
--- a/mozilla/htmlparser/src/nsWellFormedDTD.cpp
+++ b/mozilla/htmlparser/src/nsWellFormedDTD.cpp
@@ -51,7 +51,6 @@
 #include "nsDTDUtils.h"
 #include "nsIContentSink.h"
 #include "nsIHTMLContentSink.h"
-#include "nsIXMLContentSink.h"
 #include "nsHTMLTokenizer.h"
 #include "nsExpatTokenizer.h"
 
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index 5898da75706..dbf5f01d5eb 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -39,12 +39,9 @@ REQUIRES	= xpcom \
 		  uconv \
 		  expat \
 		  layout \
-		  content \
 		  dom \
 		  pref \
-		  nkcache \
 		  intl \
-		  widget \
 		  $(NULL)
 
 SHARED_LIBRARY_LIBS = \
diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win
index 5932777455b..69d606ff2b9 100644
--- a/mozilla/parser/htmlparser/src/makefile.win
+++ b/mozilla/parser/htmlparser/src/makefile.win
@@ -31,11 +31,7 @@ REQUIRES	= xpcom \
 		  layout \
 		  dom \
 		  pref \
-		  nkcache \
 		  intl \
-		  widget \
-		  raptor \
-		  content \
 		  $(NULL)
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp b/mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp
index 4fa4efbffe2..80244f28447 100644
--- a/mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp
@@ -37,7 +37,6 @@
 
 #include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
-#include "nsITextContent.h"
 #include "nsISupportsArray.h"
 #include "nsXPIDLString.h"
 #include "nsParserMsgUtils.h"
diff --git a/mozilla/parser/htmlparser/src/nsViewSourceHTML.h b/mozilla/parser/htmlparser/src/nsViewSourceHTML.h
index 6acae66a66c..56a15e7c17b 100644
--- a/mozilla/parser/htmlparser/src/nsViewSourceHTML.h
+++ b/mozilla/parser/htmlparser/src/nsViewSourceHTML.h
@@ -35,7 +35,6 @@
 #include "nsISupports.h"
 #include "nsHTMLTokens.h"
 #include "nsIHTMLContentSink.h"
-#include "nsIXMLContentSink.h"
 #include "nsDTDUtils.h"
 #include "nsParserNode.h"
 
diff --git a/mozilla/parser/htmlparser/src/nsWellFormedDTD.cpp b/mozilla/parser/htmlparser/src/nsWellFormedDTD.cpp
index 3db8e6ba2e0..706939a815a 100644
--- a/mozilla/parser/htmlparser/src/nsWellFormedDTD.cpp
+++ b/mozilla/parser/htmlparser/src/nsWellFormedDTD.cpp
@@ -51,7 +51,6 @@
 #include "nsDTDUtils.h"
 #include "nsIContentSink.h"
 #include "nsIHTMLContentSink.h"
-#include "nsIXMLContentSink.h"
 #include "nsHTMLTokenizer.h"
 #include "nsExpatTokenizer.h"