diff --git a/src/wayland/protocols/workspace/ext.rs b/src/wayland/protocols/workspace/ext.rs
index 0e657d01..0e3d73e8 100644
--- a/src/wayland/protocols/workspace/ext.rs
+++ b/src/wayland/protocols/workspace/ext.rs
@@ -2,23 +2,37 @@
 
 use cosmic_protocols::workspace::v2::server::zcosmic_workspace_handle_v2::ZcosmicWorkspaceHandleV2;
 
-use smithay::reexports::wayland_server::{
-    backend::ClientId, Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
-    Weak,
+use smithay::{
+    output::Output,
+    reexports::{
+        wayland_protocols::ext::workspace::v1::server::{
+            ext_workspace_group_handle_v1::{self, ExtWorkspaceGroupHandleV1, GroupCapabilities},
+            ext_workspace_handle_v1::{self, ExtWorkspaceHandleV1},
+            ext_workspace_manager_v1::{self, ExtWorkspaceManagerV1},
+        },
+        wayland_server::{
+            backend::ClientId, protocol::wl_output::WlOutput, Client, DataInit, Dispatch,
+            DisplayHandle, GlobalDispatch, New, Resource, Weak,
+        },
+    },
 };
 
-use std::sync::Mutex;
+use std::{collections::HashSet, sync::Mutex};
 
 use super::{
     Request, Workspace, WorkspaceCapabilities, WorkspaceClientHandler, WorkspaceGlobalData,
-    WorkspaceGroup, WorkspaceGroupData, WorkspaceGroupHandle, WorkspaceHandler, WorkspaceState,
+    WorkspaceGroup, WorkspaceGroupHandle, WorkspaceHandler, WorkspaceState,
 };
 
-use smithay::reexports::wayland_protocols::ext::workspace::v1::server::{
-    ext_workspace_group_handle_v1::{self, ExtWorkspaceGroupHandleV1},
-    ext_workspace_handle_v1::{self, ExtWorkspaceHandleV1},
-    ext_workspace_manager_v1::{self, ExtWorkspaceManagerV1},
-};
+#[derive(Default)]
+pub struct WorkspaceGroupDataInner {
+    outputs: Vec<Output>,
+    wl_outputs: HashSet<WlOutput>,
+    capabilities: Option<GroupCapabilities>,
+    workspace_count: usize,
+}
+
+pub type WorkspaceGroupData = Mutex<WorkspaceGroupDataInner>;
 
 #[derive(Default)]
 pub struct WorkspaceDataInner {
diff --git a/src/wayland/protocols/workspace/mod.rs b/src/wayland/protocols/workspace/mod.rs
index 2012265d..fa3ac4f5 100644
--- a/src/wayland/protocols/workspace/mod.rs
+++ b/src/wayland/protocols/workspace/mod.rs
@@ -1,18 +1,17 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use std::{collections::HashSet, sync::Mutex};
+use std::sync::Mutex;
 
 use smithay::{
     output::Output,
     reexports::{
         wayland_protocols::ext::workspace::v1::server::{
-            ext_workspace_group_handle_v1::ExtWorkspaceGroupHandleV1,
+            ext_workspace_group_handle_v1::{ExtWorkspaceGroupHandleV1, GroupCapabilities},
             ext_workspace_handle_v1::{self, ExtWorkspaceHandleV1},
             ext_workspace_manager_v1::ExtWorkspaceManagerV1,
         },
         wayland_server::{
             backend::{ClientData, GlobalId, ObjectId},
-            protocol::wl_output::WlOutput,
             Client, Dispatch, DisplayHandle, GlobalDispatch, Resource, Weak,
         },
     },
@@ -27,9 +26,7 @@ use cosmic_protocols::workspace::v2::server::{
 mod cosmic_v2;
 pub use cosmic_v2::CosmicWorkspaceV2Data;
 mod ext;
-pub use ext::WorkspaceData;
-
-pub use smithay::reexports::wayland_protocols::ext::workspace::v1::server::ext_workspace_group_handle_v1::GroupCapabilities;
+pub use ext::{WorkspaceData, WorkspaceGroupData};
 
 bitflags::bitflags! {
     #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
@@ -93,16 +90,6 @@ pub struct WorkspaceGroupHandle {
     id: usize,
 }
 
-#[derive(Default)]
-pub struct WorkspaceGroupDataInner {
-    outputs: Vec<Output>,
-    wl_outputs: HashSet<WlOutput>,
-    capabilities: Option<GroupCapabilities>,
-    workspace_count: usize,
-}
-
-pub type WorkspaceGroupData = Mutex<WorkspaceGroupDataInner>;
-
 #[derive(Debug)]
 pub struct Workspace {
     id: usize,