diff --git a/autotests/integration/dont_crash_cancel_animation.cpp b/autotests/integration/dont_crash_cancel_animation.cpp
index 636daec233..22c75d4663 100644
--- a/autotests/integration/dont_crash_cancel_animation.cpp
+++ b/autotests/integration/dont_crash_cancel_animation.cpp
@@ -10,7 +10,7 @@
 
 #include "compositor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 9c460c9541..32c2a677b2 100644
--- a/autotests/integration/dont_crash_reinitialize_compositor.cpp
+++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp
@@ -12,7 +12,7 @@
 #include "compositor.h"
 #include "core/output.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 2cece77129..1578b553a4 100644
--- a/autotests/integration/effects/desktop_switching_animation_test.cpp
+++ b/autotests/integration/effects/desktop_switching_animation_test.cpp
@@ -10,7 +10,7 @@
 #include "kwin_wayland_test.h"
 
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 74cf9a8c13..25fa753196 100644
--- a/autotests/integration/effects/maximize_animation_test.cpp
+++ b/autotests/integration/effects/maximize_animation_test.cpp
@@ -11,7 +11,7 @@
 
 #include "compositor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 971c2f4ff7..33bffeffd8 100644
--- a/autotests/integration/effects/minimize_animation_test.cpp
+++ b/autotests/integration/effects/minimize_animation_test.cpp
@@ -10,7 +10,7 @@
 #include "kwin_wayland_test.h"
 
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 458c4fcd39..782197dc38 100644
--- a/autotests/integration/effects/popup_open_close_animation_test.cpp
+++ b/autotests/integration/effects/popup_open_close_animation_test.cpp
@@ -11,7 +11,7 @@
 
 #include "effectloader.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "useractions.h"
 #include "wayland_server.h"
 #include "window.h"
diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp
index 2b29d7081e..75171bca60 100644
--- a/autotests/integration/effects/scripted_effects_test.cpp
+++ b/autotests/integration/effects/scripted_effects_test.cpp
@@ -11,7 +11,7 @@
 
 #include "effectloader.h"
 #include "libkwineffects/anidata_p.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 5152a9ae96..9d23782787 100644
--- a/autotests/integration/effects/slidingpopups_test.cpp
+++ b/autotests/integration/effects/slidingpopups_test.cpp
@@ -8,7 +8,7 @@
 */
 #include "effectloader.h"
 #include "kwin_wayland_test.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
diff --git a/autotests/integration/effects/toplevel_open_close_animation_test.cpp b/autotests/integration/effects/toplevel_open_close_animation_test.cpp
index 78af0d6314..f6cf0b2662 100644
--- a/autotests/integration/effects/toplevel_open_close_animation_test.cpp
+++ b/autotests/integration/effects/toplevel_open_close_animation_test.cpp
@@ -10,7 +10,7 @@
 #include "kwin_wayland_test.h"
 
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 8bb5750a78..ee23ae96fa 100644
--- a/autotests/integration/effects/translucency_test.cpp
+++ b/autotests/integration/effects/translucency_test.cpp
@@ -10,7 +10,7 @@
 
 #include "compositor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 d944fab9e9..31889fbb4e 100644
--- a/autotests/integration/effects/wobbly_shade_test.cpp
+++ b/autotests/integration/effects/wobbly_shade_test.cpp
@@ -10,7 +10,7 @@
 
 #include "cursor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/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 c07fe24801..bbfd1b2efc 100644
--- a/autotests/integration/internal_window.cpp
+++ b/autotests/integration/internal_window.cpp
@@ -10,7 +10,7 @@
 
 #include "core/output.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "pointer_input.h"
 #include "wayland/surface.h"
 #include "wayland_server.h"
diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp
index add7f0d96c..5e6926331e 100644
--- a/autotests/integration/kwin_wayland_test.cpp
+++ b/autotests/integration/kwin_wayland_test.cpp
@@ -12,7 +12,7 @@
 #include "compositor_wayland.h"
 #include "core/session.h"
 #include "inputmethod.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "placement.h"
 #include "pluginmanager.h"
 #include "utils/xcbutils.h"
diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp
index 0745af118e..06cc778c5a 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.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 53f0d6da31..48a395f5ed 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "options.h"
 #include "pointer_input.h"
 #include "utils/xcursortheme.h"
diff --git a/autotests/libkwineffects/windowquadlisttest.cpp b/autotests/libkwineffects/windowquadlisttest.cpp
index 38790b418a..7e05def59e 100644
--- a/autotests/libkwineffects/windowquadlisttest.cpp
+++ b/autotests/libkwineffects/windowquadlisttest.cpp
@@ -6,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include <QTest>
 
 Q_DECLARE_METATYPE(KWin::WindowQuadList)
diff --git a/autotests/test_window_paint_data.cpp b/autotests/test_window_paint_data.cpp
index 0ebde4358f..9c80f4cdb2 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include "virtualdesktops.h"
 
diff --git a/autotests/test_x11_timestamp_update.cpp b/autotests/test_x11_timestamp_update.cpp
index e9b0985140..635f919f14 100644
--- a/autotests/test_x11_timestamp_update.cpp
+++ b/autotests/test_x11_timestamp_update.cpp
@@ -10,7 +10,7 @@
 #include <QTest>
 #include <private/qtx11extras_p.h>
 
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/xcb.h"
 #include "main.h"
 #include "utils/common.h"
 
diff --git a/autotests/testutils.h b/autotests/testutils.h
index 5efbdf2c6c..0729046078 100644
--- a/autotests/testutils.h
+++ b/autotests/testutils.h
@@ -9,8 +9,8 @@
 #ifndef TESTUTILS_H
 #define TESTUTILS_H
 // KWin
-#include "libkwineffects/kwinglobals.h"
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/globals.h"
+#include "libkwineffects/xcb.h"
 
 namespace
 {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6cd91ee19..0df8729ec5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -108,15 +108,15 @@ target_sources(kwin PRIVATE
     layershellv1integration.cpp
     layershellv1window.cpp
     libkwineffects/anidata.cpp
+    libkwineffects/animationeffect.cpp
     libkwineffects/effect.cpp
     libkwineffects/effectframe.cpp
+    libkwineffects/effects.cpp
     libkwineffects/effecttogglablestate.cpp
-    libkwineffects/kwinanimationeffect.cpp
-    libkwineffects/kwineffects.cpp
-    libkwineffects/kwinoffscreeneffect.cpp
-    libkwineffects/kwinoffscreenquickview.cpp
-    libkwineffects/kwinquickeffect.cpp
     libkwineffects/logging.cpp
+    libkwineffects/offscreeneffect.cpp
+    libkwineffects/offscreenquickview.cpp
+    libkwineffects/quickeffect.cpp
     libkwineffects/timeline.cpp
     lidswitchtracker.cpp
     main.cpp
@@ -294,7 +294,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} libkwineffects/kwineffects.h KWin::EffectsHandler)
+qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} libkwineffects/effects.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)
@@ -435,14 +435,14 @@ install(FILES
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/utils COMPONENT Devel)
 
 install(FILES
+    libkwineffects/animationeffect.h
     libkwineffects/effect.h
+    libkwineffects/effects.h
     libkwineffects/effecttogglablestate.h
-    libkwineffects/kwinanimationeffect.h
-    libkwineffects/kwineffects.h
-    libkwineffects/kwinglobals.h
-    libkwineffects/kwinoffscreeneffect.h
-    libkwineffects/kwinoffscreenquickview.h
-    libkwineffects/kwinquickeffect.h
+    libkwineffects/globals.h
+    libkwineffects/offscreeneffect.h
+    libkwineffects/offscreenquickview.h
+    libkwineffects/quickeffect.h
     libkwineffects/timeline.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/libkwineffects COMPONENT Devel)
 
