diff --git a/src/wayland/abstract_data_source.h b/src/wayland/abstract_data_source.h
index 358b183874..e82444f0c0 100644
--- a/src/wayland/abstract_data_source.h
+++ b/src/wayland/abstract_data_source.h
@@ -6,9 +6,7 @@
 
 #pragma once
 
-#include "resource.h"
 #include "clientconnection.h"
-
 #include "datadevicemanager_interface.h"
 
 #include <KWaylandServer/kwaylandserver_export.h>
diff --git a/src/wayland/datadevice_interface.h b/src/wayland/datadevice_interface.h
index c84e0e892d..23ec28eeb9 100644
--- a/src/wayland/datadevice_interface.h
+++ b/src/wayland/datadevice_interface.h
@@ -11,7 +11,8 @@
 
 #include <KWaylandServer/kwaylandserver_export.h>
 
-#include "resource.h"
+struct wl_client;
+struct wl_resource;
 
 namespace KWaylandServer
 {
diff --git a/src/wayland/dataoffer_interface.h b/src/wayland/dataoffer_interface.h
index 3f972a7f67..6e7f717a40 100644
--- a/src/wayland/dataoffer_interface.h
+++ b/src/wayland/dataoffer_interface.h
@@ -10,7 +10,6 @@
 
 #include <KWaylandServer/kwaylandserver_export.h>
 
-#include "resource.h"
 #include "datadevicemanager_interface.h"
 
 namespace KWaylandServer
diff --git a/src/wayland/filtered_display.h b/src/wayland/filtered_display.h
index b2b0be50bf..91207aa8b1 100644
--- a/src/wayland/filtered_display.h
+++ b/src/wayland/filtered_display.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "global.h"
 #include "display.h"
 
 #include <KWaylandServer/kwaylandserver_export.h>
diff --git a/src/wayland/server/eglstream_controller_interface.h b/src/wayland/server/eglstream_controller_interface.h
index f002618118..2e0edb7f3b 100644
--- a/src/wayland/server/eglstream_controller_interface.h
+++ b/src/wayland/server/eglstream_controller_interface.h
@@ -5,7 +5,6 @@
 */
 #pragma once
 
-#include "global.h"
 #include "surface_interface.h"
 
 #include <KWaylandServer/kwaylandserver_export.h>
diff --git a/src/wayland/server/outputdevice_interface.h b/src/wayland/server/outputdevice_interface.h
index 125a64c386..dfc0160cfa 100644
--- a/src/wayland/server/outputdevice_interface.h
+++ b/src/wayland/server/outputdevice_interface.h
@@ -5,14 +5,13 @@
 */
 #pragma once
 
+#include <KWaylandServer/kwaylandserver_export.h>
+
 #include <QObject>
 #include <QPoint>
 #include <QSize>
 #include <QVector>
 
-#include <KWaylandServer/kwaylandserver_export.h>
-#include "global.h"
-
 struct wl_resource;
 
 namespace KWaylandServer