diff --git a/autotests/integration/activation_test.cpp b/autotests/integration/activation_test.cpp
index 30880bf4b9..1424af536c 100644
--- a/autotests/integration/activation_test.cpp
+++ b/autotests/integration/activation_test.cpp
@@ -13,7 +13,6 @@
 #include "abstract_output.h"
 #include "cursor.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/activities_test.cpp b/autotests/integration/activities_test.cpp
index 4d723696d6..9d5a92cd90 100644
--- a/autotests/integration/activities_test.cpp
+++ b/autotests/integration/activities_test.cpp
@@ -14,7 +14,6 @@
 #include "cursor.h"
 #include "deleted.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "utils/xcbutils.h"
diff --git a/autotests/integration/dbus_interface_test.cpp b/autotests/integration/dbus_interface_test.cpp
index a64b5269fd..1b36a37613 100644
--- a/autotests/integration/dbus_interface_test.cpp
+++ b/autotests/integration/dbus_interface_test.cpp
@@ -13,7 +13,6 @@
 #include "deleted.h"
 #include "platform.h"
 #include "rules.h"
-#include "screens.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/debug_console_test.cpp b/autotests/integration/debug_console_test.cpp
index 21de7bdf2c..fbf917c07a 100644
--- a/autotests/integration/debug_console_test.cpp
+++ b/autotests/integration/debug_console_test.cpp
@@ -12,7 +12,6 @@
 #include "debug_console.h"
 #include "internal_client.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "utils/xcbutils.h"
diff --git a/autotests/integration/desktop_window_x11_test.cpp b/autotests/integration/desktop_window_x11_test.cpp
index 45a77b1c93..f25e3bbe4d 100644
--- a/autotests/integration/desktop_window_x11_test.cpp
+++ b/autotests/integration/desktop_window_x11_test.cpp
@@ -14,7 +14,6 @@
 #include "cursor.h"
 #include "deleted.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "utils/xcbutils.h"
diff --git a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp
index 6ce664fa09..1546302a70 100644
--- a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp
+++ b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp
@@ -14,7 +14,6 @@
 #include "cursor.h"
 #include "renderbackend.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/dont_crash_cancel_animation.cpp b/autotests/integration/dont_crash_cancel_animation.cpp
index 32072b9076..b5d1064558 100644
--- a/autotests/integration/dont_crash_cancel_animation.cpp
+++ b/autotests/integration/dont_crash_cancel_animation.cpp
@@ -14,7 +14,6 @@
 #include "deleted.h"
 #include "effects.h"
 #include "effectloader.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "scripting/scriptedeffect.h"
diff --git a/autotests/integration/dont_crash_cursor_physical_size_empty.cpp b/autotests/integration/dont_crash_cursor_physical_size_empty.cpp
index bfec8e1b77..88724ac202 100644
--- a/autotests/integration/dont_crash_cursor_physical_size_empty.cpp
+++ b/autotests/integration/dont_crash_cursor_physical_size_empty.cpp
@@ -13,7 +13,6 @@
 #include "cursor.h"
 #include "effects.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/dont_crash_empty_deco.cpp b/autotests/integration/dont_crash_empty_deco.cpp
index 3da808ae93..5eceb0920d 100644
--- a/autotests/integration/dont_crash_empty_deco.cpp
+++ b/autotests/integration/dont_crash_empty_deco.cpp
@@ -14,7 +14,6 @@
 #include "cursor.h"
 #include "renderbackend.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/dont_crash_glxgears.cpp b/autotests/integration/dont_crash_glxgears.cpp
index 1912781ee7..6eba7614d1 100644
--- a/autotests/integration/dont_crash_glxgears.cpp
+++ b/autotests/integration/dont_crash_glxgears.cpp
@@ -11,7 +11,6 @@
 #include "abstract_client.h"
 #include "x11client.h"
 #include "deleted.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/dont_crash_no_border.cpp b/autotests/integration/dont_crash_no_border.cpp
index b194178424..8964b15435 100644
--- a/autotests/integration/dont_crash_no_border.cpp
+++ b/autotests/integration/dont_crash_no_border.cpp
@@ -15,7 +15,6 @@
 #include "cursor.h"
 #include "renderbackend.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/dont_crash_reinitialize_compositor.cpp b/autotests/integration/dont_crash_reinitialize_compositor.cpp
index 522ec4b72a..e95279712e 100644
--- a/autotests/integration/dont_crash_reinitialize_compositor.cpp
+++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp
@@ -17,7 +17,6 @@
 #include "effects.h"
 #include "platform.h"
 #include "renderbackend.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/dont_crash_useractions_menu.cpp b/autotests/integration/dont_crash_useractions_menu.cpp
