diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index d1bcb6efb54aab1bc2366c7ba34cf719d941bb14..a8dc41fd52f771128482f9a213b24eb64b50f397 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -71,7 +71,7 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate(wl_client *wlClient, quint32 id,
     , closing(false)
     , refCount(1)
     , client(QWaylandClient::fromWlClient(wlClient))
-    , windowType(QWaylandSurface::WindowType::None)
+    , windowType(QWaylandSurface::None)
 {}
 
 
diff --git a/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp b/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp
index 35577737714715a6ade1bfe95d8adda315a71176..cddd231dd1a1c167fa275a0057aea7a5d9e01dc5 100644
--- a/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurfaceinterface.cpp
@@ -110,7 +110,7 @@ int QWaylandSurfaceOp::type() const
 
 
 QWaylandSurfaceSetVisibilityOp::QWaylandSurfaceSetVisibilityOp(QWindow::Visibility visibility)
-                              : QWaylandSurfaceOp(Type::SetVisibility)
+                              : QWaylandSurfaceOp(QWaylandSurfaceOp::SetVisibility)
                               , m_visibility(visibility)
 {
 }
@@ -121,7 +121,7 @@ QWindow::Visibility QWaylandSurfaceSetVisibilityOp::visibility() const
 }
 
 QWaylandSurfaceResizeOp::QWaylandSurfaceResizeOp(const QSize &size)
-                       : QWaylandSurfaceOp(Type::Resize)
+                       : QWaylandSurfaceOp(QWaylandSurfaceOp::Resize)
                        , m_size(size)
 {
 }
@@ -132,7 +132,7 @@ QSize QWaylandSurfaceResizeOp::size() const
 }
 
 QWaylandSurfacePingOp::QWaylandSurfacePingOp(uint32_t serial)
-                     : QWaylandSurfaceOp(Type::Ping)
+                     : QWaylandSurfaceOp(QWaylandSurfaceOp::Ping)
                      , m_serial(serial)
 {
 }