diff --git a/ports/geckolib/values.rs b/components/style/gecko_values.rs
similarity index 98%
rename from ports/geckolib/values.rs
rename to components/style/gecko_values.rs
index b44d78c084e..19d242b352e 100644
--- a/ports/geckolib/values.rs
+++ b/components/style/gecko_values.rs
@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![allow(unsafe_code)]
+
 use app_units::Au;
 use cssparser::RGBA;
 use gecko_bindings::structs::{nsStyleCoord, nsStyleUnion, nsStyleUnit};
 use std::cmp::max;
-use style::values::computed::Angle;
-use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
+use values::computed::Angle;
+use values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
 
 pub trait StyleCoordHelpers {
     fn copy_from(&mut self, other: &Self);
diff --git a/components/style/lib.rs b/components/style/lib.rs
index f90368f4ca8..cf1ba6d8c7e 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -81,8 +81,8 @@ pub mod dom;
 pub mod element_state;
 pub mod error_reporting;
 pub mod font_face;
-#[cfg(feature = "gecko")]
-pub mod gecko_conversions;
+#[cfg(feature = "gecko")] pub mod gecko_conversions;
+#[cfg(feature = "gecko")] pub mod gecko_values;
 pub mod keyframes;
 pub mod logical_geometry;
 pub mod matching;
diff --git a/ports/geckolib/lib.rs b/ports/geckolib/lib.rs
index 05e766b4c56..4e38a8681d1 100644
--- a/ports/geckolib/lib.rs
+++ b/ports/geckolib/lib.rs
@@ -28,7 +28,6 @@ mod data;
 pub mod glue;
 mod selector_impl;
 mod traversal;
-mod values;
 mod wrapper;
 
 // Generated from the properties.mako.rs template by build.rs
@@ -38,6 +37,8 @@ pub mod properties {
     include!(concat!(env!("OUT_DIR"), "/properties.rs"));
 }
 
+pub use style::gecko_values as values;
+
 // FIXME(bholley): This should probably go away once we harmonize the allocators.
 #[no_mangle]
 pub extern "C" fn je_malloc_usable_size(_: *const ::libc::c_void) -> ::libc::size_t { 0 }