diff --git a/dom/html/HTMLBodyElement.cpp b/dom/html/HTMLBodyElement.cpp
index 112d48dd1..7e5e18480 100644
--- a/dom/html/HTMLBodyElement.cpp
+++ b/dom/html/HTMLBodyElement.cpp
@@ -7,6 +7,7 @@
 #include "HTMLBodyElement.h"
 #include "mozilla/dom/HTMLBodyElementBinding.h"
 #include "nsAttrValueInlines.h"
+#include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
diff --git a/dom/html/HTMLFrameSetElement.cpp b/dom/html/HTMLFrameSetElement.cpp
index 861dbfe9f..0e9d4fd2e 100644
--- a/dom/html/HTMLFrameSetElement.cpp
+++ b/dom/html/HTMLFrameSetElement.cpp
@@ -7,6 +7,7 @@
 #include "HTMLFrameSetElement.h"
 #include "mozilla/dom/HTMLFrameSetElementBinding.h"
 #include "mozilla/dom/EventHandlerBinding.h"
+#include "nsContentUtils.h"
 #include "nsGlobalWindow.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsAttrValueOrString.h"
diff --git a/dom/html/HTMLLabelElement.cpp b/dom/html/HTMLLabelElement.cpp
index d1c037336..ec36c8b99 100644
--- a/dom/html/HTMLLabelElement.cpp
+++ b/dom/html/HTMLLabelElement.cpp
@@ -8,6 +8,7 @@
  * Implementation of HTML <label> elements.
  */
 #include "HTMLLabelElement.h"
+#include "HTMLFormElement.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/dom/HTMLLabelElementBinding.h"
diff --git a/dom/html/HTMLMetaElement.cpp b/dom/html/HTMLMetaElement.cpp
index 833c3177a..292e470ac 100644
--- a/dom/html/HTMLMetaElement.cpp
+++ b/dom/html/HTMLMetaElement.cpp
@@ -11,6 +11,7 @@
 #include "nsContentUtils.h"
 #include "nsStyleConsts.h"
 #include "nsIContentSecurityPolicy.h"
+#include "nsIDOMDocument.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Meta)
 
diff --git a/dom/html/ValidityState.h b/dom/html/ValidityState.h
index 4dbb94aad..adbd86c1d 100644
--- a/dom/html/ValidityState.h
+++ b/dom/html/ValidityState.h
@@ -11,6 +11,7 @@
 #include "nsIConstraintValidation.h"
 #include "nsWrapperCache.h"
 #include "js/TypeDecls.h"
+#include "nsCOMPtr.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/html/moz.build b/dom/html/moz.build
index 342b027a5..1fd5caebc 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -121,7 +121,7 @@ EXPORTS.mozilla.dom += [
     'ValidityState.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'HTMLAllCollection.cpp',
     'HTMLAnchorElement.cpp',
     'HTMLAreaElement.cpp',
@@ -204,6 +204,7 @@ UNIFIED_SOURCES += [
     'nsIConstraintValidation.cpp',
     'nsRadioVisitor.cpp',
     'nsTextEditorState.cpp',
+    'PluginDocument.cpp',
     'RadioNodeList.cpp',
     'TextTrackManager.cpp',
     'TimeRanges.cpp',
@@ -211,11 +212,6 @@ UNIFIED_SOURCES += [
     'VideoDocument.cpp',
 ]
 
-SOURCES += [
-    # Includes npapi.h.
-    'PluginDocument.cpp',
-]
-
 EXTRA_COMPONENTS += [
     'htmlMenuBuilder.js',
     'htmlMenuBuilder.manifest'
diff --git a/dom/html/nsBrowserElement.cpp b/dom/html/nsBrowserElement.cpp
index 858d1c7cb..1c2f00c15 100644
--- a/dom/html/nsBrowserElement.cpp
+++ b/dom/html/nsBrowserElement.cpp
@@ -18,8 +18,10 @@
 
 #include "mozIApplication.h"
 #include "nsComponentManagerUtils.h"
+#include "nsContentUtils.h"
 #include "nsFrameLoader.h"
 #include "nsIAppsService.h"
+#include "nsIDOMDocument.h"
 #include "nsIDOMDOMRequest.h"
 #include "nsIDOMElement.h"
 #include "nsIMozBrowserFrame.h"
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
index f530d75e1..bd9de39f0 100644
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -28,6 +28,7 @@
 #include "nsIDOMElement.h"
 #include "nsPIDOMWindow.h"
 #include "nsDOMString.h"
+#include "nsIProtocolHandler.h"
 #include "nsIStreamListener.h"
 #include "nsIURI.h"
 #include "nsIIOService.h"
diff --git a/dom/html/nsIConstraintValidation.cpp b/dom/html/nsIConstraintValidation.cpp
index 00f34df67..db69cba07 100644
--- a/dom/html/nsIConstraintValidation.cpp
+++ b/dom/html/nsIConstraintValidation.cpp
@@ -13,6 +13,8 @@
 #include "mozilla/dom/HTMLInputElement.h"
 #include "mozilla/dom/ValidityState.h"
 #include "nsIFormControl.h"
+#include "nsIMutableArray.h"
+#include "nsISimpleEnumerator.h"
 #include "nsContentUtils.h"
 
 #include "nsIFormSubmitObserver.h"