diff --git a/content/html/content/src/HTMLAnchorElement.cpp b/content/html/content/src/HTMLAnchorElement.cpp
index fe5ac528b3d4..037499af9c97 100644
--- a/content/html/content/src/HTMLAnchorElement.cpp
+++ b/content/html/content/src/HTMLAnchorElement.cpp
@@ -51,7 +51,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAnchorElement)
                                 nsILink,
                                 Link)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLAnchorElement)
diff --git a/content/html/content/src/HTMLAreaElement.cpp b/content/html/content/src/HTMLAreaElement.cpp
index 18af50dd24d8..7b90515597ef 100644
--- a/content/html/content/src/HTMLAreaElement.cpp
+++ b/content/html/content/src/HTMLAreaElement.cpp
@@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAreaElement)
                                 nsILink,
                                 Link)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLAreaElement)
diff --git a/content/html/content/src/HTMLAudioElement.cpp b/content/html/content/src/HTMLAudioElement.cpp
index 7abb3297a1cc..474e4e60bac3 100644
--- a/content/html/content/src/HTMLAudioElement.cpp
+++ b/content/html/content/src/HTMLAudioElement.cpp
@@ -39,7 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLAudioElement)
                                 nsIDOMHTMLAudioElement, nsITimerCallback,
                                 nsIAudioChannelAgentCallback)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLAudioElement)
 
diff --git a/content/html/content/src/HTMLBRElement.cpp b/content/html/content/src/HTMLBRElement.cpp
index b6ec7b25f835..49963caa0388 100644
--- a/content/html/content/src/HTMLBRElement.cpp
+++ b/content/html/content/src/HTMLBRElement.cpp
@@ -37,7 +37,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLBRElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLBRElement, nsIDOMHTMLBRElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLBRElement)
diff --git a/content/html/content/src/HTMLBodyElement.cpp b/content/html/content/src/HTMLBodyElement.cpp
index 1cef31e8ed66..b7894444470e 100644
--- a/content/html/content/src/HTMLBodyElement.cpp
+++ b/content/html/content/src/HTMLBodyElement.cpp
@@ -207,7 +207,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLBodyElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLBodyElement, nsIDOMHTMLBodyElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLBodyElement)
 
diff --git a/content/html/content/src/HTMLButtonElement.cpp b/content/html/content/src/HTMLButtonElement.cpp
index 3b0a1ac308e8..84d21aec4ec2 100644
--- a/content/html/content/src/HTMLButtonElement.cpp
+++ b/content/html/content/src/HTMLButtonElement.cpp
@@ -89,7 +89,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLButtonElement)
                                 nsIDOMHTMLButtonElement,
                                 nsIConstraintValidation)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 // nsIConstraintValidation
 NS_IMPL_NSICONSTRAINTVALIDATION(HTMLButtonElement)
diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp
index 7433a75c59f1..8677e054cf23 100644
--- a/content/html/content/src/HTMLCanvasElement.cpp
+++ b/content/html/content/src/HTMLCanvasElement.cpp
@@ -165,7 +165,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLCanvasElement)
                                 nsIDOMHTMLCanvasElement,
                                 nsICanvasElementExternal)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLCanvasElement)
 
diff --git a/content/html/content/src/HTMLDataElement.cpp b/content/html/content/src/HTMLDataElement.cpp
index 7990e7a708db..af993a0aca34 100644
--- a/content/html/content/src/HTMLDataElement.cpp
+++ b/content/html/content/src/HTMLDataElement.cpp
@@ -27,7 +27,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLDataElement, Element)
 
 NS_INTERFACE_MAP_BEGIN(HTMLDataElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLDataElement)
 
diff --git a/content/html/content/src/HTMLDataListElement.cpp b/content/html/content/src/HTMLDataListElement.cpp
index 2b7618da0c31..107a0972cf22 100644
--- a/content/html/content/src/HTMLDataListElement.cpp
+++ b/content/html/content/src/HTMLDataListElement.cpp
@@ -32,7 +32,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLDataListElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLDataListElement,
                                 nsIDOMHTMLDataListElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLDataListElement)