diff --git a/src/activities.h b/src/activities.h
index 2cc17f87e7..43fdab2a7b 100644
--- a/src/activities.h
+++ b/src/activities.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 #include <QStringList>
diff --git a/src/appmenu.h b/src/appmenu.h
index 188d078e2b..889bd72d21 100644
--- a/src/appmenu.h
+++ b/src/appmenu.h
@@ -10,7 +10,7 @@
 */
 #pragma once
 // KWin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 // Qt
 #include <QObject>
 // xcb
diff --git a/src/backends/libinput/connection.h b/src/backends/libinput/connection.h
index a9baf492bc..82c0135c88 100644
--- a/src/backends/libinput/connection.h
+++ b/src/backends/libinput/connection.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <KSharedConfig>
 
diff --git a/src/backends/wayland/wayland_backend.h b/src/backends/wayland/wayland_backend.h
index 6e11f1631b..9cfa94cc7f 100644
--- a/src/backends/wayland/wayland_backend.h
+++ b/src/backends/wayland/wayland_backend.h
@@ -14,7 +14,7 @@
 #include "core/inputbackend.h"
 #include "core/inputdevice.h"
 #include "core/outputbackend.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "utils/filedescriptor.h"
 // Qt
 #include <QHash>
diff --git a/src/backends/x11/standalone/x11_standalone_effects.h b/src/backends/x11/standalone/x11_standalone_effects.h
index 6c20ed5dd5..145b8c1431 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.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 a38a1fb5c0..a686ba86ac 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "utils/common.h"
 
 #include <QCursor>
diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp
index f6bbd94a19..be9fd57f6a 100644
--- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp
+++ b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp
@@ -34,7 +34,7 @@
 #include "utils/xcbutils.h"
 #include "workspace.h"
 // kwin libs
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 #include "opengl/glplatform.h"
 #include "opengl/glutils.h"
 // Qt
diff --git a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp
index ea31d4d894..c13648f41d 100644
--- a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp
+++ b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp
@@ -10,7 +10,7 @@
 #include "x11_standalone_overlaywindow.h"
 
 #include "compositor.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "scene/workspacescene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"
diff --git a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp
index f61b779fd7..e76b361e96 100644
--- a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp
+++ b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp
@@ -19,8 +19,8 @@
 #include "../common/ge_event_mem_mover.h"
 
 #include "input.h"
-#include "libkwineffects/kwinglobals.h"
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/globals.h"
+#include "libkwineffects/xcb.h"
 #include "modifier_only_shortcuts.h"
 #include "workspace.h"
 #include "x11eventfilter.h"
diff --git a/src/client_machine.cpp b/src/client_machine.cpp
index ce8122001d..e7b42c671b 100644
--- a/src/client_machine.cpp
+++ b/src/client_machine.cpp
@@ -8,7 +8,7 @@
 */
 // own
 #include "client_machine.h"
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/xcb.h"
 #include "main.h"
 #include "utils/common.h"
 // KF5
diff --git a/src/colors/colordevice.h b/src/colors/colordevice.h
index 91a6649039..449ae92d35 100644
--- a/src/colors/colordevice.h
+++ b/src/colors/colordevice.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 #include <memory>
diff --git a/src/colors/colormanager.h b/src/colors/colormanager.h
index 96caa3b2fe..f8519a325f 100644
--- a/src/colors/colormanager.h
+++ b/src/colors/colormanager.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 #include <memory>
diff --git a/src/compositor.h b/src/compositor.h
index ef8cfda464..cda88ee9b0 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <xcb/xcb.h>
 
 #include <QObject>
diff --git a/src/core/outputbackend.h b/src/core/outputbackend.h
index 67a9f41c37..305d95ea6c 100644
--- a/src/core/outputbackend.h
+++ b/src/core/outputbackend.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <epoxy/egl.h>
 #include <kwin_export.h>
 
diff --git a/src/core/renderbackend.h b/src/core/renderbackend.h
index 40d7e8a113..359b1576ae 100644
--- a/src/core/renderbackend.h
+++ b/src/core/renderbackend.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "core/rendertarget.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 
diff --git a/src/core/renderjournal.h b/src/core/renderjournal.h
index 244cf7d5c2..3b664e496f 100644
--- a/src/core/renderjournal.h
+++ b/src/core/renderjournal.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QElapsedTimer>
 #include <QQueue>
diff --git a/src/core/renderlayerdelegate.h b/src/core/renderlayerdelegate.h
index 7504f15a98..e2c0028b58 100644
--- a/src/core/renderlayerdelegate.h
+++ b/src/core/renderlayerdelegate.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "kwin_export.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QRegion>
 #include <chrono>
diff --git a/src/core/renderloop.h b/src/core/renderloop.h
index a41d4c4bf5..eb64cc388e 100644
--- a/src/core/renderloop.h
+++ b/src/core/renderloop.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 
diff --git a/src/core/session.h b/src/core/session.h
index 3b37178499..279dbd4cd1 100644
--- a/src/core/session.h
+++ b/src/core/session.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 #include <QString>
diff --git a/src/cursor.h b/src/cursor.h
index 4edbefcdec..6bb74c7e4a 100644
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 // kwin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 // Qt
 #include <QHash>
 #include <QObject>
diff --git a/src/decorations/decorationbridge.h b/src/decorations/decorationbridge.h
index 9b9bdd5aae..a45bc5a555 100644
--- a/src/decorations/decorationbridge.h
+++ b/src/decorations/decorationbridge.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <KDecoration2/Private/DecorationBridge>
 
diff --git a/src/events.cpp b/src/events.cpp
index 2ba20a4a25..14922b5dba 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -18,7 +18,7 @@
 #include "cursor.h"
 #include "focuschain.h"
 #include "group.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "netinfo.h"
 #include "rules.h"
 #include "screenedge.h"
diff --git a/src/focuschain.h b/src/focuschain.h
index 54a5a7fe08..9c8b5d7e56 100644
--- a/src/focuschain.h
+++ b/src/focuschain.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 // KWin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 // Qt
 #include <QHash>
 #include <QObject>
diff --git a/src/ftrace.h b/src/ftrace.h
index bfbb40fae5..eda8dd7b97 100644
--- a/src/ftrace.h
+++ b/src/ftrace.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QFile>
 #include <QMutex>
diff --git a/src/gestures.h b/src/gestures.h
index 0309ae75af..eaed7971ce 100644
--- a/src/gestures.h
+++ b/src/gestures.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <kwin_export.h>
 
 #include <QList>
