diff --git a/autotests/integration/dont_crash_cancel_animation.cpp b/autotests/integration/dont_crash_cancel_animation.cpp
index cdb231a9ef..14a0ee8822 100644
--- a/autotests/integration/dont_crash_cancel_animation.cpp
+++ b/autotests/integration/dont_crash_cancel_animation.cpp
@@ -9,8 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "compositor.h"
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "scripting/scriptedeffect.h"
 #include "wayland_server.h"
 #include "window.h"
diff --git a/autotests/integration/dont_crash_reinitialize_compositor.cpp b/autotests/integration/dont_crash_reinitialize_compositor.cpp
index 2ae975d3a2..f94e56bc6a 100644
--- a/autotests/integration/dont_crash_reinitialize_compositor.cpp
+++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp
@@ -11,8 +11,8 @@
 
 #include "compositor.h"
 #include "core/output.h"
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
diff --git a/autotests/integration/effects/desktop_switching_animation_test.cpp b/autotests/integration/effects/desktop_switching_animation_test.cpp
index c4a12c1c05..2e773df3e4 100644
--- a/autotests/integration/effects/desktop_switching_animation_test.cpp
+++ b/autotests/integration/effects/desktop_switching_animation_test.cpp
@@ -9,8 +9,8 @@
 
 #include "kwin_wayland_test.h"
 
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "window.h"
diff --git a/autotests/integration/effects/maximize_animation_test.cpp b/autotests/integration/effects/maximize_animation_test.cpp
index 128d45ec53..1f9b167034 100644
--- a/autotests/integration/effects/maximize_animation_test.cpp
+++ b/autotests/integration/effects/maximize_animation_test.cpp
@@ -10,8 +10,8 @@
 #include "kwin_wayland_test.h"
 
 #include "compositor.h"
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "scene/workspacescene.h"
 #include "wayland_server.h"
 #include "window.h"
diff --git a/autotests/integration/effects/minimize_animation_test.cpp b/autotests/integration/effects/minimize_animation_test.cpp
index 900d635d76..f50b6c8d89 100644
--- a/autotests/integration/effects/minimize_animation_test.cpp
+++ b/autotests/integration/effects/minimize_animation_test.cpp
@@ -9,8 +9,8 @@
 
 #include "kwin_wayland_test.h"
 
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
diff --git a/autotests/integration/effects/popup_open_close_animation_test.cpp b/autotests/integration/effects/popup_open_close_animation_test.cpp
index e86d95869a..4b8fe3b904 100644
--- a/autotests/integration/effects/popup_open_close_animation_test.cpp
+++ b/autotests/integration/effects/popup_open_close_animation_test.cpp
@@ -9,8 +9,8 @@
 
 #include "kwin_wayland_test.h"
 
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "internalwindow.h"
 #include "useractions.h"
 #include "wayland_server.h"
diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp
index bfbe2a054e..cf0ba6ee3a 100644
--- a/autotests/integration/effects/scripted_effects_test.cpp
+++ b/autotests/integration/effects/scripted_effects_test.cpp
@@ -10,8 +10,8 @@
 #include "kwin_wayland_test.h"
 
 #include "effect/anidata_p.h"
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "scripting/scriptedeffect.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
diff --git a/autotests/integration/effects/slidingpopups_test.cpp b/autotests/integration/effects/slidingpopups_test.cpp
index 4cfe6df9c0..af820f241a 100644
--- a/autotests/integration/effects/slidingpopups_test.cpp
+++ b/autotests/integration/effects/slidingpopups_test.cpp
@@ -6,8 +6,8 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "kwin_wayland_test.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/effects/toplevel_open_close_animation_test.cpp b/autotests/integration/effects/toplevel_open_close_animation_test.cpp
index 8b5fd383ea..a10f26466a 100644
--- a/autotests/integration/effects/toplevel_open_close_animation_test.cpp
+++ b/autotests/integration/effects/toplevel_open_close_animation_test.cpp
@@ -9,8 +9,8 @@
 
 #include "kwin_wayland_test.h"
 
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
diff --git a/autotests/integration/effects/translucency_test.cpp b/autotests/integration/effects/translucency_test.cpp
index f0132b9f2f..b08634307b 100644
--- a/autotests/integration/effects/translucency_test.cpp
+++ b/autotests/integration/effects/translucency_test.cpp
@@ -9,8 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "compositor.h"
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "pointer_input.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
diff --git a/autotests/integration/effects/wobbly_shade_test.cpp b/autotests/integration/effects/wobbly_shade_test.cpp
index 11a58e1c9c..c8575710b4 100644
--- a/autotests/integration/effects/wobbly_shade_test.cpp
+++ b/autotests/integration/effects/wobbly_shade_test.cpp
@@ -9,8 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "cursor.h"
+#include "effect/effecthandler.h"
 #include "effect/effectloader.h"