diff --git a/content/html/content/src/HTMLDivElement.cpp b/content/html/content/src/HTMLDivElement.cpp
index 9c88b458b361..4204a5acb47f 100644
--- a/content/html/content/src/HTMLDivElement.cpp
+++ b/content/html/content/src/HTMLDivElement.cpp
@@ -28,7 +28,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLDivElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLDivElement, nsIDOMHTMLDivElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLDivElement)
 
diff --git a/content/html/content/src/HTMLElement.cpp b/content/html/content/src/HTMLElement.cpp
index bd0cf3030009..0b591d1d942f 100644
--- a/content/html/content/src/HTMLElement.cpp
+++ b/content/html/content/src/HTMLElement.cpp
@@ -57,7 +57,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLElement, Element)
 
 NS_INTERFACE_MAP_BEGIN(HTMLElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLElement)
 
diff --git a/content/html/content/src/HTMLFieldSetElement.cpp b/content/html/content/src/HTMLFieldSetElement.cpp
index be87435c1def..4e6801fa00bf 100644
--- a/content/html/content/src/HTMLFieldSetElement.cpp
+++ b/content/html/content/src/HTMLFieldSetElement.cpp
@@ -50,7 +50,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement)
                                 nsIDOMHTMLFieldSetElement,
                                 nsIConstraintValidation)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLFieldSetElement)
 
diff --git a/content/html/content/src/HTMLFontElement.cpp b/content/html/content/src/HTMLFontElement.cpp
index 3b6499e2c59a..8c0e78091c3c 100644
--- a/content/html/content/src/HTMLFontElement.cpp
+++ b/content/html/content/src/HTMLFontElement.cpp
@@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFontElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLFontElement, nsIDOMHTMLFontElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLFontElement)
diff --git a/content/html/content/src/HTMLFrameElement.cpp b/content/html/content/src/HTMLFrameElement.cpp
index 3f5174a3d3bf..5f0dd56ddc26 100644
--- a/content/html/content/src/HTMLFrameElement.cpp
+++ b/content/html/content/src/HTMLFrameElement.cpp
@@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFrameElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLFrameElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLFrameElement, nsIDOMHTMLFrameElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLFrameElement)
diff --git a/content/html/content/src/HTMLFrameSetElement.cpp b/content/html/content/src/HTMLFrameSetElement.cpp
index a650d9945a9f..abf4e25d32bd 100644
--- a/content/html/content/src/HTMLFrameSetElement.cpp
+++ b/content/html/content/src/HTMLFrameSetElement.cpp
@@ -32,7 +32,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLFrameSetElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLFrameSetElement,
                                 nsIDOMHTMLFrameSetElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLFrameSetElement)
diff --git a/content/html/content/src/HTMLHRElement.cpp b/content/html/content/src/HTMLHRElement.cpp
index e5434bb00313..832c101a50fc 100644
--- a/content/html/content/src/HTMLHRElement.cpp
+++ b/content/html/content/src/HTMLHRElement.cpp
@@ -30,7 +30,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHRElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLHRElement,
                                 nsIDOMHTMLHRElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLHRElement)
diff --git a/content/html/content/src/HTMLHeadingElement.cpp b/content/html/content/src/HTMLHeadingElement.cpp
index 10edbfffbacc..d5982bbc4867 100644
--- a/content/html/content/src/HTMLHeadingElement.cpp
+++ b/content/html/content/src/HTMLHeadingElement.cpp
@@ -31,7 +31,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLHeadingElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLHeadingElement,
                                 nsIDOMHTMLHeadingElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement)
diff --git a/content/html/content/src/HTMLIFrameElement.cpp b/content/html/content/src/HTMLIFrameElement.cpp
index dadc464a9c7c..882d90e36ef9 100644
--- a/content/html/content/src/HTMLIFrameElement.cpp
+++ b/content/html/content/src/HTMLIFrameElement.cpp
@@ -41,7 +41,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLIFrameElement)
                                 nsIDOMHTMLIFrameElement,
                                 nsIDOMGetSVGDocument)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLIFrameElement)
 
