diff --git a/components/style/font_face.rs b/components/style/font_face.rs
index 5255efdfd5b..5a111925ae7 100644
--- a/components/style/font_face.rs
+++ b/components/style/font_face.rs
@@ -22,12 +22,12 @@ use style_traits::{Comma, CssWriter, OneOrMoreSeparated, ParseError};
 use style_traits::{StyleParseErrorKind, ToCss};
 use style_traits::values::SequenceWriter;
 use values::computed::font::FamilyName;
-#[cfg(feature = "gecko")]
-use values::specified::font::{SpecifiedFontFeatureSettings, SpecifiedFontVariationSettings};
-use values::specified::font::{AbsoluteFontWeight, FontStretch as SpecifiedFontStretch};
-use values::specified::font::SpecifiedFontStyle;
 use values::generics::font::FontStyle as GenericFontStyle;
 use values::specified::Angle;
+use values::specified::font::{AbsoluteFontWeight, FontStretch as SpecifiedFontStretch};
+#[cfg(feature = "gecko")]
+use values::specified::font::{SpecifiedFontFeatureSettings, SpecifiedFontVariationSettings};
+use values::specified::font::SpecifiedFontStyle;
 use values::specified::url::SpecifiedUrl;
 
 /// A source for a font-face rule.
diff --git a/components/style/gecko/rules.rs b/components/style/gecko/rules.rs
index afec7280ac3..a57314a418c 100644
--- a/components/style/gecko/rules.rs
+++ b/components/style/gecko/rules.rs
@@ -14,8 +14,8 @@ use properties::longhands::font_language_override;
 use std::str;
 use values::computed::font::FamilyName;
 use values::generics::font::FontTag;
-use values::specified::font::{SpecifiedFontFeatureSettings, SpecifiedFontVariationSettings};
 use values::specified::font::{AbsoluteFontWeight, FontStretch as SpecifiedFontStretch};
+use values::specified::font::{SpecifiedFontFeatureSettings, SpecifiedFontVariationSettings};
 use values::specified::font::SpecifiedFontStyle;
 
 impl<'a> ToNsCssValue for &'a FamilyName {
diff --git a/components/style/values/computed/percentage.rs b/components/style/values/computed/percentage.rs
index 9f214e9651d..7ca504d2aff 100644
--- a/components/style/values/computed/percentage.rs
+++ b/components/style/values/computed/percentage.rs
@@ -6,8 +6,8 @@
 
 use std::fmt;
 use style_traits::{CssWriter, ToCss};
-use values::animated::ToAnimatedValue;
 use values::{serialize_percentage, CSSFloat};
+use values::animated::ToAnimatedValue;
 use values::generics::NonNegative;
 
 /// A computed percentage.
diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index b83727f16f0..fa4d972ef16 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -21,8 +21,8 @@ use values::computed::{Angle as ComputedAngle, Percentage as ComputedPercentage}
 use values::computed::{font as computed, Context, Length, NonNegativeLength, ToComputedValue};
 use values::computed::font::{FamilyName, FontFamilyList, FontStyleAngle, SingleFontFamily};
 use values::generics::NonNegative;
+use values::generics::font::{KeywordSize, VariationValue};
 use values::generics::font::{self as generics, FeatureTagValue, FontSettings, FontTag};
-use values::generics::font::{KeywordInfo as GenericKeywordInfo, KeywordSize, VariationValue};
 use values::specified::{AllowQuirks, Angle, Integer, LengthOrPercentage, NoCalcLength, Number, Percentage};
 use values::specified::length::{FontBaseSize, AU_PER_PT, AU_PER_PX};
 
@@ -684,7 +684,7 @@ impl Parse for FontSizeAdjust {
 }
 
 /// Additional information for specified keyword-derived font sizes.
-pub type KeywordInfo = GenericKeywordInfo<NonNegativeLength>;
+pub type KeywordInfo = generics::KeywordInfo<NonNegativeLength>;
 
 impl KeywordInfo {
     /// Computes the final size for this font-size keyword, accounting for
diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs
index 815fadc70ef..04d5a22cd40 100644
--- a/ports/geckolib/glue.rs
+++ b/ports/geckolib/glue.rs
@@ -3800,8 +3800,8 @@ pub extern "C" fn Servo_DeclarationBlock_SetKeywordValue(
 ) {
     use style::properties::{PropertyDeclaration, LonghandId};
     use style::properties::longhands;
-    use style::values::specified::BorderStyle;
     use style::values::generics::font::FontStyle;
+    use style::values::specified::BorderStyle;
 
     let long = get_longhand_from_id!(property);
     let value = value as u32;