5 files changed, 47 insertions, 6 deletions
diff --git a/components/derive_common/Cargo.toml b/components/derive_common/Cargo.toml
index c3fe0456e6a..5677069ad56 100644
--- a/components/derive_common/Cargo.toml
+++ b/components/derive_common/Cargo.toml
@@ -3,7 +3,6 @@ name = "derive_common"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
-edition = "2018"
 publish = false
 
 [lib]
diff --git a/components/derive_common/cg.rs b/components/derive_common/cg.rs
index 26a32ccd89a..021c47e79ef 100644
--- a/components/derive_common/cg.rs
+++ b/components/derive_common/cg.rs
@@ -4,11 +4,11 @@
 
 use darling::{FromDeriveInput, FromField, FromVariant};
 use proc_macro2::{Span, TokenStream};
-use quote::{quote, TokenStreamExt};
+use quote::TokenStreamExt;
 use syn::{
-    self, parse_quote, AngleBracketedGenericArguments, AssocType, DeriveInput, Field,
-    GenericArgument, GenericParam, Ident, Path, PathArguments, PathSegment, QSelf, Type, TypeArray,
-    TypeGroup, TypeParam, TypeParen, TypePath, TypeSlice, TypeTuple, Variant, WherePredicate,
+    self, AngleBracketedGenericArguments, AssocType, DeriveInput, Field, GenericArgument,
+    GenericParam, Ident, Path, PathArguments, PathSegment, QSelf, Type, TypeArray, TypeGroup,
+    TypeParam, TypeParen, TypePath, TypeSlice, TypeTuple, Variant, WherePredicate,
 };
 use synstructure::{self, BindStyle, BindingInfo, VariantAst, VariantInfo};
 
diff --git a/components/derive_common/lib.rs b/components/derive_common/lib.rs
index de1a5cf75b2..14415351449 100644
--- a/components/derive_common/lib.rs
+++ b/components/derive_common/lib.rs
@@ -2,4 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+extern crate darling;
+extern crate proc_macro2;
+#[macro_use]
+extern crate quote;
+#[macro_use]
+extern crate syn;
+extern crate synstructure;
+
 pub mod cg;
diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml
index 682e009ffbc..1849d1ccb07 100644
--- a/components/malloc_size_of/Cargo.toml
+++ b/components/malloc_size_of/Cargo.toml
@@ -3,7 +3,6 @@ name = "malloc_size_of"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
-edition = "2018"
 publish = false
 
 [lib]
diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs
index ed68e72832d..1e2625d01d5 100644
--- a/components/malloc_size_of/lib.rs
+++ b/components/malloc_size_of/lib.rs
@@ -46,6 +46,41 @@
 //!   Note: WebRender has a reduced fork of this crate, so that we can avoid
 //!   publishing this crate on crates.io.
 
+#[cfg(feature = "servo")]
+extern crate accountable_refcell;
+extern crate app_units;
+#[cfg(feature = "servo")]
+extern crate content_security_policy;
+#[cfg(feature = "servo")]
+extern crate crossbeam_channel;
+extern crate cssparser;
+extern crate euclid;
+#[cfg(feature = "servo")]
+extern crate http;
+#[cfg(feature = "servo")]
+extern crate keyboard_types;
+extern crate selectors;
+#[cfg(feature = "servo")]
+extern crate serde;
+#[cfg(feature = "servo")]
+extern crate serde_bytes;
+extern crate servo_arc;
+extern crate smallbitvec;
+extern crate smallvec;
+#[cfg(feature = "servo")]
+extern crate string_cache;
+#[cfg(feature = "servo")]
+extern crate time;
+#[cfg(feature = "url")]
+extern crate url;
+#[cfg(feature = "servo")]
+extern crate uuid;
+extern crate void;
+#[cfg(feature = "webrender_api")]
+extern crate webrender_api;
+#[cfg(feature = "servo")]
+extern crate xml5ever;
+
 use std::hash::{BuildHasher, Hash};
 use std::mem::size_of;
 use std::ops::{Deref, DerefMut, Range};