diff --git a/mozilla/content/base/src/mozSanitizingSerializer.cpp b/mozilla/content/base/src/mozSanitizingSerializer.cpp
index 062e53a98e6..a3bf3f87a4f 100644
--- a/mozilla/content/base/src/mozSanitizingSerializer.cpp
+++ b/mozilla/content/base/src/mozSanitizingSerializer.cpp
@@ -54,7 +54,6 @@
 #include "nsHTMLAtoms.h"
 #include "nsIDOMText.h"
 #include "nsIDOMElement.h"
-#include "nsIHTMLContent.h"
 #include "nsITextContent.h"
 #include "nsTextFragment.h"
 #include "nsContentUtils.h"
diff --git a/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp
index f37a820ccbe..26f28637b61 100644
--- a/mozilla/content/base/src/nsContentUtils.cpp
+++ b/mozilla/content/base/src/nsContentUtils.cpp
@@ -981,7 +981,6 @@ nsContentUtils::GetAncestorsAndOffsets(nsIDOMNode* aNode,
 {
   NS_ENSURE_ARG_POINTER(aNode);
 
-  PRInt32 offset = 0;
   nsCOMPtr<nsIContent> content(do_QueryInterface(aNode));
 
   if (!content) {
@@ -1006,9 +1005,8 @@ nsContentUtils::GetAncestorsAndOffsets(nsIDOMNode* aNode,
   nsIContent* child = content;
   nsIContent* parent = child->GetParent();
   while (parent) {
-    offset = parent->IndexOf(child);
     aAncestorNodes->AppendElement(parent);
-    aAncestorOffsets->AppendElement(NS_INT32_TO_PTR(offset));
+    aAncestorOffsets->AppendElement(NS_INT32_TO_PTR(parent->IndexOf(child)));
     child = parent;
     parent = parent->GetParent();
   }
diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp
index ced520d94ed..17f5a91d7f5 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.cpp
+++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp
@@ -233,7 +233,7 @@ nsDOMAttributeMap::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
                                            &nameSpaceID,
                                            getter_AddRefs(nameAtom),
                                            getter_AddRefs(prefix)))) {
-    nsAutoString value, name;
+    nsAutoString value;
     mContent->GetAttr(nameSpaceID, nameAtom, value);
 
     nsINodeInfo *contentNi = mContent->GetNodeInfo();
diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp
index efd27a34d29..db748e18215 100644
--- a/mozilla/content/base/src/nsDocumentViewer.cpp
+++ b/mozilla/content/base/src/nsDocumentViewer.cpp
@@ -184,7 +184,6 @@ static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printset
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 //focus
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
index c85a1ff05f9..8dadc6e9b9a 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
@@ -58,15 +58,6 @@
 #include "pldhash.h"
 #include "prprf.h"
 
-// static
-void
-nsGenericDOMDataNode::Shutdown()
-{
-}
-
-
-//----------------------------------------------------------------------
-
 nsGenericDOMDataNode::nsGenericDOMDataNode()
   : mText()
 {
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h
index 3aa8cb99bb1..cc87d477e40 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.h
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.h
@@ -245,8 +245,6 @@ public:
   void ToCString(nsAString& aBuf, PRInt32 aOffset, PRInt32 aLen) const;
 #endif
 
-  static void Shutdown();
-
 protected:
   nsTextFragment mText;
 
diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp
index 2126bce56ba..c8eeeb95c46 100644
--- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp
+++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp
@@ -56,7 +56,6 @@
 #include "nsEscape.h"
 #include "nsITextToSubURI.h"
 #include "nsCRT.h"
-#include "nsIHTMLContent.h"
 #include "nsIParserService.h"
 #include "nsContentUtils.h"
 #include "nsILineBreakerFactory.h"
diff --git a/mozilla/content/base/src/nsImageLoadingContent.cpp b/mozilla/content/base/src/nsImageLoadingContent.cpp
index 85b86cb268b..78f533d0500 100644
--- a/mozilla/content/base/src/nsImageLoadingContent.cpp
+++ b/mozilla/content/base/src/nsImageLoadingContent.cpp
@@ -39,7 +39,6 @@
 #include "nsImageLoadingContent.h"
 #include "nsContentErrors.h"
 #include "nsIContent.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINodeInfo.h"
 #include "nsIScriptGlobalObject.h"
diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp
index 7937f8fe98f..0da802c684b 100644
--- a/mozilla/content/base/src/nsNameSpaceManager.cpp
+++ b/mozilla/content/base/src/nsNameSpaceManager.cpp
@@ -42,11 +42,8 @@
 #include "nsIElementFactory.h"
 #include "nsIServiceManager.h"
 #include "nsDoubleHashtable.h"
-#include "nsVoidArray.h"
 #include "nsLayoutAtoms.h"
 #include "nsString.h"
-#include "nsCRT.h"
-#include "nsContentCID.h"
 
 static nsINameSpaceManager* gNameSpaceManager = nsnull;
 
diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp
index 02cdacc94f5..909ac206564 100644
--- a/mozilla/content/base/src/nsPlainTextSerializer.cpp
+++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp
@@ -48,7 +48,6 @@
 #include "nsIDOMText.h"
 #include "nsIDOMElement.h"
 #include "nsINameSpaceManager.h"
-#include "nsIHTMLContent.h"
 #include "nsITextContent.h"
 #include "nsTextFragment.h"
 #include "nsContentUtils.h"
diff --git a/mozilla/content/base/src/nsPrintData.cpp b/mozilla/content/base/src/nsPrintData.cpp
index eb18300d5a5..4880df21ab4 100644
--- a/mozilla/content/base/src/nsPrintData.cpp
+++ b/mozilla/content/base/src/nsPrintData.cpp
@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 
diff --git a/mozilla/content/base/src/nsPrintEngine.cpp b/mozilla/content/base/src/nsPrintEngine.cpp
index 36c13de9958..81b09f6c70f 100644
--- a/mozilla/content/base/src/nsPrintEngine.cpp
+++ b/mozilla/content/base/src/nsPrintEngine.cpp
@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 
@@ -106,7 +105,6 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 // Focus
diff --git a/mozilla/content/html/content/src/nsAttributeContent.cpp b/mozilla/content/html/content/src/nsAttributeContent.cpp
index 522b4329e24..4685cd4d16c 100644
--- a/mozilla/content/html/content/src/nsAttributeContent.cpp
+++ b/mozilla/content/html/content/src/nsAttributeContent.cpp
@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 #include "nsGenericElement.h"
 #include "nsIDocument.h"
-#include "nsIDocument.h"
 #include "nsIDOMRange.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentFragment.h"
diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
index 459e9396e60..9f9b7153576 100644
--- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
@@ -35,7 +35,6 @@
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 #include "pldhash.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAttributes.h"
 #include "nsILink.h"
 #include "nsIStyleRuleProcessor.h"
diff --git a/mozilla/content/html/style/src/nsStyleUtil.cpp b/mozilla/content/html/style/src/nsStyleUtil.cpp
index 6ef165add4b..71ab0f2ca78 100644
--- a/mozilla/content/html/style/src/nsStyleUtil.cpp
+++ b/mozilla/content/html/style/src/nsStyleUtil.cpp
@@ -46,7 +46,6 @@
 #include "nsILinkHandler.h"
 #include "nsILink.h"
 #include "nsIXMLContent.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsIURI.h"
diff --git a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
index 093ac84f3d5..2743d1f1e56 100644
--- a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
+++ b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
@@ -122,33 +122,26 @@ nsSVGElementFactory::CreateInstanceByTag(nsINodeInfo *aNodeInfo,
   
   if (name == nsSVGAtoms::polyline)
     return NS_NewSVGPolylineElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::polygon)
+  if (name == nsSVGAtoms::polygon)
     return NS_NewSVGPolygonElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::circle)
+  if (name == nsSVGAtoms::circle)
     return NS_NewSVGCircleElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::ellipse)
+  if (name == nsSVGAtoms::ellipse)
     return NS_NewSVGEllipseElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::line)