diff --git a/content/html/content/src/HTMLImageElement.cpp b/content/html/content/src/HTMLImageElement.cpp
index 7e8308ba2e5b..687dabdd3c30 100644
--- a/content/html/content/src/HTMLImageElement.cpp
+++ b/content/html/content/src/HTMLImageElement.cpp
@@ -92,7 +92,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLImageElement)
                                 imgIOnloadBlocker,
                                 imgINotificationObserver)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLImageElement)
diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp
index 23adf0e409f4..3eef461572bc 100644
--- a/content/html/content/src/HTMLInputElement.cpp
+++ b/content/html/content/src/HTMLInputElement.cpp
@@ -741,7 +741,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLInputElement)
                                 nsIDOMNSEditableElement,
                                 nsIConstraintValidation)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 // nsIConstraintValidation
 NS_IMPL_NSICONSTRAINTVALIDATION_EXCEPT_SETCUSTOMVALIDITY(HTMLInputElement)
diff --git a/content/html/content/src/HTMLLIElement.cpp b/content/html/content/src/HTMLLIElement.cpp
index 9dc78bca8cea..7587fd4e6608 100644
--- a/content/html/content/src/HTMLLIElement.cpp
+++ b/content/html/content/src/HTMLLIElement.cpp
@@ -30,7 +30,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLIElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLLIElement, nsIDOMHTMLLIElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLLIElement)
 
diff --git a/content/html/content/src/HTMLLabelElement.cpp b/content/html/content/src/HTMLLabelElement.cpp
index 39ad0838fe94..e3c7ddab6391 100644
--- a/content/html/content/src/HTMLLabelElement.cpp
+++ b/content/html/content/src/HTMLLabelElement.cpp
@@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLabelElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLLabelElement,
                                 nsIDOMHTMLLabelElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 // nsIDOMHTMLLabelElement
diff --git a/content/html/content/src/HTMLLegendElement.cpp b/content/html/content/src/HTMLLegendElement.cpp
index 5b553504de74..597fe79ce1e8 100644
--- a/content/html/content/src/HTMLLegendElement.cpp
+++ b/content/html/content/src/HTMLLegendElement.cpp
@@ -29,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLLegendElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLLegendElement, nsIDOMHTMLLegendElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 // nsIDOMHTMLLegendElement
diff --git a/content/html/content/src/HTMLLinkElement.cpp b/content/html/content/src/HTMLLinkElement.cpp
index e9a73aaddf8e..c4da3db15a66 100644
--- a/content/html/content/src/HTMLLinkElement.cpp
+++ b/content/html/content/src/HTMLLinkElement.cpp
@@ -63,7 +63,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement)
                                 nsIStyleSheetLinkingElement,
                                 Link)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLLinkElement)
diff --git a/content/html/content/src/HTMLMapElement.cpp b/content/html/content/src/HTMLMapElement.cpp
index 214b7e0e4b62..ba7302fb104f 100644
--- a/content/html/content/src/HTMLMapElement.cpp
+++ b/content/html/content/src/HTMLMapElement.cpp
@@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLMapElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLMapElement, nsIDOMHTMLMapElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLMapElement)
 
diff --git a/content/html/content/src/HTMLMenuElement.cpp b/content/html/content/src/HTMLMenuElement.cpp
index ec753dbc90d4..0f066fe45da5 100644
--- a/content/html/content/src/HTMLMenuElement.cpp
+++ b/content/html/content/src/HTMLMenuElement.cpp
@@ -63,7 +63,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuElement)
                                 nsIDOMHTMLMenuElement,
                                 nsIHTMLMenu)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLMenuElement)
 
diff --git a/content/html/content/src/HTMLMenuItemElement.cpp b/content/html/content/src/HTMLMenuItemElement.cpp
index af1cac7ace87..aefdc1deec60 100644
--- a/content/html/content/src/HTMLMenuItemElement.cpp
+++ b/content/html/content/src/HTMLMenuItemElement.cpp
@@ -181,7 +181,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMenuItemElement)
                                 nsIDOMHTMLCommandElement,
                                 nsIDOMHTMLMenuItemElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 //NS_IMPL_ELEMENT_CLONE(HTMLMenuItemElement)
 nsresult