diff --git a/src/globalshortcuts.cpp b/src/globalshortcuts.cpp
index 12a727f13e..0656f58f00 100644
--- a/src/globalshortcuts.cpp
+++ b/src/globalshortcuts.cpp
@@ -12,7 +12,7 @@
 #include <config-kwin.h>
 // kwin
 #include "gestures.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "main.h"
 #include "utils/common.h"
 // KDE
diff --git a/src/globalshortcuts.h b/src/globalshortcuts.h
index fd05b419f1..f37e44f0ca 100644
--- a/src/globalshortcuts.h
+++ b/src/globalshortcuts.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 // KWin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 // Qt
 #include <QKeySequence>
 
diff --git a/src/input.h b/src/input.h
index 4cf4bfbc48..f5ff8ed89f 100644
--- a/src/input.h
+++ b/src/input.h
@@ -11,7 +11,7 @@
 #pragma once
 #include <config-kwin.h>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <QObject>
 #include <QPoint>
 #include <QPointer>
diff --git a/src/inputmethod.h b/src/inputmethod.h
index 52c897245e..b6e9fa4a49 100644
--- a/src/inputmethod.h
+++ b/src/inputmethod.h
@@ -15,7 +15,7 @@
 
 #include <QObject>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <kwin_export.h>
 
 #include <QPointer>
diff --git a/src/kcms/screenedges/kwinscreenedge.h b/src/kcms/screenedges/kwinscreenedge.h
index 09f60eb49b..1a88108803 100644
--- a/src/kcms/screenedges/kwinscreenedge.h
+++ b/src/kcms/screenedges/kwinscreenedge.h
@@ -11,7 +11,7 @@
 
 #include <QWidget>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 namespace KWin
 {
diff --git a/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc
index ea34a67d42..86ef4add03 100644
--- a/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc
+++ b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc
@@ -1,7 +1,7 @@
 File=kwinscreenedgeeffectsettings.kcfg
 NameSpace=KWin
 ClassName=KWinScreenEdgeEffectSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true
diff --git a/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc
index a77a5cdd54..e27832e116 100644
--- a/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc
+++ b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc
@@ -1,7 +1,7 @@
 File=kwinscreenedgescriptsettings.kcfg
 NameSpace=KWin
 ClassName=KWinScreenEdgeScriptSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true
diff --git a/src/kcms/screenedges/kwinscreenedgesettings.kcfgc b/src/kcms/screenedges/kwinscreenedgesettings.kcfgc
index bdb90cc943..5ac758778f 100644
--- a/src/kcms/screenedges/kwinscreenedgesettings.kcfgc
+++ b/src/kcms/screenedges/kwinscreenedgesettings.kcfgc
@@ -1,7 +1,7 @@
 File=kwinscreenedgesettings.kcfg
 NameSpace=KWin
 ClassName=KWinScreenEdgeSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true
diff --git a/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc
index a702a7f4a7..49a3ce8195 100644
--- a/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc
+++ b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc
@@ -1,7 +1,7 @@
 File=kwintouchscreenedgeeffectsettings.kcfg
 NameSpace=KWin
 ClassName=KWinTouchScreenEdgeEffectSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true
diff --git a/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc
index 303015994d..9b07372bf4 100644
--- a/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc
+++ b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc
@@ -1,7 +1,7 @@
 File=kwintouchscreenscriptsettings.kcfg
 NameSpace=KWin
 ClassName=KWinTouchScreenScriptSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true
diff --git a/src/kcms/screenedges/kwintouchscreensettings.kcfgc b/src/kcms/screenedges/kwintouchscreensettings.kcfgc
index c486893ebf..09b7a26229 100644
--- a/src/kcms/screenedges/kwintouchscreensettings.kcfgc
+++ b/src/kcms/screenedges/kwintouchscreensettings.kcfgc
@@ -1,7 +1,7 @@
 File=kwintouchscreensettings.kcfg
 NameSpace=KWin
 ClassName=KWinTouchScreenSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true
diff --git a/src/kcms/screenedges/main.h b/src/kcms/screenedges/main.h
index aada558ee7..53dcbcaa84 100644
--- a/src/kcms/screenedges/main.h
+++ b/src/kcms/screenedges/main.h
@@ -13,7 +13,7 @@
 #include <kcmodule.h>
 #include <ksharedconfig.h>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 namespace KWin
 {
diff --git a/src/kcms/screenedges/touch.h b/src/kcms/screenedges/touch.h
index 0d3682b175..b837ccce30 100644
--- a/src/kcms/screenedges/touch.h
+++ b/src/kcms/screenedges/touch.h
@@ -13,7 +13,7 @@
 #include <kcmodule.h>
 #include <ksharedconfig.h>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 class QShowEvent;
 
diff --git a/src/layers.cpp b/src/layers.cpp
index 19696b5455..f327d21b9a 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -68,7 +68,7 @@
 #include "focuschain.h"
 #include "group.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "netinfo.h"
 #include "rules.h"
 #include "screenedge.h"
diff --git a/src/libkwineffects/anidata_p.h b/src/libkwineffects/anidata_p.h
index b0ec914af4..747fdc01ac 100644
--- a/src/libkwineffects/anidata_p.h
+++ b/src/libkwineffects/anidata_p.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinanimationeffect.h"
+#include "libkwineffects/animationeffect.h"
 #include "libkwineffects/timeline.h"
 
 #include <QEasingCurve>
diff --git a/src/libkwineffects/kwinanimationeffect.cpp b/src/libkwineffects/animationeffect.cpp
similarity index 98%
rename from src/libkwineffects/kwinanimationeffect.cpp
rename to src/libkwineffects/animationeffect.cpp
index c0fd181774..31a30f96cf 100644
--- a/src/libkwineffects/kwinanimationeffect.cpp
+++ b/src/libkwineffects/animationeffect.cpp
@@ -8,7 +8,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinanimationeffect.h"
+#include "libkwineffects/animationeffect.h"
 #include "libkwineffects/anidata_p.h"
 #include "opengl/glutils.h"
 
@@ -249,8 +249,7 @@ quint64 AnimationEffect::p_animate(EffectWindow *w, Attribute a, uint meta, int
         waitAtSource, // Whether the animation should be kept at source
         fullscreen, // Full screen effect lock
         keepAlive, // Keep alive flag
-        shader
-        ));
+        shader));
 
     const quint64 ret_id = ++d->m_animCounter;
     AniData &animation = it->first.last();
@@ -413,7 +412,9 @@ bool AnimationEffect::cancel(quint64 animationId)
         for (QList<AniData>::iterator anim = entry->first.begin(), animEnd = entry->first.end(); anim != animEnd; ++anim) {
             if (anim->id == animationId) {
                 EffectWindowDeletedRef ref = std::move(anim->deletedRef); // delete window once we're done updating m_animations
-                if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [animationId] (const auto &anim) { return anim.id != animationId && anim.shader; })) {
+                if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [animationId](const auto &anim) {
+                        return anim.id != animationId && anim.shader;
+                    })) {
                     unredirect(entry.key());
                 }
                 entry->first.erase(anim); // remove the animation
