diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs
index 3a99014a316..f5bb4a598f3 100644
--- a/components/style/build_gecko.rs
+++ b/components/style/build_gecko.rs
@@ -234,6 +234,8 @@ mod bindings {
             .include(add_include("mozilla/ServoElementSnapshot.h"))
             .include(add_include("mozilla/dom/Element.h"))
             .include(add_include("mozilla/ServoBindings.h"))
+            .include(add_include("nsMediaFeatures.h"))
+            .include(add_include("nsMediaList.h"))
             // FIXME(emilio): Incrementally remove these "pub use"s. Probably
             // mozilla::css and mozilla::dom are easier.
             .raw_line("pub use self::root::*;")
@@ -295,6 +297,14 @@ mod bindings {
             "nsChangeHint",
             "nsCSSKeyword",
             "nsCSSPropertyID",
+            "nsCSSProps",
+
+            // FIXME(emilio): These three can go away once
+            // https://github.com/servo/rust-bindgen/pull/397 has landed.
+            "nsStyleStructID",
+            "nsStyleAnimType",
+            "UseCounter",
+
             "nsCSSRect",
             "nsCSSRect_heap",
             "nsCSSShadowArray",
@@ -315,6 +325,10 @@ mod bindings {
             "nsMainThreadPtrHandle",
             "nsMainThreadPtrHolder",
             "nsMargin",
+            "nsMediaExpression",
+            "nsMediaFeature",
+            "nsMediaFeatures",
+            "nsMediaList",
             "nsRect",
             "nsRestyleHint",
             "nsresult",
@@ -375,6 +389,7 @@ mod bindings {
             "mozilla::DefaultDelete",
         ];
         let opaque_types = [
+            "std::pair__PCCP",
             "std::namespace::atomic___base", "std::atomic__My_base",
             "nsAString_internal_char_traits",
             "nsAString_internal_incompatible_char_type",