--- a/layout/style/CSSLexer.h
+++ b/layout/style/CSSLexer.h
@@ -4,16 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef CSSLexer_h___
 #define CSSLexer_h___
 
 #include "mozilla/UniquePtr.h"
 #include "nsCSSScanner.h"
 #include "mozilla/dom/CSSLexerBinding.h"
+#include "mozilla/dom/NonRefcountedDOMObject.h"
 
 namespace mozilla {
 namespace dom {
 
 class CSSLexer : public NonRefcountedDOMObject
 {
 public:
   explicit CSSLexer(const nsAString&);

--- a/layout/style/ServoCSSRuleList.h
+++ b/layout/style/ServoCSSRuleList.h
@@ -14,17 +14,17 @@
 
 namespace mozilla {
 
 class ServoStyleSheet;
 namespace css {
 class Rule;
 } // namespace css
 
-class ServoCSSRuleList final : public CSSRuleList
+class ServoCSSRuleList final : public dom::CSSRuleList
 {
 public:
   ServoCSSRuleList(ServoStyleSheet* aStyleSheet,
                    already_AddRefed<ServoCssRules> aRawRules);
 
   ServoStyleSheet* GetParentObject() final { return mStyleSheet; }
 
   nsIDOMCSSRule* IndexedGetter(uint32_t aIndex, bool& aFound) final;

--- a/layout/style/nsCSSPseudoClasses.h
+++ b/layout/style/nsCSSPseudoClasses.h
@@ -4,16 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* atom list for CSS pseudo-classes */
 
 #ifndef nsCSSPseudoClasses_h___
 #define nsCSSPseudoClasses_h___
 
 #include "nsStringFwd.h"
+#include "mozilla/CSSEnabledState.h"
 
 // The following two flags along with the pref defines where this pseudo
 // class can be used:
 // * If none of the two flags is presented, the pref completely controls
 //   the availability of this pseudo class. And in that case, if it has
 //   no pref, this property is usable everywhere.
 // * If any of the flags is set, this pseudo class is always enabled in
 //   the specific contexts regardless of the value of the pref. If there