@@ -664,7 +665,9 @@ void AnimationEffect::postPaintScreen()
             }
             EffectWindow *window = entry.key();
             d->m_justEndedAnimation = anim->id;
-            if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [anim] (const auto &other) { return anim->id != other.id && other.shader; })) {
+            if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [anim](const auto &other) {
+                    return anim->id != other.id && other.shader;
+                })) {
                 unredirect(window);
             }
             unredirect(window);
@@ -1020,4 +1023,4 @@ AnimationEffect::AniMap AnimationEffect::state() const
 
 } // namespace KWin
 
-#include "moc_kwinanimationeffect.cpp"
+#include "moc_animationeffect.cpp"
diff --git a/src/libkwineffects/kwinanimationeffect.h b/src/libkwineffects/animationeffect.h
similarity index 99%
rename from src/libkwineffects/kwinanimationeffect.h
rename to src/libkwineffects/animationeffect.h
index 90fa7cc8d6..13c14d5516 100644
--- a/src/libkwineffects/kwinanimationeffect.h
+++ b/src/libkwineffects/animationeffect.h
@@ -12,7 +12,7 @@
 
 #include "kwin_export.h"
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 #include <QEasingCurve>
 #include <QElapsedTimer>
 #include <QtMath>
diff --git a/src/libkwineffects/effect.cpp b/src/libkwineffects/effect.cpp
index b3a963073d..9947960193 100644
--- a/src/libkwineffects/effect.cpp
+++ b/src/libkwineffects/effect.cpp
@@ -7,7 +7,7 @@
 */
 
 #include "libkwineffects/effect.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include <KConfigGroup>
 
diff --git a/src/libkwineffects/effect.h b/src/libkwineffects/effect.h
index e28e246110..7b70c8efa8 100644
--- a/src/libkwineffects/effect.h
+++ b/src/libkwineffects/effect.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QRegion>
 
diff --git a/src/libkwineffects/effectframe.h b/src/libkwineffects/effectframe.h
index bba1cd1210..10327e3015 100644
--- a/src/libkwineffects/effectframe.h
+++ b/src/libkwineffects/effectframe.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h" // FIXME: move infiniteRegion() elsewhere
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/effects.h" // FIXME: move infiniteRegion() elsewhere
+#include "libkwineffects/offscreenquickview.h"
 
 #include <QFont>
 #include <QIcon>
diff --git a/src/libkwineffects/kwineffects.cpp b/src/libkwineffects/effects.cpp
similarity index 99%
rename from src/libkwineffects/kwineffects.cpp
rename to src/libkwineffects/effects.cpp
index cc10770c61..2b47b36818 100644
--- a/src/libkwineffects/kwineffects.cpp
+++ b/src/libkwineffects/effects.cpp
@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include "config-kwin.h"
 
@@ -28,7 +28,7 @@
 #include "inputmethod.h"
 #include "inputpanelv1window.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 #include "opengl/glutils.h"
 #include "osd.h"
 #include "pointer_input.h"
@@ -2684,5 +2684,5 @@ EffectWindow *WindowMotionManager::windowAtPoint(QPoint point, bool useStackingO
 
 } // namespace
 
-#include "moc_kwineffects.cpp"
-#include "moc_kwinglobals.cpp"
+#include "moc_effects.cpp"
+#include "moc_globals.cpp"
diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/effects.h
similarity index 100%
rename from src/libkwineffects/kwineffects.h
rename to src/libkwineffects/effects.h
diff --git a/src/libkwineffects/effecttogglablestate.cpp b/src/libkwineffects/effecttogglablestate.cpp
index a6b31da24e..c082355540 100644
--- a/src/libkwineffects/effecttogglablestate.cpp
+++ b/src/libkwineffects/effecttogglablestate.cpp
@@ -4,8 +4,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "effecttogglablestate.h"
-#include "kwineffects.h"
+#include "libkwineffects/effecttogglablestate.h"
+#include "libkwineffects/effects.h"
 
 namespace KWin
 {
diff --git a/src/libkwineffects/effecttogglablestate.h b/src/libkwineffects/effecttogglablestate.h
index c1ccd6dd7e..d33a2300a2 100644
--- a/src/libkwineffects/effecttogglablestate.h
+++ b/src/libkwineffects/effecttogglablestate.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QAction>
 #include <QObject>
diff --git a/src/libkwineffects/kwinglobals.h b/src/libkwineffects/globals.h
similarity index 100%
rename from src/libkwineffects/kwinglobals.h
rename to src/libkwineffects/globals.h
diff --git a/src/libkwineffects/kwinoffscreeneffect.cpp b/src/libkwineffects/offscreeneffect.cpp
similarity index 99%
rename from src/libkwineffects/kwinoffscreeneffect.cpp
rename to src/libkwineffects/offscreeneffect.cpp
index 69184a6408..f1909e8b3b 100644
--- a/src/libkwineffects/kwinoffscreeneffect.cpp
+++ b/src/libkwineffects/offscreeneffect.cpp
@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "core/output.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
@@ -400,4 +400,4 @@ void CrossFadeEffect::setShader(EffectWindow *window, GLShader *shader)
 
 } // namespace KWin
 
-#include "moc_kwinoffscreeneffect.cpp"
+#include "moc_offscreeneffect.cpp"
diff --git a/src/libkwineffects/kwinoffscreeneffect.h b/src/libkwineffects/offscreeneffect.h
similarity index 99%
rename from src/libkwineffects/kwinoffscreeneffect.h
rename to src/libkwineffects/offscreeneffect.h
index c91a444e32..77a290cc3e 100644
--- a/src/libkwineffects/kwinoffscreeneffect.h
+++ b/src/libkwineffects/offscreeneffect.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 namespace KWin
 {
diff --git a/src/libkwineffects/kwinoffscreenquickview.cpp b/src/libkwineffects/offscreenquickview.cpp
similarity index 99%
rename from src/libkwineffects/kwinoffscreenquickview.cpp
rename to src/libkwineffects/offscreenquickview.cpp
index 51be9958b1..0999b23101 100644
--- a/src/libkwineffects/kwinoffscreenquickview.cpp
+++ b/src/libkwineffects/offscreenquickview.cpp
@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 
 #include "logging_p.h"
 #include "opengl/glutils.h"
@@ -24,10 +24,10 @@
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
 #include <QOpenGLFramebufferObject>
-#include <QTimer>
 #include <QQuickGraphicsDevice>
 #include <QQuickOpenGLUtils>
 #include <QQuickRenderTarget>
+#include <QTimer>
 #include <private/qeventpoint_p.h> // for QMutableEventPoint
 
 namespace KWin
@@ -584,4 +584,4 @@ QQuickItem *OffscreenQuickScene::rootItem() const
 
 } // namespace KWin
 
