diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp
index a59d5f88c04..34bb52df5cc 100644
--- a/mozilla/layout/forms/nsFormControlFrame.cpp
+++ b/mozilla/layout/forms/nsFormControlFrame.cpp
@@ -18,7 +18,7 @@
 
 #include "nsFormControlFrame.h"
 #include "nsHTMLParts.h"
-#include "nsHTMLContainer.h"
+#include "nsIHTMLContent.h"
 #include "nsIRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
diff --git a/mozilla/layout/forms/nsFormControlFrame.h b/mozilla/layout/forms/nsFormControlFrame.h
index 739ae4edd12..9779ad2bfd4 100644
--- a/mozilla/layout/forms/nsFormControlFrame.h
+++ b/mozilla/layout/forms/nsFormControlFrame.h
@@ -21,7 +21,6 @@
 
 #include "nsIFormControlFrame.h"
 #include "nsIFormManager.h"
-#include "nsHTMLContainer.h"
 #include "nsISupports.h"
 #include "nsIWidget.h"
 #include "nsLeafFrame.h"
diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp
index 777cdc0d937..e13d3c350b7 100644
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@@ -15,10 +15,9 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-
-#include "nsHTMLContainer.h"
 #include "nsLeafFrame.h"
 #include "nsHTMLContainerFrame.h"
+#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"
@@ -39,7 +38,6 @@
 #include "nsCSSLayout.h"
 #include "nsIDocumentLoader.h"
 #include "nsIPref.h"
-//#include "nsIDocumentWidget.h"
 #include "nsFrameSetFrame.h"
 #include "nsIDOMHTMLFrameElement.h"
 #include "nsIDOMHTMLIFrameElement.h"
diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp
index bbd01a7bf67..57b8daf0b4b 100644
--- a/mozilla/layout/generic/nsFrameSetFrame.cpp
+++ b/mozilla/layout/generic/nsFrameSetFrame.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "nsFrameSetFrame.h"
-#include "nsHTMLContainer.h"
+#include "nsIHTMLContent.h"
 #include "nsLeafFrame.h"
 #include "nsHTMLContainerFrame.h"
 #include "nsIWebShell.h"
diff --git a/mozilla/layout/generic/nsFrameSetFrame.h b/mozilla/layout/generic/nsFrameSetFrame.h
index cfacbcae681..a393a4c4349 100644
--- a/mozilla/layout/generic/nsFrameSetFrame.h
+++ b/mozilla/layout/generic/nsFrameSetFrame.h
@@ -20,7 +20,7 @@
 
 #include "nsHTMLAtoms.h"
 #include "nsHTMLContainerFrame.h"
-#include "nsHTMLContainer.h"
+#include "nsColor.h"
 
 class  nsIContent;
 struct nsReflowMetrics;
diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp
index 777cdc0d937..e13d3c350b7 100644
--- a/mozilla/layout/html/document/src/nsFrameFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp
@@ -15,10 +15,9 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-
-#include "nsHTMLContainer.h"
 #include "nsLeafFrame.h"
 #include "nsHTMLContainerFrame.h"
+#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"
@@ -39,7 +38,6 @@
 #include "nsCSSLayout.h"
 #include "nsIDocumentLoader.h"
 #include "nsIPref.h"
-//#include "nsIDocumentWidget.h"
 #include "nsFrameSetFrame.h"
 #include "nsIDOMHTMLFrameElement.h"
 #include "nsIDOMHTMLIFrameElement.h"
diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
index bbd01a7bf67..57b8daf0b4b 100644
--- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "nsFrameSetFrame.h"
-#include "nsHTMLContainer.h"
+#include "nsIHTMLContent.h"
 #include "nsLeafFrame.h"
 #include "nsHTMLContainerFrame.h"
 #include "nsIWebShell.h"
diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.h b/mozilla/layout/html/document/src/nsFrameSetFrame.h
index cfacbcae681..a393a4c4349 100644
--- a/mozilla/layout/html/document/src/nsFrameSetFrame.h
+++ b/mozilla/layout/html/document/src/nsFrameSetFrame.h
@@ -20,7 +20,7 @@
 
 #include "nsHTMLAtoms.h"
 #include "nsHTMLContainerFrame.h"
-#include "nsHTMLContainer.h"
+#include "nsColor.h"
 
 class  nsIContent;
 struct nsReflowMetrics;
diff --git a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
index 341b3adce62..0b9a3572b85 100644
--- a/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
@@ -19,7 +19,6 @@
 #include "nsFileControlFrame.h"
 #include "nsButtonControlFrame.h"
 #include "nsHTMLParts.h"
-#include "nsHTMLContainer.h"
 #include "nsIRenderingContext.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"
diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp
index a59d5f88c04..34bb52df5cc 100644
--- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp
@@ -18,7 +18,7 @@
 
 #include "nsFormControlFrame.h"
 #include "nsHTMLParts.h"
-#include "nsHTMLContainer.h"
+#include "nsIHTMLContent.h"
 #include "nsIRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.h b/mozilla/layout/html/forms/src/nsFormControlFrame.h
index 739ae4edd12..9779ad2bfd4 100644
--- a/mozilla/layout/html/forms/src/nsFormControlFrame.h
+++ b/mozilla/layout/html/forms/src/nsFormControlFrame.h
@@ -21,7 +21,6 @@
 
 #include "nsIFormControlFrame.h"
 #include "nsIFormManager.h"
-#include "nsHTMLContainer.h"
 #include "nsISupports.h"
 #include "nsIWidget.h"
 #include "nsLeafFrame.h"
diff --git a/mozilla/layout/html/forms/src/nsFormFrame.cpp b/mozilla/layout/html/forms/src/nsFormFrame.cpp
index c661cd772b2..e928f2a1d02 100644
--- a/mozilla/layout/html/forms/src/nsFormFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsRadioControlFrame.h"
 #include "nsIRadioButton.h"
 #include "nsDocument.h"
-#include "nsHTMLContainer.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIDOMNSHTMLFormElement.h"
 #include "nsLeafFrame.h"
diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
index 511afa810d4..479a8b7e0b6 100644
--- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
@@ -33,8 +33,6 @@
 #include "nsIPtr.h"
 #include "nsIView.h"
 #include "nsStyleUtil.h"
-// dependancy on content
-#include "nsHTMLTagContent.h"
 
 NS_DEF_PTR(nsIStyleContext);
 
diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
index 21ae403f4eb..6bf1e154552 100644
--- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
@@ -23,7 +23,6 @@
 #include "nsIHTMLAttributes.h"
 #include "nsHTMLAtoms.h"
 #include "nsIContent.h"
-#include "nsHTMLTagContent.h"
 #include "nsTableFrame.h"
 #include "nsTableCellFrame.h"
 #include "nsIView.h"
diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp
index 511afa810d4..479a8b7e0b6 100644
--- a/mozilla/layout/tables/nsTableCellFrame.cpp
+++ b/mozilla/layout/tables/nsTableCellFrame.cpp
@@ -33,8 +33,6 @@
 #include "nsIPtr.h"
 #include "nsIView.h"
 #include "nsStyleUtil.h"
-// dependancy on content
-#include "nsHTMLTagContent.h"
 
 NS_DEF_PTR(nsIStyleContext);
 
diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp
index 21ae403f4eb..6bf1e154552 100644
--- a/mozilla/layout/tables/nsTableRowFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowFrame.cpp
@@ -23,7 +23,6 @@
 #include "nsIHTMLAttributes.h"
 #include "nsHTMLAtoms.h"
 #include "nsIContent.h"
-#include "nsHTMLTagContent.h"
 #include "nsTableFrame.h"
 #include "nsTableCellFrame.h"
 #include "nsIView.h"