diff --git a/components/gfx/paint_thread.rs b/components/gfx/paint_thread.rs
index 47d6d6590cf..13754a3cf15 100644
--- a/components/gfx/paint_thread.rs
+++ b/components/gfx/paint_thread.rs
@@ -29,11 +29,11 @@ use std::collections::HashMap;
 use std::mem as std_mem;
 use std::sync::Arc;
 use std::sync::mpsc::{Receiver, Sender, channel};
+use style::thread_state;
 use url::Url;
 use util::geometry::ExpandToPixelBoundaries;
 use util::opts;
 use util::thread;
-use util::thread_state;
 
 #[derive(Clone, HeapSizeOf)]
 struct PaintLayer {
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
index 9e09007188c..3fcdaa7c986 100644
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@@ -110,6 +110,7 @@ use style::refcell::RefCell;
 use style::selector_matching::Stylist;
 use style::servo_selector_impl::USER_OR_USER_AGENT_STYLESHEETS;
 use style::stylesheets::{Stylesheet, CSSRuleIteratorExt};
+use style::thread_state;
 use style::timer::Timer;
 use style::workqueue::WorkQueue;
 use url::Url;
@@ -118,7 +119,6 @@ use util::ipc::OptionalIpcSender;
 use util::opts;
 use util::prefs::PREFS;
 use util::thread;
-use util::thread_state;
 
 /// The number of screens we have to traverse before we decide to generate new display lists.
 const DISPLAY_PORT_THRESHOLD_SIZE_FACTOR: i32 = 4;
diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs
index 3eb2a978c7a..29c4f8bad09 100644
--- a/components/script/dom/bindings/cell.rs
+++ b/components/script/dom/bindings/cell.rs
@@ -7,8 +7,8 @@
 use dom::bindings::trace::JSTraceable;
 use js::jsapi::JSTracer;
 use std::cell::{BorrowError, BorrowMutError, Ref, RefCell, RefMut};
-use util::thread_state;
-use util::thread_state::SCRIPT;
+use style::thread_state;
+use style::thread_state::SCRIPT;
 
 /// A mutable field in the DOM.
 ///
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index 12ff0aa8823..6a0dfd83dea 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -43,7 +43,7 @@ use std::intrinsics::type_name;
 use std::mem;
 use std::ops::Deref;
 use std::ptr;
-use util::thread_state;
+use style::thread_state;
 
 /// A traced reference to a DOM object
 ///
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index dfe385f0696..68899bd36b8 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -37,9 +37,9 @@ use std::mem::replace;
 use std::sync::atomic::AtomicBool;
 use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel};
 use std::sync::{Arc, Mutex};
+use style::thread_state;
 use url::Url;
 use util::thread::spawn_named;
-use util::thread_state;
 
 /// Set the `worker` field of a related DedicatedWorkerGlobalScope object to a particular
 /// value for the duration of this object's lifetime. This ensures that the related Worker
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 34e69552f18..49aa8242b34 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -76,8 +76,8 @@ use std::ops::Range;
 use string_cache::{Atom, Namespace, QualName};
 use style::dom::OpaqueNode;
 use style::selector_impl::ServoSelectorImpl;
+use style::thread_state;
 use url::Url;
-use util::thread_state;
 use uuid::Uuid;
 
 //
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index dc8a8788a61..275fffdb99a 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -32,11 +32,11 @@ use script_traits::{TimerEvent, WorkerGlobalScopeInit, ScopeThings, ServiceWorke
 use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel};
 use std::thread;
 use std::time::Duration;
+use style::thread_state;
+use style::thread_state::{IN_WORKER, SCRIPT};
 use url::Url;
 use util::prefs::PREFS;
 use util::thread::spawn_named;
-use util::thread_state;
-use util::thread_state::{IN_WORKER, SCRIPT};
 
 /// Messages used to control service worker event loop
 pub enum ServiceWorkerScriptMsg {
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs
index dfbb5ba5203..b16ca804f5c 100644
--- a/components/script/script_runtime.rs
+++ b/components/script/script_runtime.rs
@@ -25,10 +25,10 @@ use std::io::{Write, stdout};
 use std::marker::PhantomData;
 use std::os;
 use std::ptr;
+use style::thread_state;
 use time::{Tm, now};
 use util::opts;
 use util::prefs::PREFS;
-use util::thread_state;
 
 /// Common messages used to control the event loops in both the script and the worker
 pub enum CommonScriptMsg {
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 4dd3a3fba7f..4834218a89b 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -99,6 +99,7 @@ use std::sync::atomic::{Ordering, AtomicBool};
 use std::sync::mpsc::{Receiver, Select, Sender, channel};
 use std::sync::{Arc, Mutex};
 use style::context::ReflowGoal;
+use style::thread_state;
 use task_source::TaskSource;
 use task_source::dom_manipulation::{DOMManipulationTaskSource, DOMManipulationTask};
 use task_source::file_reading::FileReadingTaskSource;
@@ -109,7 +110,6 @@ use time::Tm;
 use url::{Url, Position};
 use util::opts;
 use util::thread;
-use util::thread_state;
 use webdriver_handlers;
 
 thread_local!(pub static STACK_ROOTS: Cell<Option<RootCollectionPtr>> = Cell::new(None));
diff --git a/components/style/lib.rs b/components/style/lib.rs
index 3386f812186..86b3e258859 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -101,6 +101,7 @@ pub mod sequential;
 pub mod sink;
 pub mod str;
 pub mod stylesheets;
+pub mod thread_state;
 mod tid;
 pub mod timer;
 pub mod traversal;
diff --git a/components/util/thread_state.rs b/components/style/thread_state.rs
similarity index 100%
rename from components/util/thread_state.rs
rename to components/style/thread_state.rs
diff --git a/components/style/workqueue.rs b/components/style/workqueue.rs
index 0d2da58e93d..8202b5c322e 100644
--- a/components/style/workqueue.rs
+++ b/components/style/workqueue.rs
@@ -18,8 +18,8 @@ use deque::{self, Abort, Data, Empty, Stealer, Worker};
 use rand::{Rng, XorShiftRng, weak_rng};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::{Receiver, Sender, channel};
+use thread_state;
 use util::thread::spawn_named;
-use util::thread_state;
 
 /// A unit of work.
 ///
diff --git a/components/util/lib.rs b/components/util/lib.rs
index abb02adb440..e56a0ad61d7 100644
--- a/components/util/lib.rs
+++ b/components/util/lib.rs
@@ -35,7 +35,6 @@ pub mod prefs;
 #[cfg(feature = "servo")] pub mod remutex;
 pub mod resource_files;
 pub mod thread;
-pub mod thread_state;
 
 pub fn servo_version() -> &'static str {
     concat!("Servo ", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"))
diff --git a/ports/geckolib/data.rs b/ports/geckolib/data.rs
index 235fa8094f0..d87baab86d1 100644
--- a/ports/geckolib/data.rs
+++ b/ports/geckolib/data.rs
@@ -17,9 +17,9 @@ use style::media_queries::{Device, MediaType};
 use style::parallel::WorkQueueData;
 use style::selector_matching::Stylist;
 use style::stylesheets::Stylesheet;
+use style::thread_state;
 use style::workqueue::WorkQueue;
 use style_traits::ViewportPx;
-use util::thread_state;
 
 pub struct PerDocumentStyleData {
     /// Rule processor.