-#include "moc_kwinoffscreenquickview.cpp"
+#include "moc_offscreenquickview.cpp"
diff --git a/src/libkwineffects/kwinoffscreenquickview.h b/src/libkwineffects/offscreenquickview.h
similarity index 100%
rename from src/libkwineffects/kwinoffscreenquickview.h
rename to src/libkwineffects/offscreenquickview.h
diff --git a/src/libkwineffects/kwinquickeffect.cpp b/src/libkwineffects/quickeffect.cpp
similarity index 99%
rename from src/libkwineffects/kwinquickeffect.cpp
rename to src/libkwineffects/quickeffect.cpp
index 89aa5e3553..c01eead1e5 100644
--- a/src/libkwineffects/kwinquickeffect.cpp
+++ b/src/libkwineffects/quickeffect.cpp
@@ -4,9 +4,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinquickeffect.h"
+#include "libkwineffects/quickeffect.h"
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include "logging_p.h"
 
@@ -596,4 +596,4 @@ bool QuickSceneEffect::touchUp(qint32 id, std::chrono::microseconds time)
 
 } // namespace KWin
 
-#include <moc_kwinquickeffect.cpp>
+#include "moc_quickeffect.cpp"
diff --git a/src/libkwineffects/kwinquickeffect.h b/src/libkwineffects/quickeffect.h
similarity index 99%
rename from src/libkwineffects/kwinquickeffect.h
rename to src/libkwineffects/quickeffect.h
index 04daffe01a..9be4b5a6da 100644
--- a/src/libkwineffects/kwinquickeffect.h
+++ b/src/libkwineffects/quickeffect.h
@@ -8,7 +8,7 @@
 
 #include "core/output.h"
 #include "libkwineffects/effect.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 
 #include <QQmlComponent>
 
diff --git a/src/libkwineffects/kwinxcb.h b/src/libkwineffects/xcb.h
similarity index 100%
rename from src/libkwineffects/kwinxcb.h
rename to src/libkwineffects/xcb.h
diff --git a/src/main.cpp b/src/main.cpp
index 7a65bff5c8..7b80c23a46 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@
 #include "cursorsource.h"
 #include "input.h"
 #include "inputmethod.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "opengl/gltexture.h"
 #include "opengl/glutils.h"
 #include "options.h"
@@ -41,7 +41,7 @@
 #include "screenlockerwatcher.h"
 #endif
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 // KDE
 #include <KAboutData>
diff --git a/src/main.h b/src/main.h
index abc211354c..1106d0f9e9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <config-kwin.h>
 
 #include <KSharedConfig>
diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp
index 903e68fe93..8f74170696 100644
--- a/src/main_wayland.cpp
+++ b/src/main_wayland.cpp
@@ -18,7 +18,7 @@
 #include "core/outputbackend.h"
 #include "core/session.h"
 #include "inputmethod.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "tabletmodemanager.h"
 #include "utils/realtime.h"
 #include "wayland/display.h"
diff --git a/src/main_x11.cpp b/src/main_x11.cpp
index 7c4306e62d..f51c8ba45e 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "outline.h"
 #include "screenedge.h"
 #include "sm.h"
diff --git a/src/opengl/glplatform.cpp b/src/opengl/glplatform.cpp
index 7225217b3f..db22ac7574 100644
--- a/src/opengl/glplatform.cpp
+++ b/src/opengl/glplatform.cpp
@@ -10,7 +10,7 @@
 #include "opengl/glplatform.h"
 // include kwinglutils_funcs.h to avoid the redeclaration issues
 // between qopengl.h and epoxy/gl.h
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/xcb.h"
 #include "opengl/glutils_funcs.h"
 #include <epoxy/gl.h>
 
diff --git a/src/opengl/glplatform.h b/src/opengl/glplatform.h
index 41ec8faba1..f51bf9c584 100644
--- a/src/opengl/glplatform.h
+++ b/src/opengl/glplatform.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "openglcontext.h"
 
 #include <QByteArray>
diff --git a/src/opengl/glvertexbuffer.cpp b/src/opengl/glvertexbuffer.cpp
index db067ba433..b16677ccef 100644
--- a/src/opengl/glvertexbuffer.cpp
+++ b/src/opengl/glvertexbuffer.cpp
@@ -14,7 +14,7 @@
 #include "glshader.h"
 #include "glshadermanager.h"
 #include "glutils.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "utils/common.h"
 
 #include <QVector4D>
diff --git a/src/opengl/glvertexbuffer.h b/src/opengl/glvertexbuffer.h
index fa29162625..a1318299f2 100644
--- a/src/opengl/glvertexbuffer.h
+++ b/src/opengl/glvertexbuffer.h
@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include <QColor>
 #include <QRegion>
diff --git a/src/outline.h b/src/outline.h
index 043e84f4dd..5ee2ce2750 100644
--- a/src/outline.h
+++ b/src/outline.h
@@ -8,7 +8,7 @@
 */
 
 #pragma once
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <QObject>
 #include <QRect>
 #include <memory>
diff --git a/src/pluginmanager.h b/src/pluginmanager.h
index 99776911ec..11caa996cb 100644
--- a/src/pluginmanager.h
+++ b/src/pluginmanager.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QHash>
 #include <QObject>
diff --git a/src/plugins/backgroundcontrast/contrastshader.cpp b/src/plugins/backgroundcontrast/contrastshader.cpp
index 7458f90974..b728822acb 100644
--- a/src/plugins/backgroundcontrast/contrastshader.cpp
+++ b/src/plugins/backgroundcontrast/contrastshader.cpp
@@ -7,7 +7,7 @@
 
 #include "contrastshader.h"
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glplatform.h"
 
 #include <QByteArray>
diff --git a/src/plugins/blendchanges/blendchanges.h b/src/plugins/blendchanges/blendchanges.h
index 5ce48ff04b..918dbb8ae5 100644
--- a/src/plugins/blendchanges/blendchanges.h
+++ b/src/plugins/blendchanges/blendchanges.h
@@ -7,8 +7,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/effects.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "libkwineffects/timeline.h"
 #include <chrono>
 
diff --git a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp
index de65c33efb..b892c15570 100644
--- a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp
+++ b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp
@@ -8,7 +8,7 @@
 
 #include <KSharedConfig>
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glshader.h"
 
 #include "colorblindnesscorrection_settings.h"
diff --git a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h
index 46beb6f5a6..442caf1625 100644
--- a/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h
+++ b/src/plugins/colorblindnesscorrection/colorblindnesscorrection.h
@@ -8,7 +8,7 @@
 
 #include <unordered_set>
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "opengl/glshadermanager.h"
 
 namespace KWin
diff --git a/src/plugins/diminactive/diminactive.cpp b/src/plugins/diminactive/diminactive.cpp
index 2ca00cb2de..fd6990f0d9 100644
--- a/src/plugins/diminactive/diminactive.cpp
+++ b/src/plugins/diminactive/diminactive.cpp
@@ -11,7 +11,7 @@
 
 // own
 #include "diminactive.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 // KConfigSkeleton
 #include "diminactiveconfig.h"
