diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs
index d4c2656ae86..bb6eddb628c 100644
--- a/components/malloc_size_of/lib.rs
+++ b/components/malloc_size_of/lib.rs
@@ -56,9 +56,9 @@ extern crate smallbitvec;
 extern crate smallvec;
 #[cfg(feature = "servo")]
 extern crate string_cache;
-#[cfg(feature = "servo")]
+#[cfg(feature = "url")]
 extern crate url;
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 extern crate webrender_api;
 #[cfg(feature = "servo")]
 extern crate xml5ever;
@@ -803,7 +803,7 @@ malloc_size_of_is_0!(app_units::Au);
 
 malloc_size_of_is_0!(cssparser::RGBA, cssparser::TokenSerializationType);
 
-#[cfg(feature = "servo")]
+#[cfg(feature = "url")]
 impl MallocSizeOf for url::Host {
     fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
         match *self {
@@ -812,49 +812,49 @@ impl MallocSizeOf for url::Host {
         }
     }
 }
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BorderRadius);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BorderStyle);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BorderWidths);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BoxShadowClipMode);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ClipAndScrollInfo);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ColorF);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ExtendMode);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::FilterOp);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ExternalScrollId);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::GradientStop);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ImageBorder);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ImageKey);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ImageRendering);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::LineStyle);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::LocalClip);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::MixBlendMode);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::NormalBorder);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::RepeatMode);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ScrollPolicy);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ScrollSensitivity);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::StickyOffsetBounds);
-#[cfg(feature = "servo")]
+#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::TransformStyle);
 
 #[cfg(feature = "servo")]