diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h
index 1d8ded495273..001779d27ff4 100644
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -112,6 +112,7 @@ class nsIVariant;
 class nsViewManager;
 class nsPresContext;
 class nsRange;
+class nsSimpleContentList;
 class nsSMILAnimationController;
 class nsSVGElement;
 class nsTextNode;
diff --git a/layout/style/ServoBindingTypes.h b/layout/style/ServoBindingTypes.h
index 0595b2e6d8c2..5a0249727cdc 100644
--- a/layout/style/ServoBindingTypes.h
+++ b/layout/style/ServoBindingTypes.h
@@ -21,7 +21,6 @@ struct RawServoStyleSet;
 struct RawServoSelectorList;
 struct RawServoSourceSizeList;
 struct RawServoAnimationValueMap;
-struct RustString;
 struct StyleUseCounters;
 
 #define SERVO_ARC_TYPE(name_, type_) struct type_;
@@ -42,12 +41,8 @@ struct ComputedTiming;
 struct Keyframe;
 struct PropertyValuePair;
 struct PropertyStyleAnimationValuePair;
-enum class OriginFlags : uint8_t;
 using ComputedKeyframeValues = nsTArray<PropertyStyleAnimationValuePair>;
 } // namespace mozilla
-namespace nsStyleTransformMatrix {
-enum class MatrixTransformOperator: uint8_t;
-}
 
 class nsCSSPropertyIDSet;
 class nsCSSValue;
@@ -55,7 +50,6 @@ struct nsFontFaceRuleContainer;
 class nsIDocument;
 class nsINode;
 class nsPresContext;
-class nsSimpleContentList;
 struct nsTimingFunction;
 class nsXBLBinding;
 
diff --git a/layout/style/ServoBindings.h b/layout/style/ServoBindings.h
index f33f3333010c..4774cf627a48 100644
--- a/layout/style/ServoBindings.h
+++ b/layout/style/ServoBindings.h
@@ -30,6 +30,7 @@ namespace mozilla {
   class SharedFontList;
   class StyleSheet;
   enum class CSSPseudoElementType : uint8_t;
+  enum class OriginFlags : uint8_t;
   struct Keyframe;
 
   namespace css {
@@ -45,6 +46,10 @@ namespace mozilla {
   }
 }
 
+namespace nsStyleTransformMatrix {
+  enum class MatrixTransformOperator: uint8_t;
+}
+
 extern "C" {
 
 // Element data
diff --git a/layout/style/StyleSheet.h b/layout/style/StyleSheet.h
index 4dda9d83c650..8c88eabb38a2 100644
--- a/layout/style/StyleSheet.h
+++ b/layout/style/StyleSheet.h
@@ -31,6 +31,7 @@ namespace mozilla {
 
 class ServoCSSRuleList;
 class ServoStyleSet;
+enum class OriginFlags : uint8_t;
 
 typedef MozPromise</* Dummy */ bool,
                    /* Dummy */ bool,
@@ -146,7 +147,7 @@ public:
   ServoCSSRuleList* GetCssRulesInternal();
 
   // Returns the stylesheet's Servo origin as an OriginFlags value.
-  OriginFlags GetOrigin();
+  mozilla::OriginFlags GetOrigin();
 
   /**
    * The different changes that a stylesheet may go through.