diff --git a/src/plugins/fallapart/fallapart.h b/src/plugins/fallapart/fallapart.h
index 16a389a386..6206057b5b 100644
--- a/src/plugins/fallapart/fallapart.h
+++ b/src/plugins/fallapart/fallapart.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 
 namespace KWin
 {
diff --git a/src/plugins/glide/glide.h b/src/plugins/glide/glide.h
index b7c30b43e0..1f477fd3b2 100644
--- a/src/plugins/glide/glide.h
+++ b/src/plugins/glide/glide.h
@@ -13,7 +13,7 @@
 #pragma once
 
 // kwineffects
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin
diff --git a/src/plugins/highlightwindow/highlightwindow.h b/src/plugins/highlightwindow/highlightwindow.h
index 1d79e21b82..3715d81c54 100644
--- a/src/plugins/highlightwindow/highlightwindow.h
+++ b/src/plugins/highlightwindow/highlightwindow.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinanimationeffect.h"
+#include "libkwineffects/animationeffect.h"
 
 namespace KWin
 {
diff --git a/src/plugins/invert/invert.h b/src/plugins/invert/invert.h
index 4df220fea9..dade1b925a 100644
--- a/src/plugins/invert/invert.h
+++ b/src/plugins/invert/invert.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 
 namespace KWin
 {
diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
index 78d5f5e93a..8b031d8eff 100644
--- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
@@ -9,7 +9,7 @@
 
 #include "auroraeshared.h"
 #include "auroraetheme.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 // qml imports
 #include "decorationoptions.h"
 // KDecoration2
diff --git a/src/plugins/kscreen/kscreen.h b/src/plugins/kscreen/kscreen.h
index 4985c2b881..2f97d98149 100644
--- a/src/plugins/kscreen/kscreen.h
+++ b/src/plugins/kscreen/kscreen.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin
diff --git a/src/plugins/magiclamp/magiclamp.h b/src/plugins/magiclamp/magiclamp.h
index 5253ad3a3f..677f62ddfe 100644
--- a/src/plugins/magiclamp/magiclamp.h
+++ b/src/plugins/magiclamp/magiclamp.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin
diff --git a/src/plugins/magnifier/magnifier.h b/src/plugins/magnifier/magnifier.h
index b067b69698..c1d711a872 100644
--- a/src/plugins/magnifier/magnifier.h
+++ b/src/plugins/magnifier/magnifier.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 namespace KWin
 {
diff --git a/src/plugins/outputlocator/outputlocator.cpp b/src/plugins/outputlocator/outputlocator.cpp
index 7fa8e6878a..5fb9c4264d 100644
--- a/src/plugins/outputlocator/outputlocator.cpp
+++ b/src/plugins/outputlocator/outputlocator.cpp
@@ -6,8 +6,8 @@
 
 #include "outputlocator.h"
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/effects.h"
+#include "libkwineffects/offscreenquickview.h"
 
 #include <algorithm>
 
diff --git a/src/plugins/overview/overvieweffect.cpp b/src/plugins/overview/overvieweffect.cpp
index 507911380f..65e99ba1b6 100644
--- a/src/plugins/overview/overvieweffect.cpp
+++ b/src/plugins/overview/overvieweffect.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "overvieweffect.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "overviewconfig.h"
 
 #include <KGlobalAccel>
diff --git a/src/plugins/overview/overvieweffect.h b/src/plugins/overview/overvieweffect.h
index 3dbacd230b..1a95eae28a 100644
--- a/src/plugins/overview/overvieweffect.h
+++ b/src/plugins/overview/overvieweffect.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "libkwineffects/effecttogglablestate.h"
-#include "libkwineffects/kwinquickeffect.h"
+#include "libkwineffects/quickeffect.h"
 
 namespace KWin
 {
diff --git a/src/plugins/screenshot/screenshotdbusinterface2.cpp b/src/plugins/screenshot/screenshotdbusinterface2.cpp
index 0959ff2915..3ba8a186f8 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "screenshot2adaptor.h"
 #include "screenshotlogging.h"
 #include "utils/filedescriptor.h"
diff --git a/src/plugins/sheet/sheet.h b/src/plugins/sheet/sheet.h
index a59c682f29..57e93e8d3f 100644
--- a/src/plugins/sheet/sheet.h
+++ b/src/plugins/sheet/sheet.h
@@ -12,7 +12,7 @@
 #pragma once
 
 // kwineffects
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin
diff --git a/src/plugins/showfps/showfpseffect.h b/src/plugins/showfps/showfpseffect.h
index 8b70bb2b42..bb22f11703 100644
--- a/src/plugins/showfps/showfpseffect.h
+++ b/src/plugins/showfps/showfpseffect.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/effects.h"
+#include "libkwineffects/offscreenquickview.h"
 
 #include <QElapsedTimer>
 
diff --git a/src/plugins/slide/slide.h b/src/plugins/slide/slide.h
index 99626e0d1e..0380169d05 100644
--- a/src/plugins/slide/slide.h
+++ b/src/plugins/slide/slide.h
@@ -12,7 +12,7 @@
 #pragma once
 
 // kwineffects
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include "springmotion.h"
 
diff --git a/src/plugins/slideback/slideback.h b/src/plugins/slideback/slideback.h
index ff0aab4894..30b81bd99b 100644
--- a/src/plugins/slideback/slideback.h
+++ b/src/plugins/slideback/slideback.h
@@ -10,7 +10,7 @@
 #pragma once
 
 // Include with base class for effects.
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 namespace KWin
 {
diff --git a/src/plugins/slidingpopups/slidingpopups.h b/src/plugins/slidingpopups/slidingpopups.h
index 40a1e969d9..f569e85b71 100644
--- a/src/plugins/slidingpopups/slidingpopups.h
+++ b/src/plugins/slidingpopups/slidingpopups.h
@@ -11,7 +11,7 @@
 #pragma once
 
 // Include with base class for effects.
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin
diff --git a/src/plugins/thumbnailaside/thumbnailaside.cpp b/src/plugins/thumbnailaside/thumbnailaside.cpp
index de70d02240..e8792f5162 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 // KConfigSkeleton
 #include "thumbnailasideconfig.h"
 
diff --git a/src/plugins/tileseditor/tileseditoreffect.cpp b/src/plugins/tileseditor/tileseditoreffect.cpp
index 815bed0911..06753ef4a4 100644
--- a/src/plugins/tileseditor/tileseditoreffect.cpp
+++ b/src/plugins/tileseditor/tileseditoreffect.cpp
@@ -4,7 +4,7 @@
 */
 
 #include "tileseditoreffect.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include <QAction>
 #include <QQuickItem>
diff --git a/src/plugins/tileseditor/tileseditoreffect.h b/src/plugins/tileseditor/tileseditoreffect.h
index 9fdda0ff3a..19d771432a 100644
--- a/src/plugins/tileseditor/tileseditoreffect.h
+++ b/src/plugins/tileseditor/tileseditoreffect.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinquickeffect.h"
+#include "libkwineffects/quickeffect.h"
 
 #include <QAction>
 
diff --git a/src/plugins/windowsystem/windoweffects.cpp b/src/plugins/windowsystem/windoweffects.cpp
index 8be76c8177..774ea6de7e 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include <QGuiApplication>
 #include <QWidget>
diff --git a/src/plugins/windowview/windowviewconfig.kcfgc b/src/plugins/windowview/windowviewconfig.kcfgc
index 963cc550ea..0ed38d12e0 100644
--- a/src/plugins/windowview/windowviewconfig.kcfgc
+++ b/src/plugins/windowview/windowviewconfig.kcfgc
@@ -7,4 +7,4 @@ ClassName=WindowViewConfig
 NameSpace=KWin
 Singleton=true
 Mutators=true
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
diff --git a/src/plugins/windowview/windowvieweffect.cpp b/src/plugins/windowview/windowvieweffect.cpp
index ad92adcf9f..e233865de0 100644
--- a/src/plugins/windowview/windowvieweffect.cpp
+++ b/src/plugins/windowview/windowvieweffect.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "windowvieweffect.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "windowview1adaptor.h"
 #include "windowviewconfig.h"
 
diff --git a/src/plugins/windowview/windowvieweffect.h b/src/plugins/windowview/windowvieweffect.h
index 17545e9805..83eb69bb63 100644
--- a/src/plugins/windowview/windowvieweffect.h
+++ b/src/plugins/windowview/windowvieweffect.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinquickeffect.h"
+#include "libkwineffects/quickeffect.h"
 
 #include <QKeySequence>
 
diff --git a/src/plugins/wobblywindows/wobblywindows.h b/src/plugins/wobblywindows/wobblywindows.h
index 62ab954000..ec988097fb 100644
--- a/src/plugins/wobblywindows/wobblywindows.h
+++ b/src/plugins/wobblywindows/wobblywindows.h
@@ -10,7 +10,7 @@
 #pragma once
 
 // Include with base class for effects.
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 
 namespace KWin
 {
diff --git a/src/scene/dndiconitem.h b/src/scene/dndiconitem.h
index ff11c7a9a0..fffee05d3f 100644
--- a/src/scene/dndiconitem.h
+++ b/src/scene/dndiconitem.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "core/output.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "scene/item.h"
 
 namespace KWin
diff --git a/src/scene/item.h b/src/scene/item.h
index 75b7e34e76..64c7157466 100644
--- a/src/scene/item.h
+++ b/src/scene/item.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "core/colorspace.h"
-#include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/effects.h"
+#include "libkwineffects/globals.h"
 
 #include <QList>
 #include <QMatrix4x4>
diff --git a/src/scene/itemrenderer_opengl.h b/src/scene/itemrenderer_opengl.h
index 186764da98..8df5a5e36c 100644
--- a/src/scene/itemrenderer_opengl.h
+++ b/src/scene/itemrenderer_opengl.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glutils.h"
 #include "platformsupport/scenes/opengl/openglsurfacetexture.h"
 #include "scene/itemrenderer.h"
diff --git a/src/scene/workspacescene.cpp b/src/scene/workspacescene.cpp
index b9391d8ec4..0e1064773c 100644
--- a/src/scene/workspacescene.cpp
+++ b/src/scene/workspacescene.cpp
@@ -60,7 +60,7 @@
 #include "core/renderloop.h"
 #include "core/renderviewport.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "scene/dndiconitem.h"
 #include "scene/itemrenderer.h"
 #include "scene/shadowitem.h"
diff --git a/src/scene/workspacescene.h b/src/scene/workspacescene.h
index 686ae1e0d9..e8e2f35779 100644
--- a/src/scene/workspacescene.h
+++ b/src/scene/workspacescene.h
@@ -12,7 +12,7 @@
 #include "scene/scene.h"
 
 #include "core/colorspace.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "utils/common.h"
 #include "window.h"
 
diff --git a/src/screenedge.cpp b/src/screenedge.cpp
index e434d16cae..5416968341 100644
--- a/src/screenedge.cpp
+++ b/src/screenedge.cpp
@@ -23,7 +23,7 @@
 #include "core/output.h"
 #include "cursor.h"
 #include "gestures.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "main.h"
 #include "pointer_input.h"
 #include "utils/common.h"
diff --git a/src/screenedge.h b/src/screenedge.h
index 75a6db7b41..dfc623e479 100644
--- a/src/screenedge.h
+++ b/src/screenedge.h
@@ -18,7 +18,7 @@
 
 #pragma once
 // KWin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 // KDE includes
 #include <KSharedConfig>
 // Qt
diff --git a/src/screenlockerwatcher.h b/src/screenlockerwatcher.h
index 3b4a28d87c..15037321dd 100644
--- a/src/screenlockerwatcher.h
+++ b/src/screenlockerwatcher.h
@@ -10,7 +10,7 @@
 
 #include <QObject>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 class OrgFreedesktopScreenSaverInterface;
 class OrgKdeScreensaverInterface;
diff --git a/src/scripting/gesturehandler.cpp b/src/scripting/gesturehandler.cpp
index 07d55d2ee3..dbe5fbd1a8 100644
--- a/src/scripting/gesturehandler.cpp
+++ b/src/scripting/gesturehandler.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "gesturehandler.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include <QAction>
 
diff --git a/src/scripting/gesturehandler.h b/src/scripting/gesturehandler.h
index 076150745c..6ce98a078b 100644
--- a/src/scripting/gesturehandler.h
+++ b/src/scripting/gesturehandler.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QQmlParserStatus>
 
diff --git a/src/scripting/screenedgehandler.h b/src/scripting/screenedgehandler.h
index 0f4e7813ad..15ca46d4c1 100644
--- a/src/scripting/screenedgehandler.h
+++ b/src/scripting/screenedgehandler.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <QObject>
 
 class QAction;
diff --git a/src/scripting/scriptedeffect.h b/src/scripting/scriptedeffect.h
index 9a54215bd5..63ee37b686 100644
--- a/src/scripting/scriptedeffect.h
+++ b/src/scripting/scriptedeffect.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinanimationeffect.h"
+#include "libkwineffects/animationeffect.h"
 
 #include <QJSEngine>
 #include <QJSValue>
diff --git a/src/scripting/scriptedquicksceneeffect.h b/src/scripting/scriptedquicksceneeffect.h
index 83b398e90a..2aa1915b73 100644
--- a/src/scripting/scriptedquicksceneeffect.h
+++ b/src/scripting/scriptedquicksceneeffect.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinquickeffect.h"
+#include "libkwineffects/quickeffect.h"
 
 #include <KConfigPropertyMap>
 
diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp
index 5cdbb3d257..8c4214520b 100644
--- a/src/scripting/scripting.cpp
+++ b/src/scripting/scripting.cpp
@@ -14,7 +14,7 @@
 #include "dbuscall.h"
 #include "desktopbackgrounditem.h"
 #include "gesturehandler.h"
-#include "libkwineffects/kwinquickeffect.h"
+#include "libkwineffects/quickeffect.h"
 #include "screenedgehandler.h"
 #include "scriptedquicksceneeffect.h"
 #include "scripting_logging.h"
diff --git a/src/scripting/scripting.h b/src/scripting/scripting.h
index 9587874b35..a7fbeabb6d 100644
--- a/src/scripting/scripting.h
+++ b/src/scripting/scripting.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QHash>
 #include <QJSEngine>
diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp
index 530a15eeb3..94c29dd426 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "outline.h"
 #include "tiles/tilemanager.h"
 #include "virtualdesktops.h"
diff --git a/src/scripting/workspace_wrapper.h b/src/scripting/workspace_wrapper.h
index 87d447828c..8291364a0b 100644
--- a/src/scripting/workspace_wrapper.h
+++ b/src/scripting/workspace_wrapper.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <QObject>
 #include <QQmlListProperty>
 #include <QRect>
diff --git a/src/sm.h b/src/sm.h
index 0074fa2fca..45b6c4adc5 100644
--- a/src/sm.h
+++ b/src/sm.h
@@ -16,7 +16,7 @@
 
 #include <KConfigGroup>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <netwm_def.h>
 
 namespace KWin
diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp
index f476349448..ced43f1f84 100644
--- a/src/tabbox/tabbox.cpp
+++ b/src/tabbox/tabbox.cpp
@@ -25,7 +25,7 @@
 #include "focuschain.h"
 #include "input.h"
 #include "keyboard_input.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "pointer_input.h"
 #include "screenedge.h"
 #include "utils/xcbutils.h"
diff --git a/src/tabbox/x11_filter.cpp b/src/tabbox/x11_filter.cpp
index a7e781e364..71a1b67747 100644
--- a/src/tabbox/x11_filter.cpp
+++ b/src/tabbox/x11_filter.cpp
@@ -8,7 +8,7 @@
 */
 #include "x11_filter.h"
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "screenedge.h"
 #include "tabbox/tabbox.h"
 #include "utils/xcbutils.h"
diff --git a/src/tabletmodemanager.h b/src/tabletmodemanager.h
index aa27598b58..f9b94a610b 100644
--- a/src/tabletmodemanager.h
+++ b/src/tabletmodemanager.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <KConfigWatcher>
 #include <QObject>
 #include <config-kwin.h>
diff --git a/src/tiles/tile.h b/src/tiles/tile.h
index b2f69da120..2191d661ae 100644
--- a/src/tiles/tile.h
+++ b/src/tiles/tile.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <kwin_export.h>
 #include <utils/common.h>
 
diff --git a/src/useractions.h b/src/useractions.h
index ff5fae4ce4..c858680b4e 100644
--- a/src/useractions.h
+++ b/src/useractions.h
@@ -9,7 +9,7 @@
 #pragma once
 #include "ui_shortcutdialog.h"
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 // Qt
 #include <QDialog>
diff --git a/src/utils/common.cpp b/src/utils/common.cpp
index 82db671cd7..adbabeada6 100644
--- a/src/utils/common.cpp
+++ b/src/utils/common.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "utils/common.h"
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/xcb.h"
 #include "utils/c_ptr.h"
 
 #include <QPainter>
diff --git a/src/utils/common.h b/src/utils/common.h
index 7ba08bba5f..0234bd7a49 100644
--- a/src/utils/common.h
+++ b/src/utils/common.h
@@ -13,7 +13,7 @@
 // cmake stuff
 #include "config-kwin.h"
 // kwin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "utils/version.h"
 // Qt
 #include <QList>
diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h
index 9d2c5b118e..4107d3da14 100644
--- a/src/utils/serviceutils.h
+++ b/src/utils/serviceutils.h
@@ -12,7 +12,7 @@
 // cmake stuff
 #include <config-kwin.h>
 // kwin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 // Qt
 #include <QFileInfo>
 #include <QLoggingCategory>
diff --git a/src/utils/vsyncmonitor.h b/src/utils/vsyncmonitor.h
index 556150b290..9079df73c4 100644
--- a/src/utils/vsyncmonitor.h
+++ b/src/utils/vsyncmonitor.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 
diff --git a/src/utils/xcbutils.h b/src/utils/xcbutils.h
index 7c43b4e664..52702f418e 100644
--- a/src/utils/xcbutils.h
+++ b/src/utils/xcbutils.h
@@ -8,8 +8,8 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/globals.h"
+#include "libkwineffects/xcb.h"
 #include "main.h"
 #include "utils/c_ptr.h"
 #include "utils/version.h"
diff --git a/src/virtualdesktops.h b/src/virtualdesktops.h
index 6ee3ecb98e..30bf1b4f24 100644
--- a/src/virtualdesktops.h
+++ b/src/virtualdesktops.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 // KWin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <kwin_export.h>
 // Qt includes
 #include <QAction>
diff --git a/src/wayland/presentationtime.h b/src/wayland/presentationtime.h
index d53116b152..3522380256 100644
--- a/src/wayland/presentationtime.h
+++ b/src/wayland/presentationtime.h
@@ -9,7 +9,7 @@
 #include <chrono>
 
 #include "core/renderbackend.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "qwayland-server-presentation-time.h"
 
 namespace KWin
diff --git a/src/wayland/screenedge_v1.h b/src/wayland/screenedge_v1.h
index 6e2f1a57ce..56d636c03d 100644
--- a/src/wayland/screenedge_v1.h
+++ b/src/wayland/screenedge_v1.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 #include <memory>
diff --git a/src/wayland_server.h b/src/wayland_server.h
index bea1e6bc34..b7744379fa 100644
--- a/src/wayland_server.h
+++ b/src/wayland_server.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 #include <QPointer>
diff --git a/src/window_property_notify_x11_filter.cpp b/src/window_property_notify_x11_filter.cpp
index e0b0a5f207..a8be509eef 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 "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "workspace.h"
 #include "x11window.h"
 
diff --git a/src/workspace.cpp b/src/workspace.cpp
index 35b9ac21d2..0775f87c6d 100644
--- a/src/workspace.cpp
+++ b/src/workspace.cpp
@@ -29,7 +29,7 @@
 #include "input.h"
 #include "internalwindow.h"
 #include "killwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "moving_client_x11_filter.h"
 #include "netinfo.h"
 #include "outline.h"
diff --git a/src/x11window.cpp b/src/x11window.cpp
index 62780a42ba..2c1cc3e5d5 100644
--- a/src/x11window.cpp
+++ b/src/x11window.cpp
@@ -22,7 +22,7 @@
 #include "decorations/decorationbridge.h"
 #include "focuschain.h"
 #include "group.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "netinfo.h"
 #include "placement.h"
 #include "scene/surfaceitem_x11.h"
diff --git a/src/xdgactivationv1.cpp b/src/xdgactivationv1.cpp
index 77a0c75c48..f0619c415b 100644
--- a/src/xdgactivationv1.cpp
+++ b/src/xdgactivationv1.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "xdgactivationv1.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "utils/common.h"
 #include "wayland/display.h"
 #include "wayland/plasmawindowmanagement.h"
diff --git a/src/xwayland/databridge.h b/src/xwayland/databridge.h
index f5ef97205b..9a2dd0d586 100644
--- a/src/xwayland/databridge.h
+++ b/src/xwayland/databridge.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QAbstractNativeEventFilter>
 #include <QObject>
diff --git a/src/xwayland/xwayland_interface.h b/src/xwayland/xwayland_interface.h
index 043b49da03..d3869a7071 100644
--- a/src/xwayland/xwayland_interface.h
+++ b/src/xwayland/xwayland_interface.h
@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>