index ac3a2159c6..df9037c61f 100644
--- a/autotests/integration/dont_crash_useractions_menu.cpp
+++ b/autotests/integration/dont_crash_useractions_menu.cpp
@@ -13,7 +13,6 @@
 #include "keyboard_input.h"
 #include "platform.h"
 #include "pointer_input.h"
-#include "screens.h"
 #include "useractions.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp
index 334f75162f..7858cfc3c8 100644
--- a/autotests/integration/globalshortcuts_test.cpp
+++ b/autotests/integration/globalshortcuts_test.cpp
@@ -13,7 +13,6 @@
 #include "internal_client.h"
 #include "keyboard_input.h"
 #include "platform.h"
-#include "screens.h"
 #include "useractions.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/input_stacking_order.cpp b/autotests/integration/input_stacking_order.cpp
index acd58a8547..577d470412 100644
--- a/autotests/integration/input_stacking_order.cpp
+++ b/autotests/integration/input_stacking_order.cpp
@@ -13,7 +13,6 @@
 #include "cursor.h"
 #include "deleted.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/inputmethod_test.cpp b/autotests/integration/inputmethod_test.cpp
index 649e3b1a38..79bdd2961f 100644
--- a/autotests/integration/inputmethod_test.cpp
+++ b/autotests/integration/inputmethod_test.cpp
@@ -13,7 +13,6 @@
 #include "effects.h"
 #include "deleted.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "inputmethod.h"
diff --git a/autotests/integration/internal_window.cpp b/autotests/integration/internal_window.cpp
index 19762b5723..76207a0668 100644
--- a/autotests/integration/internal_window.cpp
+++ b/autotests/integration/internal_window.cpp
@@ -13,7 +13,6 @@
 #include "deleted.h"
 #include "effects.h"
 #include "internal_client.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/kwinbindings_test.cpp b/autotests/integration/kwinbindings_test.cpp
index d751646dce..2a33e00e7c 100644
--- a/autotests/integration/kwinbindings_test.cpp
+++ b/autotests/integration/kwinbindings_test.cpp
@@ -11,7 +11,6 @@
 #include "cursor.h"
 #include "input.h"
 #include "platform.h"
-#include "screens.h"
 #include "scripting/scripting.h"
 #include "useractions.h"
 #include "virtualdesktops.h"
diff --git a/autotests/integration/layershellv1client_test.cpp b/autotests/integration/layershellv1client_test.cpp
index 5545a5ad2c..b157f7ba03 100644
--- a/autotests/integration/layershellv1client_test.cpp
+++ b/autotests/integration/layershellv1client_test.cpp
@@ -9,7 +9,6 @@
 #include "abstract_output.h"
 #include "main.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp
index 72f11e06d5..1c0c16e28d 100644
--- a/autotests/integration/lockscreen.cpp
+++ b/autotests/integration/lockscreen.cpp
@@ -14,7 +14,6 @@
 #include "cursor.h"
 #include "renderbackend.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/maximize_test.cpp b/autotests/integration/maximize_test.cpp
index b31da0aaf7..7e0adcce5f 100644
--- a/autotests/integration/maximize_test.cpp
+++ b/autotests/integration/maximize_test.cpp
@@ -13,7 +13,6 @@
 #include "decorations/decorationbridge.h"
 #include "decorations/settings.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/modifier_only_shortcut_test.cpp b/autotests/integration/modifier_only_shortcut_test.cpp
index 3d0b63eeda..d01ff019f8 100644
--- a/autotests/integration/modifier_only_shortcut_test.cpp
+++ b/autotests/integration/modifier_only_shortcut_test.cpp
@@ -11,7 +11,6 @@
 #include "input.h"
 #include "keyboard_input.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/no_global_shortcuts_test.cpp b/autotests/integration/no_global_shortcuts_test.cpp
index 0975ca9af3..b0141178c5 100644
--- a/autotests/integration/no_global_shortcuts_test.cpp
+++ b/autotests/integration/no_global_shortcuts_test.cpp
@@ -12,7 +12,6 @@
 #include "keyboard_input.h"
 #include "platform.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/plasmawindow_test.cpp b/autotests/integration/plasmawindow_test.cpp
index 95a5d4d600..b8ed5eb731 100644
--- a/autotests/integration/plasmawindow_test.cpp
+++ b/autotests/integration/plasmawindow_test.cpp
@@ -12,7 +12,6 @@
 #include "x11client.h"
 #include "cursor.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/pointer_constraints_test.cpp b/autotests/integration/pointer_constraints_test.cpp
index 879700568f..8e6215add8 100644
--- a/autotests/integration/pointer_constraints_test.cpp
+++ b/autotests/integration/pointer_constraints_test.cpp
@@ -13,7 +13,6 @@
 #include "keyboard_input.h"
 #include "platform.h"
 #include "pointer_input.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/quick_tiling_test.cpp b/autotests/integration/quick_tiling_test.cpp