diff --git a/content/html/content/src/HTMLMetaElement.cpp b/content/html/content/src/HTMLMetaElement.cpp
index 29f28e1b8c15..88c24f968b60 100644
--- a/content/html/content/src/HTMLMetaElement.cpp
+++ b/content/html/content/src/HTMLMetaElement.cpp
@@ -34,7 +34,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMetaElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLMetaElement, nsIDOMHTMLMetaElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLMetaElement)
diff --git a/content/html/content/src/HTMLMeterElement.cpp b/content/html/content/src/HTMLMeterElement.cpp
index acb77b311f9f..8a382b111b02 100644
--- a/content/html/content/src/HTMLMeterElement.cpp
+++ b/content/html/content/src/HTMLMeterElement.cpp
@@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLMeterElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLMeterElement,
                                 nsIDOMHTMLMeterElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLMeterElement)
 
diff --git a/content/html/content/src/HTMLModElement.cpp b/content/html/content/src/HTMLModElement.cpp
index d570319ff945..668ca11e75d7 100644
--- a/content/html/content/src/HTMLModElement.cpp
+++ b/content/html/content/src/HTMLModElement.cpp
@@ -32,7 +32,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLModElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLModElement,
                                 nsIDOMHTMLModElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLModElement)
diff --git a/content/html/content/src/HTMLObjectElement.cpp b/content/html/content/src/HTMLObjectElement.cpp
index 2911c4312631..bea1b38cb823 100644
--- a/content/html/content/src/HTMLObjectElement.cpp
+++ b/content/html/content/src/HTMLObjectElement.cpp
@@ -95,7 +95,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement)
                                  nsIConstraintValidation,
                                  nsIDOMGetSVGDocument)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLObjectElement)
 
diff --git a/content/html/content/src/HTMLOptGroupElement.cpp b/content/html/content/src/HTMLOptGroupElement.cpp
index 3b788200dee3..e3a0217e0066 100644
--- a/content/html/content/src/HTMLOptGroupElement.cpp
+++ b/content/html/content/src/HTMLOptGroupElement.cpp
@@ -50,7 +50,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptGroupElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLOptGroupElement,
                                 nsIDOMHTMLOptGroupElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLOptGroupElement)
diff --git a/content/html/content/src/HTMLOptionElement.cpp b/content/html/content/src/HTMLOptionElement.cpp
index 564c41950c76..06c4f2d2f70c 100644
--- a/content/html/content/src/HTMLOptionElement.cpp
+++ b/content/html/content/src/HTMLOptionElement.cpp
@@ -86,7 +86,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLOptionElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLOptionElement,
                                 nsIDOMHTMLOptionElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLOptionElement)
diff --git a/content/html/content/src/HTMLOutputElement.cpp b/content/html/content/src/HTMLOutputElement.cpp
index 97c09429606d..b45c36d67d98 100644
--- a/content/html/content/src/HTMLOutputElement.cpp
+++ b/content/html/content/src/HTMLOutputElement.cpp
@@ -60,7 +60,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLOutputElement)
                                 nsIMutationObserver,
                                 nsIConstraintValidation)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLOutputElement)
 
diff --git a/content/html/content/src/HTMLParagraphElement.cpp b/content/html/content/src/HTMLParagraphElement.cpp
index f3bcf85e3b5e..e3776b6f4dd7 100644
--- a/content/html/content/src/HTMLParagraphElement.cpp
+++ b/content/html/content/src/HTMLParagraphElement.cpp
@@ -29,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLParagraphElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLParagraphElement,
                                 nsIDOMHTMLParagraphElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLParagraphElement)
 
