diff --git a/src/servo-gfx/font.rs b/src/servo-gfx/font.rs
index 424db468ead..933fb20e66f 100644
--- a/src/servo-gfx/font.rs
+++ b/src/servo-gfx/font.rs
@@ -1,4 +1,5 @@
 use color::Color;
+use font_context::FontContext;
 use geometry::Au;
 use render_context::RenderContext;
 use util::range::Range;
diff --git a/src/servo-gfx/quartz/font.rs b/src/servo-gfx/quartz/font.rs
index 3b97d4e6eaa..b60cb83852b 100644
--- a/src/servo-gfx/quartz/font.rs
+++ b/src/servo-gfx/quartz/font.rs
@@ -3,8 +3,8 @@ extern mod core_graphics;
 extern mod core_text;
 
 use font_context::QuartzFontContextHandle;
-use gfx::au;
-use gfx::font::{
+use geometry::Au;
+use gfx_font::{
     CSSFontWeight,
     FontHandleMethods,
     FontMetrics,
diff --git a/src/servo-gfx/servo_gfx.rc b/src/servo-gfx/servo_gfx.rc
index f96d16f2f09..6eaa8cb4a89 100644
--- a/src/servo-gfx/servo_gfx.rc
+++ b/src/servo-gfx/servo_gfx.rc
@@ -91,3 +91,4 @@ pub mod util {
     pub mod vec;
 }
 
+use gfx_font = font;
\ No newline at end of file
diff --git a/src/servo-gfx/text/harfbuzz/shaper.rs b/src/servo-gfx/text/harfbuzz/shaper.rs
index e8529e24d9a..9a858049279 100644
--- a/src/servo-gfx/text/harfbuzz/shaper.rs
+++ b/src/servo-gfx/text/harfbuzz/shaper.rs
@@ -2,15 +2,15 @@ extern mod harfbuzz;
 
 use geom::Point2D;
 
-use gfx::au;
-use gfx::{
-    Au,
+use au = geometry;
+use au::Au;
+
+use font::{
     Font,
+    FontTableTag,
 };
-use gfx::font::FontTableTag;
 
 use glyph::{GlyphStore, GlyphIndex, GlyphData};
-use servo_gfx_font::Font;
 
 use core::libc::types::common::c99::int32_t;
 use core::libc::{c_uint, c_int, c_void, c_char};