diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 8d7147f6ad2..386d0ad5b43 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -8,14 +8,13 @@ use Atom;
 use app_units::Au;
 use euclid::Size2D;
 use gecko_bindings::bindings;
+use media_queries::Device;
+use media_queries::media_feature::{AllowsRanges, ParsingRequirements};
+use media_queries::media_feature::{MediaFeatureDescription, Evaluator};
+use media_queries::media_feature_expression::{AspectRatio, RangeOrOperator};
 use values::computed::CSSPixelLength;
 use values::computed::Resolution;
 
-use media_queries::Device;
-use media_queries::media_feature::{MediaFeatureDescription, Evaluator};
-use media_queries::media_feature::{AllowsRanges, ParsingRequirements};
-use media_queries::media_feature_expression::{AspectRatio, RangeOrOperator};
-
 fn viewport_size(device: &Device) -> Size2D<Au> {
     let pc = device.pres_context();
     if pc.mIsRootPaginatedDocument() != 0 {
@@ -146,7 +145,7 @@ fn eval_device_pixel_ratio(
     )
 }
 
-#[derive(Debug, Copy, Clone, FromPrimitive, ToCss, Parse)]
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 enum Orientation {
     Landscape,
@@ -193,7 +192,7 @@ fn eval_device_orientation(
 }
 
 /// Values for the display-mode media feature.
-#[derive(Debug, Copy, Clone, FromPrimitive, ToCss, Parse)]
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 #[allow(missing_docs)]
 pub enum DisplayMode {
@@ -239,7 +238,7 @@ fn eval_transform_3d(
     query_value.map_or(supports_transforms, |v| v == supports_transforms)
 }
 
-#[derive(Debug, Copy, Clone, FromPrimitive, ToCss, Parse)]
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 enum Scan {
     Progressive,
@@ -314,7 +313,7 @@ fn eval_resolution(
     )
 }
 
-#[derive(Debug, Copy, Clone, FromPrimitive, ToCss, Parse)]
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 enum PrefersReducedMotion {
     NoPreference,
diff --git a/components/style/media_queries/media_feature.rs b/components/style/media_queries/media_feature.rs
index fc486f0e627..5a5bc88863e 100644
--- a/components/style/media_queries/media_feature.rs
+++ b/components/style/media_queries/media_feature.rs
@@ -4,14 +4,13 @@
 
 //! Media features.
 
-use super::Device;
-use super::media_feature_expression::{AspectRatio, RangeOrOperator};
-
 use Atom;
 use cssparser::Parser;
 use parser::ParserContext;
 use std::fmt;
 use style_traits::ParseError;
+use super::Device;
+use super::media_feature_expression::{AspectRatio, RangeOrOperator};
 use values::computed::{CSSPixelLength, Resolution};
 
 /// A generic discriminant for an enum value.
@@ -132,7 +131,7 @@ bitflags! {
 }
 
 /// Whether a media feature allows ranges or not.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 #[allow(missing_docs)]
 pub enum AllowsRanges {
     Yes,
diff --git a/components/style/media_queries/media_feature_expression.rs b/components/style/media_queries/media_feature_expression.rs
index 81bbb69c1a1..f07b8cc27e4 100644
--- a/components/style/media_queries/media_feature_expression.rs
+++ b/components/style/media_queries/media_feature_expression.rs
@@ -5,13 +5,11 @@
 //! Parsing for media feature expressions, like `(foo: bar)` or
 //! `(width >= 400px)`.
 
-use super::Device;
-use super::media_feature::{Evaluator, MediaFeatureDescription};
-use super::media_feature::{ParsingRequirements, KeywordDiscriminant};
-
 use Atom;
-use cssparser::{Parser, Token};
 use context::QuirksMode;
+use cssparser::{Parser, Token};
+#[cfg(feature = "gecko")]
+use gecko_bindings::structs;
 use num_traits::Zero;
 use parser::{Parse, ParserContext};
 use std::cmp::{PartialOrd, Ordering};
@@ -19,17 +17,12 @@ use std::fmt::{self, Write};
 use str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
 use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
 use stylesheets::Origin;
+use super::Device;
+use super::media_feature::{Evaluator, MediaFeatureDescription};
+use super::media_feature::{ParsingRequirements, KeywordDiscriminant};
 use values::{serialize_atom_identifier, CSSFloat};
-use values::specified::{Integer, Length, Number, Resolution};
 use values::computed::{self, ToComputedValue};
-
-#[cfg(feature = "gecko")]
-use gecko_bindings::structs;
-
-#[cfg(feature = "gecko")]
-use gecko::media_features::MEDIA_FEATURES;
-#[cfg(feature = "servo")]
-use servo::media_queries::MEDIA_FEATURES;
+use values::specified::{Integer, Length, Number, Resolution};
 
 /// An aspect ratio, with a numerator and denominator.
 #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq)]
@@ -287,6 +280,11 @@ impl MediaFeatureExpression {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Self, ParseError<'i>> {
+        #[cfg(feature = "gecko")]
+        use gecko::media_features::MEDIA_FEATURES;
+        #[cfg(feature = "servo")]
+        use servo::media_queries::MEDIA_FEATURES;
+
         // FIXME: remove extra indented block when lifetimes are non-lexical
         let feature;
         let range;
diff --git a/components/style/servo/media_queries.rs b/components/style/servo/media_queries.rs
index ab4240815b4..98b1ec7ae6f 100644
--- a/components/style/servo/media_queries.rs
+++ b/components/style/servo/media_queries.rs
@@ -8,6 +8,9 @@ use app_units::Au;
 use cssparser::RGBA;
 use euclid::{Size2D, TypedScale, TypedSize2D};
 use media_queries::MediaType;
+use media_queries::media_feature::{AllowsRanges, ParsingRequirements};
+use media_queries::media_feature::{MediaFeatureDescription, Evaluator};
+use media_queries::media_feature_expression::RangeOrOperator;
 use properties::ComputedValues;
 use std::sync::atomic::{AtomicBool, AtomicIsize, Ordering};
 use style_traits::{CSSPixel, DevicePixel};
@@ -16,10 +19,6 @@ use values::KeyframesName;
 use values::computed::CSSPixelLength;
 use values::computed::font::FontSize;
 
-use media_queries::media_feature::{MediaFeatureDescription, Evaluator};
-use media_queries::media_feature::{AllowsRanges, ParsingRequirements};
-use media_queries::media_feature_expression::RangeOrOperator;
-
 /// A device is a structure that represents the current media a given document
 /// is displayed in.
 ///
@@ -168,7 +167,7 @@ fn eval_width(
     )
 }
 
-#[derive(Debug, Copy, Clone, FromPrimitive, ToCss, Parse)]
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 enum Scan {
     Progressive,