diff --git a/wlroots/wlr_types/cursor.py b/wlroots/wlr_types/cursor.py
index 78bce15e..efd9753f 100644
--- a/wlroots/wlr_types/cursor.py
+++ b/wlroots/wlr_types/cursor.py
@@ -7,6 +7,7 @@
 
 from wlroots import PtrHasData, ffi, lib, ptr_or_null
 
+from .compositor import Surface
 from .input_device import InputDevice, InputDeviceType
 from .output import Output
 from .output_layout import OutputLayout
@@ -24,7 +25,6 @@
     PointerSwipeEndEvent,
     PointerSwipeUpdateEvent,
 )
-from .surface import Surface
 from .touch import (
     TouchCancelEvent,
     TouchDownEvent,
diff --git a/wlroots/wlr_types/data_device_manager.py b/wlroots/wlr_types/data_device_manager.py
index 4baf333d..4970e13c 100644
--- a/wlroots/wlr_types/data_device_manager.py
+++ b/wlroots/wlr_types/data_device_manager.py
@@ -7,7 +7,7 @@
 
 from wlroots import Ptr, PtrHasData, ffi, lib
 
-from .surface import Surface
+from .compositor import Surface
 
 _weakkeydict: WeakKeyDictionary = WeakKeyDictionary()
 
diff --git a/wlroots/wlr_types/foreign_toplevel_management_v1.py b/wlroots/wlr_types/foreign_toplevel_management_v1.py
index de7af312..9e132451 100644
--- a/wlroots/wlr_types/foreign_toplevel_management_v1.py
+++ b/wlroots/wlr_types/foreign_toplevel_management_v1.py
@@ -10,8 +10,8 @@
 
 from wlroots import Ptr, PtrHasData, ffi, lib
 
+from .compositor import Surface
 from .output import Output
-from .surface import Surface
 
 if TYPE_CHECKING:
     from pywayland.server import Display
diff --git a/wlroots/wlr_types/idle_inhibit_v1.py b/wlroots/wlr_types/idle_inhibit_v1.py
index ee074561..93d7bf3b 100644
--- a/wlroots/wlr_types/idle_inhibit_v1.py
+++ b/wlroots/wlr_types/idle_inhibit_v1.py
@@ -3,7 +3,7 @@
 
 from wlroots import Ptr, PtrHasData, ffi, lib
 
-from .surface import Surface
+from .compositor import Surface
 
 
 class IdleInhibitorManagerV1(Ptr):
diff --git a/wlroots/wlr_types/layer_shell_v1.py b/wlroots/wlr_types/layer_shell_v1.py
index b806049f..1698cd54 100644
--- a/wlroots/wlr_types/layer_shell_v1.py
+++ b/wlroots/wlr_types/layer_shell_v1.py
@@ -10,8 +10,8 @@
 
 from wlroots import Ptr, PtrHasData, ffi, lib
 
+from .compositor import Surface
 from .output import Output
-from .surface import Surface
 from .xdg_shell import SurfaceCallback, T
 
 if TYPE_CHECKING:
diff --git a/wlroots/wlr_types/pointer_constraints_v1.py b/wlroots/wlr_types/pointer_constraints_v1.py
index 2c2f2f1a..98db3bb8 100644
--- a/wlroots/wlr_types/pointer_constraints_v1.py
+++ b/wlroots/wlr_types/pointer_constraints_v1.py
@@ -11,7 +11,7 @@
 from wlroots import Ptr, ffi, lib
 from wlroots.util.region import PixmanRegion32
 
-from .surface import Surface
+from .compositor import Surface
 
 if TYPE_CHECKING:
     from pywayland.server import Display
diff --git a/wlroots/wlr_types/seat.py b/wlroots/wlr_types/seat.py
index 1ab9b908..96ef2ffa 100644
--- a/wlroots/wlr_types/seat.py
+++ b/wlroots/wlr_types/seat.py
@@ -10,11 +10,11 @@
 
 from wlroots import Ptr, PtrHasData, ffi, lib
 
+from .compositor import Surface
 from .data_device_manager import Drag
 from .input_device import ButtonState
 from .keyboard import Keyboard, KeyboardKeyEvent, KeyboardModifiers
 from .pointer import AxisOrientation, AxisSource
-from .surface import Surface
 
 _weakkeydict: WeakKeyDictionary = WeakKeyDictionary()
 
diff --git a/wlroots/wlr_types/xdg_activation_v1.py b/wlroots/wlr_types/xdg_activation_v1.py
index d92c9cce..02a7a437 100644
--- a/wlroots/wlr_types/xdg_activation_v1.py
+++ b/wlroots/wlr_types/xdg_activation_v1.py
@@ -9,7 +9,7 @@
 
 from wlroots import Ptr, ffi, lib
 
-from .surface import Surface
+from .compositor import Surface
 
 if TYPE_CHECKING:
     from pywayland.server import Display
diff --git a/wlroots/wlr_types/xdg_decoration_v1.py b/wlroots/wlr_types/xdg_decoration_v1.py
index 311ff741..d0f09ef0 100644
--- a/wlroots/wlr_types/xdg_decoration_v1.py
+++ b/wlroots/wlr_types/xdg_decoration_v1.py
@@ -10,7 +10,7 @@
 
 from wlroots import PtrHasData, ffi, lib
 
-from .surface import Surface
+from .compositor import Surface
 
 if TYPE_CHECKING:
     from pywayland.server import Display
diff --git a/wlroots/wlr_types/xdg_shell.py b/wlroots/wlr_types/xdg_shell.py
index 3eceee55..3476b290 100644
--- a/wlroots/wlr_types/xdg_shell.py
+++ b/wlroots/wlr_types/xdg_shell.py
@@ -12,8 +12,8 @@
 from wlroots.util.box import Box
 from wlroots.util.edges import Edges
 
+from .compositor import Surface
 from .output import Output
-from .surface import Surface
 
 _weakkeydict: weakref.WeakKeyDictionary = weakref.WeakKeyDictionary()
 
diff --git a/wlroots/xwayland.py b/wlroots/xwayland.py
index 8ed51e76..e5c052d0 100644
--- a/wlroots/xwayland.py
+++ b/wlroots/xwayland.py
@@ -8,7 +8,7 @@
 from pywayland.server import Signal
 
 from wlroots import Ptr, PtrHasData, ffi, lib, str_or_none
-from wlroots.wlr_types.surface import Surface as WlrSurface
+from wlroots.wlr_types.compositor import Surface as WlrSurface
 
 if TYPE_CHECKING:
     from typing import TypeVar