3 files changed, 6 insertions, 8 deletions
diff --git a/components/shared/compositing/Cargo.toml b/components/shared/compositing/Cargo.toml
index b35e7560f3e..aed9a0e3565 100644
--- a/components/shared/compositing/Cargo.toml
+++ b/components/shared/compositing/Cargo.toml
@@ -11,6 +11,7 @@ name = "compositing_traits"
 path = "lib.rs"
 
 [dependencies]
+base = { workspace = true }
 canvas = { path = "../../canvas" }
 crossbeam-channel = { workspace = true }
 embedder_traits = { workspace = true }
@@ -19,7 +20,6 @@ gfx_traits = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
 log = { workspace = true }
-msg = { workspace = true }
 net_traits = { workspace = true }
 script_traits = { workspace = true }
 servo_url = { path = "../../url" }
diff --git a/components/shared/compositing/constellation_msg.rs b/components/shared/compositing/constellation_msg.rs
index 2a64db84651..2536a6cfc05 100644
--- a/components/shared/compositing/constellation_msg.rs
+++ b/components/shared/compositing/constellation_msg.rs
@@ -6,16 +6,14 @@ use std::collections::HashMap;
 use std::fmt;
 use std::time::Duration;
 
+use base::id::{BrowsingContextId, PipelineId, TopLevelBrowsingContextId, WebViewId};
+use base::Epoch;
 use embedder_traits::Cursor;
-use gfx_traits::Epoch;
 use ipc_channel::ipc::IpcSender;
 use keyboard_types::KeyboardEvent;
-use msg::constellation_msg::{
-    BrowsingContextId, PipelineId, TopLevelBrowsingContextId, TraversalDirection, WebViewId,
-};
 use script_traits::{
     AnimationTickType, CompositorEvent, GamepadEvent, LogEntry, MediaSessionActionType,
-    WebDriverCommandMsg, WindowSizeData, WindowSizeType,
+    TraversalDirection, WebDriverCommandMsg, WindowSizeData, WindowSizeType,
 };
 use servo_url::ServoUrl;
 
diff --git a/components/shared/compositing/lib.rs b/components/shared/compositing/lib.rs
index 21f77a4cae6..34c390cca85 100644
--- a/components/shared/compositing/lib.rs
+++ b/components/shared/compositing/lib.rs
@@ -8,15 +8,15 @@ mod constellation_msg;
 
 use std::fmt::{Debug, Error, Formatter};
 
+use base::id::{PipelineId, TopLevelBrowsingContextId};
+use base::Epoch;
 use canvas::canvas_paint_thread::ImageUpdate;
 pub use constellation_msg::ConstellationMsg;
 use crossbeam_channel::{Receiver, Sender};
 use embedder_traits::EventLoopWaker;
 use euclid::Rect;
-use gfx_traits::Epoch;
 use ipc_channel::ipc::IpcSender;
 use log::warn;
-use msg::constellation_msg::{PipelineId, TopLevelBrowsingContextId};
 use net_traits::image::base::Image;
 use net_traits::NetToCompositorMsg;
 use script_traits::{