index ce8d7a3148..abeb0a9ea5 100644
--- a/autotests/integration/quick_tiling_test.cpp
+++ b/autotests/integration/quick_tiling_test.cpp
@@ -14,7 +14,6 @@
 #include "cursor.h"
 #include "decorations/decorationbridge.h"
 #include "decorations/settings.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "scripting/scripting.h"
diff --git a/autotests/integration/screenedge_client_show_test.cpp b/autotests/integration/screenedge_client_show_test.cpp
index 38cf15ca29..e8ef1dc517 100644
--- a/autotests/integration/screenedge_client_show_test.cpp
+++ b/autotests/integration/screenedge_client_show_test.cpp
@@ -13,7 +13,6 @@
 #include "cursor.h"
 #include "deleted.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/scripting/minimizeall_test.cpp b/autotests/integration/scripting/minimizeall_test.cpp
index e8d572be9a..3eda913abc 100644
--- a/autotests/integration/scripting/minimizeall_test.cpp
+++ b/autotests/integration/scripting/minimizeall_test.cpp
@@ -12,7 +12,6 @@
 #include "abstract_client.h"
 #include "abstract_output.h"
 #include "platform.h"
-#include "screens.h"
 #include "scripting/scripting.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/shade_test.cpp b/autotests/integration/shade_test.cpp
index a85a420ad2..57d48828b2 100644
--- a/autotests/integration/shade_test.cpp
+++ b/autotests/integration/shade_test.cpp
@@ -12,7 +12,6 @@
 #include "x11client.h"
 #include "cursor.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <kwineffects.h>
diff --git a/autotests/integration/tabbox_test.cpp b/autotests/integration/tabbox_test.cpp
index 76fe5ba6e8..bb7cdada6f 100644
--- a/autotests/integration/tabbox_test.cpp
+++ b/autotests/integration/tabbox_test.cpp
@@ -11,7 +11,6 @@
 #include "cursor.h"
 #include "input.h"
 #include "platform.h"
-#include "screens.h"
 #include "tabbox/tabbox.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/touch_input_test.cpp b/autotests/integration/touch_input_test.cpp
index d5904ddaca..29ec0951e1 100644
--- a/autotests/integration/touch_input_test.cpp
+++ b/autotests/integration/touch_input_test.cpp
@@ -12,7 +12,6 @@
 #include "platform.h"
 #include "touch_input.h"
 #include "cursor.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/virtual_desktop_test.cpp b/autotests/integration/virtual_desktop_test.cpp
index eab73fff0e..f6809b9106 100644
--- a/autotests/integration/virtual_desktop_test.cpp
+++ b/autotests/integration/virtual_desktop_test.cpp
@@ -10,7 +10,6 @@
 #include "abstract_client.h"
 #include "main.h"
 #include "platform.h"
-#include "screens.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/window_rules_test.cpp b/autotests/integration/window_rules_test.cpp
index 251b039ac6..e7aeee27c3 100644
--- a/autotests/integration/window_rules_test.cpp
+++ b/autotests/integration/window_rules_test.cpp
@@ -14,7 +14,6 @@
 #include "cursor.h"
 #include "deleted.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "rules.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/window_selection_test.cpp b/autotests/integration/window_selection_test.cpp
index a3095aec63..006745dfd3 100644
--- a/autotests/integration/window_selection_test.cpp
+++ b/autotests/integration/window_selection_test.cpp
@@ -13,7 +13,6 @@
 #include "keyboard_input.h"
 #include "platform.h"
 #include "pointer_input.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/xdgshellclient_rules_test.cpp b/autotests/integration/xdgshellclient_rules_test.cpp
index 4c9cd9c8fb..767ebcb6d0 100644
--- a/autotests/integration/xdgshellclient_rules_test.cpp
+++ b/autotests/integration/xdgshellclient_rules_test.cpp
@@ -15,7 +15,6 @@
 #include "cursor.h"
 #include "platform.h"
 #include "rules.h"
-#include "screens.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/xwayland_input_test.cpp b/autotests/integration/xwayland_input_test.cpp
index 547e31062c..074ed9e3f1 100644
--- a/autotests/integration/xwayland_input_test.cpp
+++ b/autotests/integration/xwayland_input_test.cpp
@@ -13,7 +13,6 @@
 #include "cursor.h"
 #include "deleted.h"
 #include "screenedge.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 
diff --git a/autotests/integration/xwayland_selections_test.cpp b/autotests/integration/xwayland_selections_test.cpp
index 4fe420a108..0ee8dc0468 100644
--- a/autotests/integration/xwayland_selections_test.cpp
+++ b/autotests/integration/xwayland_selections_test.cpp
@@ -11,7 +11,6 @@
 #include "abstract_client.h"
 #include "abstract_output.h"
 #include "platform.h"
-#include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "xwl/databridge.h"