diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index 675f49a2be8..ec40dad1199 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -88,7 +88,7 @@ impl ConstructionResult {
         (*self).clone()
     }
 
-    pub fn debug_id(&self) -> uint {
+    pub fn debug_id(&self) -> usize {
         match self {
             &ConstructionResult::None => 0u,
             &ConstructionResult::ConstructionItem(_) => 0u,
diff --git a/components/layout/flow.rs b/components/layout/flow.rs
index 2840f071411..976ddbc405b 100644
--- a/components/layout/flow.rs
+++ b/components/layout/flow.rs
@@ -991,9 +991,9 @@ impl BaseFlow {
         &self.weak_ref_count
     }
 
-    pub fn debug_id(&self) -> uint {
+    pub fn debug_id(&self) -> usize {
         let p = self as *const _;
-        p as uint
+        p as usize
     }
 
     /// Ensures that all display list items generated by this flow are within the flow's overflow
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 9e3a6be89a4..01128cd808b 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -267,10 +267,10 @@ impl<'ln> LayoutNode<'ln> {
                 self.type_id(), self.has_changed(), self.is_dirty(), self.has_dirty_descendants())
     }
 
-    pub fn flow_debug_id(self) -> uint {
+    pub fn flow_debug_id(self) -> usize {
         let layout_data_ref = self.borrow_layout_data();
         match *layout_data_ref {
-            None              => 0u,
+            None => 0,
             Some(ref layout_data) => layout_data.data.flow_construction_result.debug_id()
         }
     }
@@ -806,7 +806,7 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
         self.node.debug_id()
     }
 
-    pub fn flow_debug_id(self) -> uint {
+    pub fn flow_debug_id(self) -> usize {
         self.node.flow_debug_id()
     }