diff --git a/servo/components/compositing/constellation.rs b/servo/components/compositing/constellation.rs
index c3d0c247b181..50e755eb086a 100644
--- a/servo/components/compositing/constellation.rs
+++ b/servo/components/compositing/constellation.rs
@@ -16,7 +16,7 @@ use canvas::webgl_paint_task::WebGLPaintTask;
 use canvas_traits::CanvasMsg;
 use compositor_task::CompositorProxy;
 use compositor_task::Msg as CompositorMsg;
-use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlChan, DevtoolsControlMsg};
+use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg};
 use euclid::point::Point2D;
 use euclid::rect::{Rect, TypedRect};
 use euclid::size::Size2D;
@@ -81,7 +81,7 @@ pub struct Constellation<LTF, STF> {
     pub image_cache_task: ImageCacheTask,
 
     /// A channel through which messages can be sent to the developer tools.
-    devtools_chan: Option<DevtoolsControlChan>,
+    devtools_chan: Option<Sender<DevtoolsControlMsg>>,
 
     /// A channel through which messages can be sent to the storage task.
     storage_task: StorageTask,
@@ -225,7 +225,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
                  font_cache_task: FontCacheTask,
                  time_profiler_chan: time::ProfilerChan,
                  mem_profiler_chan: mem::ProfilerChan,
-                 devtools_chan: Option<DevtoolsControlChan>,
+                 devtools_chan: Option<Sender<DevtoolsControlMsg>>,
                  storage_task: StorageTask,
                  supports_clipboard: bool)
                  -> ConstellationChan {
diff --git a/servo/components/compositing/pipeline.rs b/servo/components/compositing/pipeline.rs
index 83e5c0c2bc13..68f977f7ea68 100644
--- a/servo/components/compositing/pipeline.rs
+++ b/servo/components/compositing/pipeline.rs
@@ -8,7 +8,7 @@ use script_traits::{LayoutControlMsg, ScriptControlChan, ScriptTaskFactory};
 use script_traits::{NewLayoutInfo, ConstellationControlMsg};
 
 use compositor_task;
-use devtools_traits::{DevtoolsControlChan, DevtoolsControlMsg, ScriptToDevtoolsControlMsg};
+use devtools_traits::{DevtoolsControlMsg, ScriptToDevtoolsControlMsg};
 use euclid::rect::{TypedRect};
 use euclid::scale_factor::ScaleFactor;
 use gfx::paint_task::{ChromeToPaintMsg, LayoutToPaintMsg, PaintTask};
@@ -72,7 +72,7 @@ impl Pipeline {
                            parent_info: Option<(PipelineId, SubpageId)>,
                            constellation_chan: ConstellationChan,
                            compositor_proxy: Box<CompositorProxy+'static+Send>,
-                           devtools_chan: Option<DevtoolsControlChan>,
+                           devtools_chan: Option<Sender<DevtoolsControlMsg>>,
                            image_cache_task: ImageCacheTask,
                            font_cache_task: FontCacheTask,
                            resource_task: ResourceTask,
diff --git a/servo/components/devtools_traits/lib.rs b/servo/components/devtools_traits/lib.rs
index 1a1f1857cea5..0183f325c65a 100644
--- a/servo/components/devtools_traits/lib.rs
+++ b/servo/components/devtools_traits/lib.rs
@@ -39,9 +39,6 @@ use time::Duration;
 use std::net::TcpStream;
 use std::sync::mpsc::{Receiver, Sender};
 
-pub type DevtoolsControlChan = Sender<DevtoolsControlMsg>;
-pub type DevtoolsControlPort = Receiver<DevtoolScriptControlMsg>;
-
 // Information would be attached to NewGlobal to be received and show in devtools.
 // Extend these fields if we need more information.
 #[derive(Deserialize, Serialize)]
diff --git a/servo/components/script/script_task.rs b/servo/components/script/script_task.rs
index 17c38a2de878..efbad39dc86f 100644
--- a/servo/components/script/script_task.rs
+++ b/servo/components/script/script_task.rs
@@ -53,7 +53,7 @@ use timers::TimerId;
 use devtools;
 use webdriver_handlers;
 
-use devtools_traits::{DevtoolsControlPort, DevtoolsPageInfo, DevtoolScriptControlMsg};
+use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
 use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType};
 use devtools_traits::{TracingMetadata};
 use script_traits::CompositorEvent::{MouseDownEvent, MouseUpEvent};
@@ -336,7 +336,7 @@ pub struct ScriptTask {
     devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
     /// For receiving commands from an optional devtools server. Will be ignored if
     /// no such server exists.
-    devtools_port: DevtoolsControlPort,
+    devtools_port: Receiver<DevtoolScriptControlMsg>,
     devtools_sender: IpcSender<DevtoolScriptControlMsg>,
     /// For sending timeline markers. Will be ignored if
     /// no devtools server