7 files changed, 8 insertions, 8 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index 5b691cef5cc..af8d151e101 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -41,7 +41,7 @@ use table_rowgroup::TableRowGroupFlow;
 use table_row::TableRowFlow;
 use table_cell::TableCellFlow;
 use text::TextRunScanner;
-use util::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper};
+use layout_data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper};
 use opaque_node::OpaqueNodeMethods;
 use wrapper::{PostorderNodeMutTraversal, PseudoElementType, TLayoutNode, ThreadSafeLayoutNode};
 
diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs
index cc6147cce46..0b48c15b042 100644
--- a/components/layout/css/matching.rs
+++ b/components/layout/css/matching.rs
@@ -8,7 +8,7 @@
 
 use css::node_style::StyledNode;
 use incremental::{self, RestyleDamage};
-use util::{LayoutDataAccess, LayoutDataWrapper};
+use layout_data::{LayoutDataAccess, LayoutDataWrapper};
 use wrapper::{LayoutElement, LayoutNode, TLayoutNode};
 
 use script::dom::node::NodeTypeId;
diff --git a/components/layout/util.rs b/components/layout/layout_data.rs
index d8a2c3f38b9..d8a2c3f38b9 100644
--- a/components/layout/util.rs
+++ b/components/layout/layout_data.rs
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 72a2948bfe2..c36e5a455ef 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -18,7 +18,7 @@ use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAI
 use layout_debug;
 use parallel::{self, UnsafeFlow};
 use sequential;
-use util::{LayoutDataAccess, LayoutDataWrapper};
+use layout_data::{LayoutDataAccess, LayoutDataWrapper};
 use opaque_node::OpaqueNodeMethods;
 use wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode};
 
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index e34704b5039..626cd6cfe74 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -68,6 +68,7 @@ pub mod flow_ref;
 pub mod fragment;
 pub mod layout_task;
 pub mod inline;
+pub mod layout_data;
 pub mod list_item;
 pub mod model;
 pub mod opaque_node;
@@ -82,7 +83,6 @@ pub mod table_row;
 pub mod table_cell;
 pub mod text;
 pub mod traversal;
-pub mod util;
 pub mod incremental;
 pub mod wrapper;
 
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs
index acc6b6fff9d..7a62bdcd661 100644
--- a/components/layout/parallel.rs
+++ b/components/layout/parallel.rs
@@ -12,10 +12,10 @@ use context::{LayoutContext, SharedLayoutContextWrapper, SharedLayoutContext};
 use flow::{Flow, MutableFlowUtils, PreorderFlowTraversal, PostorderFlowTraversal};
 use flow;
 use flow_ref::FlowRef;
-use traversal::{RecalcStyleForNode, ConstructFlows};
+use layout_data::{LayoutDataAccess, LayoutDataWrapper};
 use traversal::{BubbleISizes, AssignISizes, AssignBSizesAndStoreOverflow};
 use traversal::{ComputeAbsolutePositions, BuildDisplayList};
-use util::{LayoutDataAccess, LayoutDataWrapper};
+use traversal::{RecalcStyleForNode, ConstructFlows};
 use wrapper::{layout_node_to_unsafe_layout_node, layout_node_from_unsafe_layout_node, LayoutNode};
 use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode};
 use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 87216585d04..2c3aba244f0 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -36,8 +36,8 @@ use canvas::canvas_paint_task::CanvasMsg;
 use context::SharedLayoutContext;
 use css::node_style::StyledNode;
 use incremental::RestyleDamage;
-use util::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper};
-use util::{PrivateLayoutData};
+use layout_data::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper};
+use layout_data::{PrivateLayoutData};
 use opaque_node::OpaqueNodeMethods;
 
 use cssparser::RGBA;