diff --git a/content/html/content/src/HTMLPreElement.cpp b/content/html/content/src/HTMLPreElement.cpp
index 7a7b0e271d72..48c9cc0a78b6 100644
--- a/content/html/content/src/HTMLPreElement.cpp
+++ b/content/html/content/src/HTMLPreElement.cpp
@@ -29,7 +29,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLPreElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLPreElement, nsIDOMHTMLPreElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLPreElement)
 
diff --git a/content/html/content/src/HTMLProgressElement.cpp b/content/html/content/src/HTMLProgressElement.cpp
index eaf6e3a2a808..d68ab2d0c9b5 100644
--- a/content/html/content/src/HTMLProgressElement.cpp
+++ b/content/html/content/src/HTMLProgressElement.cpp
@@ -38,7 +38,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLProgressElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLProgressElement,
                                 nsIDOMHTMLProgressElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLProgressElement)
 
diff --git a/content/html/content/src/HTMLScriptElement.cpp b/content/html/content/src/HTMLScriptElement.cpp
index 15ab77402408..9f1bdc94775d 100644
--- a/content/html/content/src/HTMLScriptElement.cpp
+++ b/content/html/content/src/HTMLScriptElement.cpp
@@ -60,7 +60,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLScriptElement)
                                 nsIScriptElement,
                                 nsIMutationObserver)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 nsresult
diff --git a/content/html/content/src/HTMLSelectElement.cpp b/content/html/content/src/HTMLSelectElement.cpp
index 9ed12bcb96ed..cb07d792dc50 100644
--- a/content/html/content/src/HTMLSelectElement.cpp
+++ b/content/html/content/src/HTMLSelectElement.cpp
@@ -155,7 +155,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSelectElement)
                                 nsIDOMHTMLSelectElement,
                                 nsIConstraintValidation)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 // nsIDOMHTMLSelectElement
diff --git a/content/html/content/src/HTMLSharedElement.cpp b/content/html/content/src/HTMLSharedElement.cpp
index 8e2a2e3b9206..6b2c6d99591d 100644
--- a/content/html/content/src/HTMLSharedElement.cpp
+++ b/content/html/content/src/HTMLSharedElement.cpp
@@ -42,7 +42,7 @@ NS_INTERFACE_MAP_BEGIN(HTMLSharedElement)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLQuoteElement, blockquote)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLHeadElement, head)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLHtmlElement, html)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLSharedElement)
diff --git a/content/html/content/src/HTMLSharedListElement.cpp b/content/html/content/src/HTMLSharedListElement.cpp
index 7b89663aae62..87796b514f96 100644
--- a/content/html/content/src/HTMLSharedListElement.cpp
+++ b/content/html/content/src/HTMLSharedListElement.cpp
@@ -34,7 +34,7 @@ NS_INTERFACE_MAP_BEGIN(HTMLSharedListElement)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLOListElement, ol)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLDListElement, dl)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLUListElement, ul)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLSharedListElement)
diff --git a/content/html/content/src/HTMLSharedObjectElement.cpp b/content/html/content/src/HTMLSharedObjectElement.cpp
index 551b5ef754ef..20548ad19a03 100644
--- a/content/html/content/src/HTMLSharedObjectElement.cpp
+++ b/content/html/content/src/HTMLSharedObjectElement.cpp
@@ -108,7 +108,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSharedObjectElement)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLAppletElement, applet)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLEmbedElement, embed)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMGetSVGDocument, embed)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLSharedObjectElement)
 
diff --git a/content/html/content/src/HTMLSourceElement.cpp b/content/html/content/src/HTMLSourceElement.cpp
index db6a81d41b53..e638f15cdd93 100644
--- a/content/html/content/src/HTMLSourceElement.cpp
+++ b/content/html/content/src/HTMLSourceElement.cpp
@@ -33,7 +33,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLSourceElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLSourceElement, nsIDOMHTMLSourceElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLSourceElement)
diff --git a/content/html/content/src/HTMLSpanElement.cpp b/content/html/content/src/HTMLSpanElement.cpp
index 63ccc6db7d2e..324b7a8c136e 100644
--- a/content/html/content/src/HTMLSpanElement.cpp
+++ b/content/html/content/src/HTMLSpanElement.cpp
@@ -26,7 +26,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLSpanElement, Element)
 // QueryInterface implementation for HTMLSpanElement
 NS_INTERFACE_MAP_BEGIN(HTMLSpanElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLSpanElement)