+  if (name == nsSVGAtoms::line)
     return NS_NewSVGLineElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::rect)
+  if (name == nsSVGAtoms::rect)
     return NS_NewSVGRectElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::svg)
+  if (name == nsSVGAtoms::svg)
     return NS_NewSVGSVGElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::g)
+  if (name == nsSVGAtoms::g)
     return NS_NewSVGGElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::foreignObject)
+  if (name == nsSVGAtoms::foreignObject)
     return NS_NewSVGForeignObjectElement(aResult, aNodeInfo);
-  else if (name == nsSVGAtoms::path)
+  if (name == nsSVGAtoms::path)
     return NS_NewSVGPathElement(aResult, aNodeInfo);
 
   // if we don't know what to create, just create a standard xml element:
-  nsCOMPtr<nsIContent> xmlContent;
-  nsresult rv;
-  rv = NS_NewXMLElement(getter_AddRefs(xmlContent), aNodeInfo);
-  
-  *aResult = xmlContent;
-  NS_IF_ADDREF(*aResult);
-  
-  return rv;
+  return NS_NewXMLElement(aResult, aNodeInfo);
 }
 
diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp
index eb0c21d2841..4d497fbbc24 100644
--- a/mozilla/content/xbl/src/nsXBLBinding.cpp
+++ b/mozilla/content/xbl/src/nsXBLBinding.cpp
@@ -59,9 +59,7 @@
 #include "plstr.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsIXMLContent.h"
 #ifdef MOZ_XUL