-#include "effect/effects.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
diff --git a/autotests/integration/internal_window.cpp b/autotests/integration/internal_window.cpp
index da016a64c5..4b0be70598 100644
--- a/autotests/integration/internal_window.cpp
+++ b/autotests/integration/internal_window.cpp
@@ -9,7 +9,7 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "internalwindow.h"
 #include "pointer_input.h"
 #include "wayland/surface.h"
diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp
index 1a1edbef28..48af36b495 100644
--- a/autotests/integration/kwin_wayland_test.cpp
+++ b/autotests/integration/kwin_wayland_test.cpp
@@ -11,7 +11,7 @@
 #include "backends/virtual/virtual_backend.h"
 #include "compositor_wayland.h"
 #include "core/session.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "inputmethod.h"
 #include "placement.h"
 #include "pluginmanager.h"
diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp
index 4aa54cf030..129052df7d 100644
--- a/autotests/integration/lockscreen.cpp
+++ b/autotests/integration/lockscreen.cpp
@@ -11,7 +11,7 @@
 #include "compositor.h"
 #include "core/output.h"
 #include "core/renderbackend.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "pointer_input.h"
 #include "screenedge.h"
 #include "wayland/keyboard.h"
diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp
index 69dda6e643..8c6c1f3cfc 100644
--- a/autotests/integration/pointer_input.cpp
+++ b/autotests/integration/pointer_input.cpp
@@ -11,7 +11,7 @@
 #include "core/output.h"
 #include "cursor.h"
 #include "cursorsource.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "options.h"
 #include "pointer_input.h"
 #include "utils/xcursortheme.h"
diff --git a/autotests/test_window_paint_data.cpp b/autotests/test_window_paint_data.cpp
index 9d4f3d9be7..2098e475a3 100644
--- a/autotests/test_window_paint_data.cpp
+++ b/autotests/test_window_paint_data.cpp
@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include "virtualdesktops.h"
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e119276af..f9624ca6d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -85,8 +85,8 @@ target_sources(kwin PRIVATE
     effect/animationeffect.cpp
     effect/effect.cpp
     effect/effectframe.cpp
+    effect/effecthandler.cpp
     effect/effectloader.cpp
-    effect/effects.cpp
     effect/effecttogglablestate.cpp
     effect/effectwindow.cpp
     effect/logging.cpp
@@ -296,7 +296,7 @@ set(kwin_dbus_SRCS)
 qt_add_dbus_adaptor(kwin_dbus_SRCS scripting/org.kde.kwin.Script.xml scripting/scripting.h KWin::AbstractScript)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.kwin.Compositing.xml dbusinterface.h KWin::CompositorDBusInterface)
-qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} effect/effects.h KWin::EffectsHandler)
+qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} effect/effecthandler.h KWin::EffectsHandler)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.VirtualDesktopManager.xml dbusinterface.h KWin::VirtualDesktopManagerDBusInterface)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.Session.xml sm.h KWin::SessionManager)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.Plugins.xml dbusinterface.h KWin::PluginManagerDBusInterface)
@@ -439,7 +439,7 @@ install(FILES
 install(FILES
     effect/animationeffect.h
     effect/effect.h
-    effect/effects.h
+    effect/effecthandler.h
     effect/effecttogglablestate.h
     effect/effectwindow.h
     effect/globals.h
diff --git a/src/backends/x11/standalone/x11_standalone_effects.h b/src/backends/x11/standalone/x11_standalone_effects.h
index ff54301ae8..a17dfcee2f 100644
--- a/src/backends/x11/standalone/x11_standalone_effects.h
+++ b/src/backends/x11/standalone/x11_standalone_effects.h
@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "utils/xcbutils.h"
 
 #include <memory.h>
diff --git a/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp b/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp
index 4cd77b36a0..354a8d5cb7 100644
--- a/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp
+++ b/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp
@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "x11_standalone_effects_mouse_interception_filter.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "utils/common.h"
 
 #include <QCursor>
diff --git a/src/compositor_wayland.cpp b/src/compositor_wayland.cpp
index 10829abfdf..e1766d33a9 100644
--- a/src/compositor_wayland.cpp
+++ b/src/compositor_wayland.cpp
@@ -12,7 +12,7 @@
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
 #include "core/renderlayer.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "main.h"
 #include "opengl/glplatform.h"
 #include "platformsupport/scenes/opengl/openglbackend.h"
diff --git a/src/compositor_x11.cpp b/src/compositor_x11.cpp
index d031c689ef..632acfee7b 100644
--- a/src/compositor_x11.cpp
+++ b/src/compositor_x11.cpp
@@ -12,7 +12,7 @@
 #include "core/overlaywindow.h"
 #include "core/renderbackend.h"
 #include "core/renderlayer.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glplatform.h"
 #include "options.h"
 #include "platformsupport/scenes/opengl/openglbackend.h"
diff --git a/src/debug_console.cpp b/src/debug_console.cpp
index 0ce287c0a2..00043125d0 100644
--- a/src/debug_console.cpp
+++ b/src/debug_console.cpp
@@ -10,7 +10,7 @@
 #include "compositor.h"
 #include "core/graphicsbufferview.h"
 #include "core/inputdevice.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "input_event.h"
 #include "internalwindow.h"
 #include "keyboard_input.h"
diff --git a/src/effect/anidata.cpp b/src/effect/anidata.cpp
index fcf1ae3638..77e1c27d8b 100644
--- a/src/effect/anidata.cpp
+++ b/src/effect/anidata.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "effect/anidata_p.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include "logging_p.h"
 
diff --git a/src/effect/animationeffect.cpp b/src/effect/animationeffect.cpp
index 131844dfb7..bfd18ba639 100644
--- a/src/effect/animationeffect.cpp
+++ b/src/effect/animationeffect.cpp
@@ -10,7 +10,7 @@
 
 #include "effect/animationeffect.h"
 #include "effect/anidata_p.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 #include <QDateTime>
diff --git a/src/effect/effect.cpp b/src/effect/effect.cpp
index d567df68e0..9d903b72a1 100644
--- a/src/effect/effect.cpp
+++ b/src/effect/effect.cpp
@@ -7,7 +7,7 @@
 */
 
 #include "effect/effect.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <KConfigGroup>
 
diff --git a/src/effect/effectframe.cpp b/src/effect/effectframe.cpp
index 36af818516..e92bee811e 100644
--- a/src/effect/effectframe.cpp
+++ b/src/effect/effectframe.cpp
@@ -6,7 +6,7 @@
 */
 
 #include "effect/effectframe.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <QQuickItem>
 #include <QStandardPaths>
diff --git a/src/effect/effects.cpp b/src/effect/effecthandler.cpp
similarity index 99%
rename from src/effect/effects.cpp
rename to src/effect/effecthandler.cpp
index 8141b187cb..3fb923a7f5 100644
--- a/src/effect/effects.cpp
+++ b/src/effect/effecthandler.cpp
@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include "config-kwin.h"
 
@@ -1622,5 +1622,5 @@ EffectsHandler *effects = nullptr;
 
 } // namespace
 
-#include "moc_effects.cpp"
+#include "moc_effecthandler.cpp"
 #include "moc_globals.cpp"
diff --git a/src/effect/effects.h b/src/effect/effecthandler.h
similarity index 100%
rename from src/effect/effects.h
rename to src/effect/effecthandler.h
diff --git a/src/effect/effectloader.cpp b/src/effect/effectloader.cpp
index b77c05d7e9..73d0b8b747 100644
--- a/src/effect/effectloader.cpp
+++ b/src/effect/effectloader.cpp
@@ -12,7 +12,7 @@
 #include <config-kwin.h>
 // KWin
 #include "effect/effect.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "plugin.h"
 #include "scripting/scriptedeffect.h"
 #include "scripting/scriptedquicksceneeffect.h"
diff --git a/src/effect/effecttogglablestate.cpp b/src/effect/effecttogglablestate.cpp
index 7659d79bf7..0fc5220217 100644
--- a/src/effect/effecttogglablestate.cpp
+++ b/src/effect/effecttogglablestate.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "effect/effecttogglablestate.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 namespace KWin
 {
diff --git a/src/effect/effectwindow.cpp b/src/effect/effectwindow.cpp
index 71c45bcf23..a7e83e428c 100644
--- a/src/effect/effectwindow.cpp
+++ b/src/effect/effectwindow.cpp
@@ -9,7 +9,7 @@
 
 #include "effect/effectwindow.h"
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "group.h"
 #include "internalwindow.h"
 #include "scene/windowitem.h"
diff --git a/src/effect/offscreeneffect.cpp b/src/effect/offscreeneffect.cpp
index 5fca683955..8d08c2c737 100644
--- a/src/effect/offscreeneffect.cpp
+++ b/src/effect/offscreeneffect.cpp
@@ -8,7 +8,7 @@
 #include "core/output.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/gltexture.h"
 #include "opengl/glutils.h"
 
diff --git a/src/effect/offscreenquickview.cpp b/src/effect/offscreenquickview.cpp
index 7c6622531d..51920e8417 100644
--- a/src/effect/offscreenquickview.cpp
+++ b/src/effect/offscreenquickview.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "effect/offscreenquickview.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include "logging_p.h"
 #include "opengl/glutils.h"
diff --git a/src/effect/quickeffect.cpp b/src/effect/quickeffect.cpp
index d47c3053e4..1178507d38 100644
--- a/src/effect/quickeffect.cpp
+++ b/src/effect/quickeffect.cpp
@@ -6,7 +6,7 @@
 
 #include "effect/quickeffect.h"
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include "logging_p.h"
 
diff --git a/src/events.cpp b/src/events.cpp
index 4beef9a934..dfc62f68e5 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -16,7 +16,7 @@
 
 #include "atoms.h"
 #include "cursor.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "focuschain.h"
 #include "group.h"
 #include "netinfo.h"
diff --git a/src/group.cpp b/src/group.cpp
index 31711a389a..87a7ecc897 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "group.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "workspace.h"
 #include "x11window.h"
 
diff --git a/src/input.cpp b/src/input.cpp
index b6f328f07a..7b0e030623 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -15,7 +15,7 @@
 #include "backends/libinput/device.h"
 #include "core/inputbackend.h"
 #include "core/session.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "gestures.h"
 #include "globalshortcuts.h"
 #include "hide_cursor_spy.h"
diff --git a/src/layers.cpp b/src/layers.cpp
index a9ed9bcd19..5417a002af 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -65,7 +65,7 @@
 */
 
 #include "compositor.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "focuschain.h"
 #include "group.h"
 #include "internalwindow.h"
diff --git a/src/main.cpp b/src/main.cpp
index 55f3f46d64..59601814b7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,7 @@
 #include "core/session.h"
 #include "cursor.h"
 #include "cursorsource.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "input.h"
 #include "inputmethod.h"
 #include "opengl/gltexture.h"
@@ -41,7 +41,7 @@
 #include "screenlockerwatcher.h"
 #endif
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 // KDE
 #include <KAboutData>
diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp
index 3d610860ae..5fb8219e94 100644
--- a/src/main_wayland.cpp
+++ b/src/main_wayland.cpp
@@ -17,7 +17,7 @@
 #include "compositor_wayland.h"
 #include "core/outputbackend.h"
 #include "core/session.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "inputmethod.h"
 #include "tabletmodemanager.h"
 #include "utils/realtime.h"
diff --git a/src/main_x11.cpp b/src/main_x11.cpp
index d81ab13c48..9e6aa826fe 100644
--- a/src/main_x11.cpp
+++ b/src/main_x11.cpp
@@ -17,7 +17,7 @@
 #include "core/outputbackend.h"
 #include "core/session.h"
 #include "cursor.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "outline.h"
 #include "screenedge.h"
 #include "sm.h"
diff --git a/src/plugins/backgroundcontrast/contrast.cpp b/src/plugins/backgroundcontrast/contrast.cpp
index fbe638a617..8470aab93d 100644
--- a/src/plugins/backgroundcontrast/contrast.cpp
+++ b/src/plugins/backgroundcontrast/contrast.cpp
@@ -12,7 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "utils/xcbutils.h"
 #include "wayland/contrast.h"
 #include "wayland/display.h"
diff --git a/src/plugins/backgroundcontrast/contrastshader.cpp b/src/plugins/backgroundcontrast/contrastshader.cpp
index e77b5a75af..826f9c6649 100644
--- a/src/plugins/backgroundcontrast/contrastshader.cpp
+++ b/src/plugins/backgroundcontrast/contrastshader.cpp
@@ -7,7 +7,7 @@
 
 #include "contrastshader.h"
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glplatform.h"
 
 #include <QByteArray>
diff --git a/src/plugins/blendchanges/blendchanges.cpp b/src/plugins/blendchanges/blendchanges.cpp
index f62d75d340..90236725b1 100644
--- a/src/plugins/blendchanges/blendchanges.cpp
+++ b/src/plugins/blendchanges/blendchanges.cpp
@@ -8,7 +8,7 @@
 */
 // own
 #include "blendchanges.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 #include <QDBusConnection>
diff --git a/src/plugins/blur/blur.cpp b/src/plugins/blur/blur.cpp
index 9eb758f0e1..497d710e47 100644
--- a/src/plugins/blur/blur.cpp
+++ b/src/plugins/blur/blur.cpp
@@ -12,7 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glplatform.h"
 #include "utils/xcbutils.h"
 #include "wayland/blur.h"
diff --git a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp
index 236c79164d..00a3961c38 100644
--- a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp
+++ b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp
@@ -8,7 +8,7 @@
 
 #include <KSharedConfig>
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glshader.h"
 
 #include "colorblindnesscorrection_settings.h"
diff --git a/src/plugins/colorpicker/colorpicker.cpp b/src/plugins/colorpicker/colorpicker.cpp
index e2037d0112..6b0eb329b4 100644
--- a/src/plugins/colorpicker/colorpicker.cpp
+++ b/src/plugins/colorpicker/colorpicker.cpp
@@ -9,7 +9,7 @@
 #include "colorpicker.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 #include "opengl/glutils_funcs.h"
 #include <KLocalizedString>
diff --git a/src/plugins/diminactive/diminactive.cpp b/src/plugins/diminactive/diminactive.cpp
index c493f771f4..c4d63bd180 100644
--- a/src/plugins/diminactive/diminactive.cpp
+++ b/src/plugins/diminactive/diminactive.cpp
@@ -11,7 +11,7 @@
 
 // own
 #include "diminactive.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 // KConfigSkeleton
 #include "diminactiveconfig.h"
diff --git a/src/plugins/fallapart/fallapart.cpp b/src/plugins/fallapart/fallapart.cpp
index a13af586ad..4ebae911aa 100644
--- a/src/plugins/fallapart/fallapart.cpp
+++ b/src/plugins/fallapart/fallapart.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "fallapart.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 // KConfigSkeleton
 #include "fallapartconfig.h"
 
diff --git a/src/plugins/glide/glide.cpp b/src/plugins/glide/glide.cpp
index 5901dc9e19..c27096ed03 100644
--- a/src/plugins/glide/glide.cpp
+++ b/src/plugins/glide/glide.cpp
@@ -18,7 +18,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 // Qt
 #include <QMatrix4x4>
diff --git a/src/plugins/highlightwindow/highlightwindow.cpp b/src/plugins/highlightwindow/highlightwindow.cpp
index 9f6e84d2bf..f20929293c 100644
--- a/src/plugins/highlightwindow/highlightwindow.cpp
+++ b/src/plugins/highlightwindow/highlightwindow.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "highlightwindow.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <QDBusConnection>
 
diff --git a/src/plugins/invert/invert.cpp b/src/plugins/invert/invert.cpp
index 8434203f2a..611292e432 100644
--- a/src/plugins/invert/invert.cpp
+++ b/src/plugins/invert/invert.cpp
@@ -10,7 +10,7 @@
 
 #include "invert.h"
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glplatform.h"
 #include "opengl/glutils.h"
 #include <KGlobalAccel>
diff --git a/src/plugins/kscreen/kscreen.cpp b/src/plugins/kscreen/kscreen.cpp
index ac7079e5b0..ea2c4bce17 100644
--- a/src/plugins/kscreen/kscreen.cpp
+++ b/src/plugins/kscreen/kscreen.cpp
@@ -9,7 +9,7 @@
 // own
 #include "kscreen.h"
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 // KConfigSkeleton
 #include "kscreenconfig.h"
 #include <QDebug>
diff --git a/src/plugins/magiclamp/magiclamp.cpp b/src/plugins/magiclamp/magiclamp.cpp
index b5f1833fc8..f704ba2f8b 100644
--- a/src/plugins/magiclamp/magiclamp.cpp
+++ b/src/plugins/magiclamp/magiclamp.cpp
@@ -10,7 +10,7 @@
 // based on minimize animation by Rivo Laks <rivolaks@hot.ee>
 
 #include "magiclamp.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 // KConfigSkeleton
 #include "magiclampconfig.h"
 
diff --git a/src/plugins/magnifier/magnifier.cpp b/src/plugins/magnifier/magnifier.cpp
index 85470386c8..eadbfdde12 100644
--- a/src/plugins/magnifier/magnifier.cpp
+++ b/src/plugins/magnifier/magnifier.cpp
@@ -17,7 +17,7 @@
 #include <kstandardaction.h>
 
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 #include <KGlobalAccel>
 
diff --git a/src/plugins/mouseclick/mouseclick.cpp b/src/plugins/mouseclick/mouseclick.cpp
index 7cca4fbca0..7877957141 100644
--- a/src/plugins/mouseclick/mouseclick.cpp
+++ b/src/plugins/mouseclick/mouseclick.cpp
@@ -13,7 +13,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <QAction>
 
diff --git a/src/plugins/mousemark/mousemark.cpp b/src/plugins/mousemark/mousemark.cpp
index e43f863447..bedc770284 100644
--- a/src/plugins/mousemark/mousemark.cpp
+++ b/src/plugins/mousemark/mousemark.cpp
@@ -17,7 +17,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glplatform.h"
 #include <KGlobalAccel>
 #include <KLocalizedString>
diff --git a/src/plugins/outputlocator/outputlocator.cpp b/src/plugins/outputlocator/outputlocator.cpp
index 74c997341b..4b87d9f8e0 100644
--- a/src/plugins/outputlocator/outputlocator.cpp
+++ b/src/plugins/outputlocator/outputlocator.cpp
@@ -6,7 +6,7 @@
 
 #include "outputlocator.h"
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "effect/offscreenquickview.h"
 
 #include <algorithm>
diff --git a/src/plugins/overview/overvieweffect.cpp b/src/plugins/overview/overvieweffect.cpp
index 7ddfeae91d..2e696f5e0a 100644
--- a/src/plugins/overview/overvieweffect.cpp
+++ b/src/plugins/overview/overvieweffect.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "overvieweffect.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "overviewconfig.h"
 
 #include <KGlobalAccel>
diff --git a/src/plugins/screenedge/screenedgeeffect.cpp b/src/plugins/screenedge/screenedgeeffect.cpp
index 4eeb7fc93e..f2f94608f2 100644
--- a/src/plugins/screenedge/screenedgeeffect.cpp
+++ b/src/plugins/screenedge/screenedgeeffect.cpp
@@ -10,7 +10,7 @@
 // KWin
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/gltexture.h"
 #include "opengl/glutils.h"
 // KDE
diff --git a/src/plugins/screenshot/screenshot.cpp b/src/plugins/screenshot/screenshot.cpp
index 9db910646b..76de1e38ef 100644
--- a/src/plugins/screenshot/screenshot.cpp
+++ b/src/plugins/screenshot/screenshot.cpp
@@ -14,7 +14,7 @@
 #include "core/output.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glplatform.h"
 #include "opengl/glutils.h"
 
diff --git a/src/plugins/screenshot/screenshotdbusinterface2.cpp b/src/plugins/screenshot/screenshotdbusinterface2.cpp
index f809cb3923..0d11d7a1d7 100644
--- a/src/plugins/screenshot/screenshotdbusinterface2.cpp
+++ b/src/plugins/screenshot/screenshotdbusinterface2.cpp
@@ -8,7 +8,7 @@
 
 #include "screenshotdbusinterface2.h"
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "screenshot2adaptor.h"
 #include "screenshotlogging.h"
 #include "utils/filedescriptor.h"
diff --git a/src/plugins/screentransform/screentransform.cpp b/src/plugins/screentransform/screentransform.cpp
index 1a9cc71dec..51516e4619 100644
--- a/src/plugins/screentransform/screentransform.cpp
+++ b/src/plugins/screentransform/screentransform.cpp
@@ -10,7 +10,7 @@
 #include "screentransform.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 #include <QDebug>
diff --git a/src/plugins/sheet/sheet.cpp b/src/plugins/sheet/sheet.cpp
index 7414910dac..0a556b96bf 100644
--- a/src/plugins/sheet/sheet.cpp
+++ b/src/plugins/sheet/sheet.cpp
@@ -16,7 +16,7 @@
 #include "sheetconfig.h"
 
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 // Qt
 #include <QMatrix4x4>
diff --git a/src/plugins/showfps/showfpseffect.cpp b/src/plugins/showfps/showfpseffect.cpp
index d06ee64881..1e57b22f21 100644
--- a/src/plugins/showfps/showfpseffect.cpp
+++ b/src/plugins/showfps/showfpseffect.cpp
@@ -9,7 +9,7 @@
 #include "showfpseffect.h"
 #include "core/output.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <QQmlContext>
 
diff --git a/src/plugins/showpaint/showpaint.cpp b/src/plugins/showpaint/showpaint.cpp
index 32a0c3b2a2..06b61fb5fc 100644
--- a/src/plugins/showpaint/showpaint.cpp
+++ b/src/plugins/showpaint/showpaint.cpp
@@ -11,7 +11,7 @@
 #include "showpaint.h"
 
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 #include <KGlobalAccel>
diff --git a/src/plugins/slide/slide.cpp b/src/plugins/slide/slide.cpp
index ed5f689eea..3ebc6d333a 100644
--- a/src/plugins/slide/slide.cpp
+++ b/src/plugins/slide/slide.cpp
@@ -12,7 +12,7 @@
 // own
 #include "slide.h"
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 // KConfigSkeleton
 #include "slideconfig.h"
diff --git a/src/plugins/slideback/motionmanager.h b/src/plugins/slideback/motionmanager.h
index ad04bc9db3..35988f21ce 100644
--- a/src/plugins/slideback/motionmanager.h
+++ b/src/plugins/slideback/motionmanager.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 namespace KWin
 {
diff --git a/src/plugins/slideback/slideback.cpp b/src/plugins/slideback/slideback.cpp
index 7c56ac691d..f60a04f6aa 100644
--- a/src/plugins/slideback/slideback.cpp
+++ b/src/plugins/slideback/slideback.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "slideback.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 namespace KWin
 {
diff --git a/src/plugins/slidingpopups/slidingpopups.cpp b/src/plugins/slidingpopups/slidingpopups.cpp
index 012080338e..41d6a079bd 100644
--- a/src/plugins/slidingpopups/slidingpopups.cpp
+++ b/src/plugins/slidingpopups/slidingpopups.cpp
@@ -11,7 +11,7 @@
 #include "slidingpopups.h"
 #include "slidingpopupsconfig.h"
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "wayland/display.h"
 #include "wayland/slide.h"
 #include "wayland/surface.h"
diff --git a/src/plugins/snaphelper/snaphelper.cpp b/src/plugins/snaphelper/snaphelper.cpp
index 3906394e49..ad59b941b9 100644
--- a/src/plugins/snaphelper/snaphelper.cpp
+++ b/src/plugins/snaphelper/snaphelper.cpp
@@ -12,7 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 #include <QPainter>
diff --git a/src/plugins/startupfeedback/startupfeedback.cpp b/src/plugins/startupfeedback/startupfeedback.cpp
index e4942047b4..852f93ea23 100644
--- a/src/plugins/startupfeedback/startupfeedback.cpp
+++ b/src/plugins/startupfeedback/startupfeedback.cpp
@@ -26,7 +26,7 @@
 // KWin
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 // based on StartupId in KRunner by Lubos Lunak
diff --git a/src/plugins/thumbnailaside/thumbnailaside.cpp b/src/plugins/thumbnailaside/thumbnailaside.cpp
index 6587b4fcad..bdab4c24ff 100644
--- a/src/plugins/thumbnailaside/thumbnailaside.cpp
+++ b/src/plugins/thumbnailaside/thumbnailaside.cpp
@@ -10,7 +10,7 @@
 
 #include "thumbnailaside.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 // KConfigSkeleton
 #include "thumbnailasideconfig.h"
 
diff --git a/src/plugins/tileseditor/tileseditoreffect.cpp b/src/plugins/tileseditor/tileseditoreffect.cpp
index 6c25665ede..eba187dc18 100644
--- a/src/plugins/tileseditor/tileseditoreffect.cpp
+++ b/src/plugins/tileseditor/tileseditoreffect.cpp
@@ -4,7 +4,7 @@
 */
 
 #include "tileseditoreffect.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <QAction>
 #include <QQuickItem>
diff --git a/src/plugins/touchpoints/touchpoints.cpp b/src/plugins/touchpoints/touchpoints.cpp
index 5ca92d3aad..ffe9c9824e 100644
--- a/src/plugins/touchpoints/touchpoints.cpp
+++ b/src/plugins/touchpoints/touchpoints.cpp
@@ -12,7 +12,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 #include <QAction>
 
diff --git a/src/plugins/trackmouse/trackmouse.cpp b/src/plugins/trackmouse/trackmouse.cpp
index d37ace73d1..311a7cc7f0 100644
--- a/src/plugins/trackmouse/trackmouse.cpp
+++ b/src/plugins/trackmouse/trackmouse.cpp
@@ -21,7 +21,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 #include <KGlobalAccel>
diff --git a/src/plugins/windowsystem/windoweffects.cpp b/src/plugins/windowsystem/windoweffects.cpp
index 9a89bea738..3491ae89aa 100644
--- a/src/plugins/windowsystem/windoweffects.cpp
+++ b/src/plugins/windowsystem/windoweffects.cpp
@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */
 #include "windoweffects.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <QGuiApplication>
 #include <QWidget>
diff --git a/src/plugins/windowview/windowvieweffect.cpp b/src/plugins/windowview/windowvieweffect.cpp
index 9f6c761b73..ccf7aab830 100644
--- a/src/plugins/windowview/windowvieweffect.cpp
+++ b/src/plugins/windowview/windowvieweffect.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "windowvieweffect.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "windowview1adaptor.h"
 #include "windowviewconfig.h"
 
diff --git a/src/plugins/wobblywindows/wobblywindows.cpp b/src/plugins/wobblywindows/wobblywindows.cpp
index d8522c5035..5fd0074150 100644
--- a/src/plugins/wobblywindows/wobblywindows.cpp
+++ b/src/plugins/wobblywindows/wobblywindows.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "wobblywindows.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "wobblywindowsconfig.h"
 
 #include <cmath>
diff --git a/src/plugins/zoom/zoom.cpp b/src/plugins/zoom/zoom.cpp
index d18748bf82..0c7ccf429d 100644
--- a/src/plugins/zoom/zoom.cpp
+++ b/src/plugins/zoom/zoom.cpp
@@ -26,7 +26,7 @@
 
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "opengl/glutils.h"
 
 namespace KWin
diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp
index dadcbf5d2e..1f3be8da00 100644
--- a/src/pointer_input.cpp
+++ b/src/pointer_input.cpp
@@ -16,7 +16,7 @@
 #include "core/output.h"
 #include "cursorsource.h"
 #include "decorations/decoratedclient.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "input_event.h"
 #include "input_event_spy.h"
 #include "mousebuttons.h"
diff --git a/src/scene/windowitem.cpp b/src/scene/windowitem.cpp
index e3ddfc623e..8a56b73294 100644
--- a/src/scene/windowitem.cpp
+++ b/src/scene/windowitem.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "scene/windowitem.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "internalwindow.h"
 #include "scene/decorationitem.h"
 #include "scene/shadowitem.h"
diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp
index 5ecf890df5..94d26e5a2b 100644
--- a/src/scene/workspacescene.cpp
+++ b/src/scene/workspacescene.cpp
@@ -59,7 +59,7 @@
 #include "core/renderlayer.h"
 #include "core/renderloop.h"
 #include "core/renderviewport.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "internalwindow.h"
 #include "scene/dndiconitem.h"
 #include "scene/itemrenderer.h"
diff --git a/src/screenedge.cpp b/src/screenedge.cpp
index 899436097d..7b2e5bf509 100644
--- a/src/screenedge.cpp
+++ b/src/screenedge.cpp
@@ -22,7 +22,7 @@
 
 #include "core/output.h"
 #include "cursor.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "gestures.h"
 #include "main.h"
 #include "pointer_input.h"
diff --git a/src/scripting/gesturehandler.cpp b/src/scripting/gesturehandler.cpp
index ec7bcfb90c..22a4596f31 100644
--- a/src/scripting/gesturehandler.cpp
+++ b/src/scripting/gesturehandler.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "gesturehandler.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 
 #include <QAction>
 
diff --git a/src/scripting/scriptedeffect.cpp b/src/scripting/scriptedeffect.cpp
index 46fe98e761..6e6a081185 100644
--- a/src/scripting/scriptedeffect.cpp
+++ b/src/scripting/scriptedeffect.cpp
@@ -14,7 +14,7 @@
 #include "workspace_wrapper.h"
 
 #include "core/output.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "input.h"
 #include "screenedge.h"
 #include "workspace.h"
diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp
index 1c837ecead..a966b35a25 100644
--- a/src/scripting/workspace_wrapper.cpp
+++ b/src/scripting/workspace_wrapper.cpp
@@ -12,7 +12,7 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "cursor.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "outline.h"
 #include "tiles/tilemanager.h"
 #include "virtualdesktops.h"
diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp
index 91677a1530..809c60e682 100644
--- a/src/tabbox/tabbox.cpp
+++ b/src/tabbox/tabbox.cpp
@@ -22,7 +22,7 @@
 #include "activities.h"
 #endif
 #include "compositor.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "focuschain.h"
 #include "input.h"
 #include "keyboard_input.h"
diff --git a/src/tabbox/x11_filter.cpp b/src/tabbox/x11_filter.cpp
index c281cdac78..83f7bc4bdf 100644
--- a/src/tabbox/x11_filter.cpp
+++ b/src/tabbox/x11_filter.cpp
@@ -8,7 +8,7 @@
 */
 #include "x11_filter.h"
 
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "screenedge.h"
 #include "tabbox/tabbox.h"
 #include "utils/xcbutils.h"
diff --git a/src/window_property_notify_x11_filter.cpp b/src/window_property_notify_x11_filter.cpp
index 66c91da97a..d10ad1f85e 100644
--- a/src/window_property_notify_x11_filter.cpp
+++ b/src/window_property_notify_x11_filter.cpp
@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "window_property_notify_x11_filter.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "workspace.h"
 #include "x11window.h"
 
diff --git a/src/workspace.cpp b/src/workspace.cpp
index b826115f7a..35ad1deb4b 100644
--- a/src/workspace.cpp
+++ b/src/workspace.cpp
@@ -24,7 +24,7 @@
 #include "core/outputconfiguration.h"
 #include "cursor.h"
 #include "dbusinterface.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "focuschain.h"
 #include "group.h"
 #include "input.h"
diff --git a/src/x11window.cpp b/src/x11window.cpp
index f9d78605f8..6b63ef2f9f 100644
--- a/src/x11window.cpp
+++ b/src/x11window.cpp
@@ -20,7 +20,7 @@
 #include "cursor.h"
 #include "decorations/decoratedclient.h"
 #include "decorations/decorationbridge.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "focuschain.h"
 #include "group.h"
 #include "netinfo.h"
diff --git a/src/xdgactivationv1.cpp b/src/xdgactivationv1.cpp
index b43e38d5b6..40afc45e72 100644
--- a/src/xdgactivationv1.cpp
+++ b/src/xdgactivationv1.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "xdgactivationv1.h"
-#include "effect/effects.h"
+#include "effect/effecthandler.h"
 #include "utils/common.h"
 #include "wayland/display.h"
 #include "wayland/plasmawindowmanagement.h"