diff --git a/content/html/content/src/HTMLStyleElement.cpp b/content/html/content/src/HTMLStyleElement.cpp
index 78f869630b04..2d2a05c2554d 100644
--- a/content/html/content/src/HTMLStyleElement.cpp
+++ b/content/html/content/src/HTMLStyleElement.cpp
@@ -54,7 +54,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLStyleElement)
                                 nsIStyleSheetLinkingElement,
                                 nsIMutationObserver)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLStyleElement)
 
diff --git a/content/html/content/src/HTMLTableCaptionElement.cpp b/content/html/content/src/HTMLTableCaptionElement.cpp
index ebee8b3fa92d..0649380fc31b 100644
--- a/content/html/content/src/HTMLTableCaptionElement.cpp
+++ b/content/html/content/src/HTMLTableCaptionElement.cpp
@@ -35,7 +35,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCaptionElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLTableCaptionElement,
                                 nsIDOMHTMLTableCaptionElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLTableCaptionElement)
 
diff --git a/content/html/content/src/HTMLTableCellElement.cpp b/content/html/content/src/HTMLTableCellElement.cpp
index 37414857ba04..42e079bcedcd 100644
--- a/content/html/content/src/HTMLTableCellElement.cpp
+++ b/content/html/content/src/HTMLTableCellElement.cpp
@@ -39,7 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableCellElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLTableCellElement,
                                 nsIDOMHTMLTableCellElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLTableCellElement)
diff --git a/content/html/content/src/HTMLTableColElement.cpp b/content/html/content/src/HTMLTableColElement.cpp
index b5fc7e29bb27..ca9986f1ce72 100644
--- a/content/html/content/src/HTMLTableColElement.cpp
+++ b/content/html/content/src/HTMLTableColElement.cpp
@@ -39,7 +39,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTableColElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLTableColElement,
                                 nsIDOMHTMLTableColElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLTableColElement)
 
diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp
index eed09ce75a51..7890936b8d60 100644
--- a/content/html/content/src/HTMLTableElement.cpp
+++ b/content/html/content/src/HTMLTableElement.cpp
@@ -335,7 +335,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLTableElement, nsIDOMHTMLTableElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLTableElement)
diff --git a/content/html/content/src/HTMLTableRowElement.cpp b/content/html/content/src/HTMLTableRowElement.cpp
index f1085f2d4338..37a71be0f4a8 100644
--- a/content/html/content/src/HTMLTableRowElement.cpp
+++ b/content/html/content/src/HTMLTableRowElement.cpp
@@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableRowElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLTableRowElement,
                                 nsIDOMHTMLTableRowElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLTableRowElement)
diff --git a/content/html/content/src/HTMLTableSectionElement.cpp b/content/html/content/src/HTMLTableSectionElement.cpp
index 10c899902a12..9312a9a7e33d 100644
--- a/content/html/content/src/HTMLTableSectionElement.cpp
+++ b/content/html/content/src/HTMLTableSectionElement.cpp
@@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableSectionElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLTableSectionElement,
                                 nsIDOMHTMLTableSectionElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLTableSectionElement)
diff --git a/content/html/content/src/HTMLTemplateElement.cpp b/content/html/content/src/HTMLTemplateElement.cpp
index 9492e6324a4f..b653bdf175ec 100644
--- a/content/html/content/src/HTMLTemplateElement.cpp
+++ b/content/html/content/src/HTMLTemplateElement.cpp
@@ -73,7 +73,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED_1(HTMLTemplateElement,
 // QueryInterface implementation for HTMLTemplateElement
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTemplateElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE_WITH_INIT(HTMLTemplateElement)
 
diff --git a/content/html/content/src/HTMLTextAreaElement.cpp b/content/html/content/src/HTMLTextAreaElement.cpp
index 586d7f57eb21..1cdddaf6fa1f 100644
--- a/content/html/content/src/HTMLTextAreaElement.cpp
+++ b/content/html/content/src/HTMLTextAreaElement.cpp
@@ -95,7 +95,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTextAreaElement)
                                 nsIMutationObserver,
                                 nsIConstraintValidation)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 // nsIDOMHTMLTextAreaElement
