diff --git a/src/servo/gfx/freetype/native_font.rs b/src/servo/gfx/freetype/native_font.rs
index 5f7ce50f083..f877d23bc52 100644
--- a/src/servo/gfx/freetype/native_font.rs
+++ b/src/servo/gfx/freetype/native_font.rs
@@ -5,11 +5,11 @@ use font_context::FreeTypeFontContext;
 
 use gfx::geometry;
 use gfx::geometry::Au;
-use util::*;
 use vec_as_buf = vec::as_imm_buf;
 use ptr::{addr_of, null};
 use cast::reinterpret_cast;
 use glyph::GlyphIndex;
+use servo_util::text::{float_to_fixed, fixed_to_float};
 
 use freetype::{ FT_Error, FT_Library, FT_Face, FT_Long, FT_ULong, FT_Size, FT_SizeRec,
                FT_UInt, FT_GlyphSlot, FT_Size_Metrics, FT_FaceRec, FT_F26Dot6 };
diff --git a/src/servo/util/text.rs b/src/servo/util/text.rs
index 7a475eab68b..6f39291978e 100644
--- a/src/servo/util/text.rs
+++ b/src/servo/util/text.rs
@@ -162,7 +162,7 @@ fn test_transform_discard_newline() {
                                    ~"foo bar baz",
                                    ~"foobarbaz"];
 
-    assert vec::same_length(test_strs, oracle_strs);
+    assert core::vec::same_length(test_strs, oracle_strs);
     let mode = DiscardNewline;
 
     for uint::range(0, test_strs.len()) |i| {
@@ -188,7 +188,7 @@ fn test_transform_compress_whitespace() {
                                  ~"foo bar baz",
                                  ~"foobarbaz\n\n"];
 
-    assert vec::same_length(test_strs, oracle_strs);
+    assert core::vec::same_length(test_strs, oracle_strs);
     let mode = CompressWhitespace;
 
     for uint::range(0, test_strs.len()) |i| {
@@ -214,7 +214,7 @@ fn test_transform_compress_whitespace_newline() {
                                  ~"foo bar baz",
                                  ~"foobarbaz "];
 
-    assert vec::same_length(test_strs, oracle_strs);
+    assert core::vec::same_length(test_strs, oracle_strs);
     let mode = CompressWhitespaceNewline;
 
     for uint::range(0, test_strs.len()) |i| {