-#include "nsIXULContent.h"
 #include "nsIXULDocument.h"
 #endif
 #include "nsIXMLContentSink.h"
diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
index f72413c6215..f171ff38983 100644
--- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
+++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
@@ -54,7 +54,6 @@
 #include "plstr.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsIXMLContent.h"
 #include "nsIXMLContentSink.h"
 #include "nsContentCID.h"
 #include "nsXMLDocument.h"
diff --git a/mozilla/content/xul/document/public/nsIXULDocument.h b/mozilla/content/xul/document/public/nsIXULDocument.h
index 60cd29a7b6d..05a8233e39e 100644
--- a/mozilla/content/xul/document/public/nsIXULDocument.h
+++ b/mozilla/content/xul/document/public/nsIXULDocument.h
@@ -62,6 +62,7 @@ class nsIXULPrototypeDocument;
 class nsIXULTemplateBuilder;
 class nsIURI;
 class nsIContent;
+class nsIRDFDataSource;
 
 // {954F0811-81DC-11d2-B52A-000000000000}
 #define NS_IXULDOCUMENT_IID \
@@ -71,9 +72,6 @@ class nsIContent;
  * XUL extensions to nsIDocument
  */
 
-class nsIRDFDataSource;
-class nsIXULPrototypeDocument;
-
 class nsIXULDocument : public nsISupports
 {
 public:
diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp
index 88158a18936..af5ccc5fc5b 100644
--- a/mozilla/content/xul/document/src/nsXULContentSink.cpp
+++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp
@@ -64,7 +64,6 @@
 #include "nsIDocument.h"
 #include "nsIDocumentLoader.h"
 #include "nsIFormControl.h"
-#include "nsIHTMLContent.h"
 #include "nsIHTMLStyleSheet.h"
 #include "nsINameSpace.h"
 #include "nsINameSpaceManager.h"
@@ -78,7 +77,6 @@
 #include "nsITextContent.h"
 #include "nsIURL.h"
 #include "nsIViewManager.h"
-#include "nsIXMLContent.h"
 #include "nsIXULContentSink.h"
 #include "nsIXULDocument.h"
 #include "nsIXULPrototypeDocument.h"
diff --git a/mozilla/content/xul/templates/src/nsXULContentUtils.cpp b/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
index 93eb3ec9eff..42fe20ca182 100644
--- a/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
+++ b/mozilla/content/xul/templates/src/nsXULContentUtils.cpp
@@ -55,7 +55,6 @@
 #include "nsIServiceManager.h"
 #include "nsITextContent.h"
 #include "nsIURL.h"
-#include "nsIXMLContent.h"
 #include "nsXULContentUtils.h"
 #include "nsIXULPrototypeCache.h"
 #include "nsLayoutCID.h"
diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
index e91c4540b99..f1bff6a0087 100644
--- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -74,7 +74,6 @@
 #include "nsIDocument.h"
 #include "nsIBindingManager.h"
 #include "nsIDOMNodeList.h"
-#include "nsIHTMLContent.h"
 #include "nsINameSpace.h"
 #include "nsINameSpaceManager.h"
 #include "nsIRDFCompositeDataSource.h"
diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp
index efd27a34d29..db748e18215 100644
--- a/mozilla/layout/base/nsDocumentViewer.cpp
+++ b/mozilla/layout/base/nsDocumentViewer.cpp
@@ -184,7 +184,6 @@ static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printset
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 //focus
diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp
index 2593e522201..4562d9b723c 100644
--- a/mozilla/layout/base/nsFrameManager.cpp
+++ b/mozilla/layout/base/nsFrameManager.cpp
@@ -57,7 +57,6 @@
 #include "nsIPresState.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
-#include "nsIXMLContent.h"
 #include "nsIXBLBinding.h"
 #include "nsIDocument.h"
 #include "nsIBindingManager.h"
diff --git a/mozilla/layout/base/nsImageLoader.cpp b/mozilla/layout/base/nsImageLoader.cpp
index 0086a2b448d..ed0633bc503 100644
--- a/mozilla/layout/base/nsImageLoader.cpp
+++ b/mozilla/layout/base/nsImageLoader.cpp
@@ -37,8 +37,6 @@
 
 #include "imgIContainer.h"
 
-#include "nsIHTMLContent.h"
-
 #include "nsIViewManager.h"
 
 #include "nsStyleContext.h"
diff --git a/mozilla/layout/base/src/nsImageLoader.cpp b/mozilla/layout/base/src/nsImageLoader.cpp
index 0086a2b448d..ed0633bc503 100644
--- a/mozilla/layout/base/src/nsImageLoader.cpp
+++ b/mozilla/layout/base/src/nsImageLoader.cpp
@@ -37,8 +37,6 @@
 
 #include "imgIContainer.h"
 
-#include "nsIHTMLContent.h"
-
 #include "nsIViewManager.h"
 
 #include "nsStyleContext.h"
diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp
index 4c24553fd0c..194616a903d 100644
--- a/mozilla/layout/build/nsLayoutModule.cpp
+++ b/mozilla/layout/build/nsLayoutModule.cpp
@@ -54,7 +54,6 @@
 #include "nsEventStateManager.h"
 #include "nsEventListenerManager.h"
 #include "nsGenericElement.h"
-#include "nsGenericDOMDataNode.h"
 #include "nsHTMLAtoms.h"
 #include "nsHTMLAtoms.h"
 #include "nsHTMLContentSerializer.h"
@@ -317,7 +316,6 @@ Shutdown(nsIModule* aSelf)
 
   nsRange::Shutdown();
   nsGenericElement::Shutdown();
-  nsGenericDOMDataNode::Shutdown();
   nsEventListenerManager::Shutdown();
   nsContentList::Shutdown();
   nsComputedDOMStyle::Shutdown();
diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp
index 2f7e8d0da08..b81aa66070b 100644
--- a/mozilla/layout/forms/nsFieldSetFrame.cpp
+++ b/mozilla/layout/forms/nsFieldSetFrame.cpp
@@ -50,7 +50,6 @@
 #include "nsISupports.h"
 #include "nsIAtom.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsLayoutAtoms.h"
diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp
index 4e0ea271123..bc5700fffa1 100644
--- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp
@@ -58,7 +58,6 @@ static NS_DEFINE_CID(kTextNodeCID,   NS_TEXTNODE_CID);
 
 // Saving PresState
 #include "nsIPresState.h"
-#include "nsIHTMLContent.h"
 
 const nscoord kSuggestedNotSet = -1;
 
diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp
index b676c927670..1189a4b952c 100644
--- a/mozilla/layout/forms/nsListControlFrame.cpp
+++ b/mozilla/layout/forms/nsListControlFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsFormControlFrame.h" // for COMPARE macro
 #include "nsFormControlHelper.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIFormControl.h"
 #include "nsIDeviceContext.h" 
 #include "nsIDocument.h"
diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
index 99a2b8ded1b..331a8728c16 100644
--- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
@@ -51,7 +51,6 @@
 #include "nsIDocument.h"
 #include "nsIURL.h"
 #include "nsPlaceholderFrame.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"
diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index f7fc1382df3..a4c63f6293a 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsIImage.h"
 #include "nsIWidget.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINodeInfo.h"
 #include "nsStyleContext.h"
diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp
index 934cf45120d..870082ee4d5 100644
--- a/mozilla/layout/generic/nsImageMap.cpp
+++ b/mozilla/layout/generic/nsImageMap.cpp
@@ -54,7 +54,6 @@
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDOMEventReceiver.h"
 #include "nsIPresShell.h"
 #include "nsIFrame.h"
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index 71bfe6f1055..189d7117ac9 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -60,7 +60,6 @@
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsIPluginInstanceOwner.h"
-#include "nsIHTMLContent.h"
 #include "nsISupportsArray.h"
 #include "plstr.h"
 #include "nsILinkHandler.h"
diff --git a/mozilla/layout/generic/nsSpacerFrame.cpp b/mozilla/layout/generic/nsSpacerFrame.cpp
index cca8a223d02..7fbaa122c17 100644
--- a/mozilla/layout/generic/nsSpacerFrame.cpp
+++ b/mozilla/layout/generic/nsSpacerFrame.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsLineLayout.h"
 #include "nsIPresContext.h"
diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp
index 2593e522201..4562d9b723c 100644
--- a/mozilla/layout/html/base/src/nsFrameManager.cpp
+++ b/mozilla/layout/html/base/src/nsFrameManager.cpp
@@ -57,7 +57,6 @@
 #include "nsIPresState.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
-#include "nsIXMLContent.h"
 #include "nsIXBLBinding.h"
 #include "nsIDocument.h"
 #include "nsIBindingManager.h"
diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
index 99a2b8ded1b..331a8728c16 100644
--- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
@@ -51,7 +51,6 @@
 #include "nsIDocument.h"
 #include "nsIURL.h"
 #include "nsPlaceholderFrame.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"
diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp
index f7fc1382df3..a4c63f6293a 100644
--- a/mozilla/layout/html/base/src/nsImageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsImageFrame.cpp
@@ -46,7 +46,6 @@
 #include "nsIImage.h"
 #include "nsIWidget.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINodeInfo.h"
 #include "nsStyleContext.h"
diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp
index 934cf45120d..870082ee4d5 100644
--- a/mozilla/layout/html/base/src/nsImageMap.cpp
+++ b/mozilla/layout/html/base/src/nsImageMap.cpp
@@ -54,7 +54,6 @@
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDOMEventReceiver.h"
 #include "nsIPresShell.h"
 #include "nsIFrame.h"
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index 71bfe6f1055..189d7117ac9 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -60,7 +60,6 @@
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsIPluginInstanceOwner.h"
-#include "nsIHTMLContent.h"
 #include "nsISupportsArray.h"
 #include "plstr.h"
 #include "nsILinkHandler.h"
diff --git a/mozilla/layout/html/base/src/nsSpacerFrame.cpp b/mozilla/layout/html/base/src/nsSpacerFrame.cpp
index cca8a223d02..7fbaa122c17 100644
--- a/mozilla/layout/html/base/src/nsSpacerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsSpacerFrame.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsLineLayout.h"
 #include "nsIPresContext.h"
diff --git a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
index 2f7e8d0da08..b81aa66070b 100644
--- a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
@@ -50,7 +50,6 @@
 #include "nsISupports.h"
 #include "nsIAtom.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsLayoutAtoms.h"
diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp
index 4e0ea271123..bc5700fffa1 100644
--- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp
@@ -58,7 +58,6 @@ static NS_DEFINE_CID(kTextNodeCID,   NS_TEXTNODE_CID);
 
 // Saving PresState
 #include "nsIPresState.h"
-#include "nsIHTMLContent.h"
 
 const nscoord kSuggestedNotSet = -1;
 
diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
index b676c927670..1189a4b952c 100644
--- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsFormControlFrame.h" // for COMPARE macro
 #include "nsFormControlHelper.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIFormControl.h"
 #include "nsIDeviceContext.h" 
 #include "nsIDocument.h"
diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp
index 750c1cabfb5..287302b06a6 100644
--- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsCOMPtr.h"
diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index c18b7e3d436..0a66c5d64f0 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -50,7 +50,7 @@
 #include "nsTableRowFrame.h"
 #include "nsTableRowGroupFrame.h"
 #include "nsTableOuterFrame.h"
-#include "nsIHTMLContent.h"
+#include "nsHTMLValue.h"
 
 #include "BasicTableLayoutStrategy.h"
 #include "FixedTableLayoutStrategy.h"
diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
index 0905b5cae6d..bbee314dca4 100644
--- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
@@ -41,7 +41,6 @@
 #include "nsIPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAtoms.h"
 #include "nsIContent.h"
 #include "nsTableFrame.h"
diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
index 7ac770b0c65..b4cf2f329e4 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
@@ -23,7 +23,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"
diff --git a/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp b/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp
index 808179161dd..c96607b6112 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLForeignFrameWrapper.cpp
@@ -26,7 +26,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsHTMLParts.h"
-#include "nsIHTMLContent.h"
 #include "nsFrame.h"
 #include "nsAreaFrame.h"
 #include "nsLineLayout.h"
diff --git a/mozilla/layout/printing/nsPrintData.cpp b/mozilla/layout/printing/nsPrintData.cpp
index eb18300d5a5..4880df21ab4 100644
--- a/mozilla/layout/printing/nsPrintData.cpp
+++ b/mozilla/layout/printing/nsPrintData.cpp
@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 
diff --git a/mozilla/layout/printing/nsPrintEngine.cpp b/mozilla/layout/printing/nsPrintEngine.cpp
index 36c13de9958..81b09f6c70f 100644
--- a/mozilla/layout/printing/nsPrintEngine.cpp
+++ b/mozilla/layout/printing/nsPrintEngine.cpp
@@ -45,7 +45,6 @@
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocShell.h"
-#include "nsIHTMLContent.h"
 #include "nsIURI.h"
 #include "nsINodeInfo.h"
 
@@ -106,7 +105,6 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsINodeInfo.h"
 #include "nsIDocument.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIWebShell.h"
 
 // Focus
diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp
index 459e9396e60..9f9b7153576 100644
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@@ -35,7 +35,6 @@
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 #include "pldhash.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAttributes.h"
 #include "nsILink.h"
 #include "nsIStyleRuleProcessor.h"
diff --git a/mozilla/layout/style/nsStyleUtil.cpp b/mozilla/layout/style/nsStyleUtil.cpp
index 6ef165add4b..71ab0f2ca78 100644
--- a/mozilla/layout/style/nsStyleUtil.cpp
+++ b/mozilla/layout/style/nsStyleUtil.cpp
@@ -46,7 +46,6 @@
 #include "nsILinkHandler.h"
 #include "nsILink.h"
 #include "nsIXMLContent.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsIURI.h"
diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp
index 750c1cabfb5..287302b06a6 100644
--- a/mozilla/layout/tables/nsTableColGroupFrame.cpp
+++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp
@@ -43,7 +43,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsIPresContext.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
 #include "nsCOMPtr.h"
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index c18b7e3d436..0a66c5d64f0 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -50,7 +50,7 @@
 #include "nsTableRowFrame.h"
 #include "nsTableRowGroupFrame.h"
 #include "nsTableOuterFrame.h"
-#include "nsIHTMLContent.h"
+#include "nsHTMLValue.h"
 
 #include "BasicTableLayoutStrategy.h"
 #include "FixedTableLayoutStrategy.h"
diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp
index 0905b5cae6d..bbee314dca4 100644
--- a/mozilla/layout/tables/nsTableRowFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowFrame.cpp
@@ -41,7 +41,6 @@
 #include "nsIPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIHTMLContent.h"
 #include "nsHTMLAtoms.h"
 #include "nsIContent.h"
 #include "nsTableFrame.h"
diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
index 4ae6e9a0ed4..fc30b00f0e9 100644
--- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -63,7 +63,6 @@
 #include "nsIImage.h"
 #include "nsIWidget.h"
 #include "nsHTMLAtoms.h"
-#include "nsIHTMLContent.h"
 #include "nsIDocument.h"
 #include "nsIHTMLDocument.h"
 #include "nsStyleConsts.h"
diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
index cde83fbed6e..97ec3b4a794 100644
--- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
@@ -67,7 +67,6 @@
 #include "nsIScrollbarMediator.h"
 #include "nsIScrollbarFrame.h"
 #include "nsISupportsArray.h"
-#include "nsIXMLContent.h"
 #include "nsXULAtoms.h"
 #include "nsHTMLAtoms.h"
 #include "nsIScrollableView.h"
diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
index f2b297b5f7a..dd66ab16da4 100644
--- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
@@ -50,7 +50,6 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDOMDocument.h"
-#include "nsIXMLContent.h"
 #include "nsIPresContext.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"