diff --git a/content/html/content/src/HTMLTimeElement.cpp b/content/html/content/src/HTMLTimeElement.cpp
index cf81e61b1893..9eb93c69d41b 100644
--- a/content/html/content/src/HTMLTimeElement.cpp
+++ b/content/html/content/src/HTMLTimeElement.cpp
@@ -30,7 +30,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLTimeElement, Element)
 
 NS_INTERFACE_MAP_BEGIN(HTMLTimeElement)
   NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLTimeElement)
 
diff --git a/content/html/content/src/HTMLTitleElement.cpp b/content/html/content/src/HTMLTitleElement.cpp
index bb023cd680e3..cfeda153171e 100644
--- a/content/html/content/src/HTMLTitleElement.cpp
+++ b/content/html/content/src/HTMLTitleElement.cpp
@@ -45,7 +45,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLTitleElement)
                                 nsIDOMHTMLTitleElement,
                                 nsIMutationObserver)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 NS_IMPL_ELEMENT_CLONE(HTMLTitleElement)
diff --git a/content/html/content/src/HTMLUnknownElement.cpp b/content/html/content/src/HTMLUnknownElement.cpp
index 1ceaf9fc585a..40722bb2f1b7 100644
--- a/content/html/content/src/HTMLUnknownElement.cpp
+++ b/content/html/content/src/HTMLUnknownElement.cpp
@@ -40,7 +40,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLUnknownElement)
   NS_INTERFACE_TABLE_INHERITED1(HTMLUnknownElement,
                                 nsIDOMHTMLUnknownElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLUnknownElement)
 
diff --git a/content/html/content/src/HTMLVideoElement.cpp b/content/html/content/src/HTMLVideoElement.cpp
index a2ae3909db36..d80bfa351346 100644
--- a/content/html/content/src/HTMLVideoElement.cpp
+++ b/content/html/content/src/HTMLVideoElement.cpp
@@ -46,7 +46,7 @@ NS_INTERFACE_TABLE_HEAD(HTMLVideoElement)
   NS_HTML_CONTENT_INTERFACES(HTMLMediaElement)
   NS_INTERFACE_TABLE_INHERITED2(HTMLVideoElement, nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_ELEMENT_INTERFACE_MAP_END
 
 NS_IMPL_ELEMENT_CLONE(HTMLVideoElement)
 
diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h
index f1f17d1e4795..96cdcef0a4cd 100644
--- a/content/html/content/src/nsGenericHTMLElement.h
+++ b/content/html/content/src/nsGenericHTMLElement.h
@@ -1455,13 +1455,6 @@ protected:
 #define NS_HTML_CONTENT_INTERFACES(_base)                                     \
   NS_HTML_CONTENT_INTERFACES_AMBIGUOUS(_base, nsIDOMHTMLElement)
 
-#define NS_HTML_CONTENT_INTERFACE_MAP_END                                     \
-  NS_ELEMENT_INTERFACE_MAP_END
-
-#define NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(_class)                \
-    NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(_class)                              \
-  NS_HTML_CONTENT_INTERFACE_MAP_END
-
 #define NS_INTERFACE_MAP_ENTRY_IF_TAG(_interface, _tag)                       \
   NS_INTERFACE_MAP_ENTRY_CONDITIONAL(_interface,                              \
                                      mNodeInfo->Equals(nsGkAtoms::_tag))
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index d339f3c3dc70..0358f5df5440 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -308,7 +308,8 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLFormElement)
                                 nsIWebProgressListener,
                                 nsIRadioGroupContainer)
   NS_INTERFACE_TABLE_TO_MAP_SEGUE
-NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLFormElement)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLFormElement)
+NS_ELEMENT_INTERFACE_MAP_END
 
 
 // nsIDOMHTMLFormElement