diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 410258d465..0ef6bcf926 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 ########################################################
 set(testWindowPaintData_SRCS test_window_paint_data.cpp)
 add_executable(testWindowPaintData ${testWindowPaintData_SRCS})
-target_link_libraries(testWindowPaintData kwineffects Qt::Widgets Qt::Test )
+target_link_libraries(testWindowPaintData kwin Qt::Widgets Qt::Test )
 add_test(NAME kwin-testWindowPaintData COMMAND testWindowPaintData)
 ecm_mark_as_test(testWindowPaintData)
 
@@ -205,8 +205,6 @@ target_link_libraries(testXkb
     KF6::ConfigCore
     KF6::WindowSystem
 
-    kwineffects
-
     XKB::XKB
 )
 add_test(NAME kwin-testXkb COMMAND testXkb)
diff --git a/autotests/libkwineffects/CMakeLists.txt b/autotests/libkwineffects/CMakeLists.txt
index 6c7868e3f8..c8161f4c30 100644
--- a/autotests/libkwineffects/CMakeLists.txt
+++ b/autotests/libkwineffects/CMakeLists.txt
@@ -4,7 +4,7 @@ macro(KWINEFFECTS_UNIT_TESTS)
    foreach(_testname ${ARGN})
       add_executable(${_testname} ${_testname}.cpp)
       add_test(NAME kwineffects-${_testname} COMMAND ${_testname})
-      target_link_libraries(${_testname} Qt::Test kwineffects)
+      target_link_libraries(${_testname} Qt::Test kwin)
       ecm_mark_as_test(${_testname})
    endforeach()
 endmacro()
diff --git a/autotests/opengl_context_attribute_builder_test.cpp b/autotests/opengl_context_attribute_builder_test.cpp
index 4f43ebd6f8..c2a3cd6d17 100644
--- a/autotests/opengl_context_attribute_builder_test.cpp
+++ b/autotests/opengl_context_attribute_builder_test.cpp
@@ -11,7 +11,7 @@
 #include <QTest>
 #include <epoxy/egl.h>
 
-#include "libkwineffects/kwinconfig.h"
+#include "config-kwin.h"
 #if HAVE_GLX
 #include "../src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h"
 #include <epoxy/glx.h>
diff --git a/autotests/wayland/client/test_wayland_output.cpp b/autotests/wayland/client/test_wayland_output.cpp
index b0cfc91bea..06117f15a5 100644
--- a/autotests/wayland/client/test_wayland_output.cpp
+++ b/autotests/wayland/client/test_wayland_output.cpp
@@ -15,7 +15,7 @@
 #include "KWayland/Client/output.h"
 #include "KWayland/Client/registry.h"
 
-#include "../../tests/fakeoutput.h"
+#include "../../../tests/fakeoutput.h"
 
 // Wayland
 #include <wayland-client-protocol.h>
diff --git a/autotests/wayland/client/test_wayland_surface.cpp b/autotests/wayland/client/test_wayland_surface.cpp
index e5aa1ac24d..911047b7cf 100644
--- a/autotests/wayland/client/test_wayland_surface.cpp
+++ b/autotests/wayland/client/test_wayland_surface.cpp
@@ -27,7 +27,7 @@
 #include "KWayland/Client/shm_pool.h"
 #include "KWayland/Client/surface.h"
 
-#include "../../tests/fakeoutput.h"
+#include "../../../tests/fakeoutput.h"
 
 // Wayland
 #include <wayland-client-protocol.h>
diff --git a/autotests/wayland/client/test_xdg_output.cpp b/autotests/wayland/client/test_xdg_output.cpp
index 33d54d7aaf..4c3b9b7c12 100644
--- a/autotests/wayland/client/test_xdg_output.cpp
+++ b/autotests/wayland/client/test_xdg_output.cpp
@@ -17,7 +17,7 @@
 #include "KWayland/Client/registry.h"
 #include "KWayland/Client/xdgoutput.h"
 
-#include "../../tests/fakeoutput.h"
+#include "../../../tests/fakeoutput.h"
 
 class TestXdgOutput : public QObject
 {
diff --git a/autotests/wayland/client/test_xdg_shell.cpp b/autotests/wayland/client/test_xdg_shell.cpp
index 257379d664..76b304660a 100644
--- a/autotests/wayland/client/test_xdg_shell.cpp
+++ b/autotests/wayland/client/test_xdg_shell.cpp
@@ -26,7 +26,7 @@
 #include "wayland/surface.h"
 #include "wayland/xdgshell.h"
 
-#include "../../tests/fakeoutput.h"
+#include "../../../tests/fakeoutput.h"
 
 using namespace KWin;
 
diff --git a/autotests/wayland/server/test_inputmethod_interface.cpp b/autotests/wayland/server/test_inputmethod_interface.cpp
index efccfad4e1..8a917b0786 100644
--- a/autotests/wayland/server/test_inputmethod_interface.cpp
+++ b/autotests/wayland/server/test_inputmethod_interface.cpp
@@ -10,7 +10,7 @@
 #include <QTest>
 #include <QThread>
 
-#include "../../tests/fakeoutput.h"
+#include "../../../tests/fakeoutput.h"
 
 // WaylandServer
 #include "wayland/compositor.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 25fd953ee8..52e9eb1c87 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,8 +4,6 @@ ecm_setup_version(${PROJECT_VERSION}
                   SOVERSION ${PROJECT_VERSION_MAJOR}
 )
 
-# for things that are also used by kwin libraries
-configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h)
 configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h)
 
 set(kwin_effects_dbus_xml ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.kwin.Effects.xml)
@@ -18,7 +16,6 @@ target_link_libraries(KWinEffectsInterface Qt::DBus)
 add_subdirectory(helpers)
 add_subdirectory(qml)
 
-add_subdirectory(libkwineffects)
 if (KWIN_BUILD_KCMS)
     add_subdirectory(kcms)
 endif()
@@ -106,6 +103,30 @@ target_sources(kwin PRIVATE
     layers.cpp
     layershellv1integration.cpp
     layershellv1window.cpp
+    libkwineffects/anidata.cpp
+    libkwineffects/colorspace.cpp
+    libkwineffects/effecttogglablestate.cpp
+    libkwineffects/glframebuffer.cpp
+    libkwineffects/glplatform.cpp
+    libkwineffects/glshader.cpp
+    libkwineffects/glshadermanager.cpp
+    libkwineffects/gltexture.cpp
+    libkwineffects/glutils.cpp
+    libkwineffects/glutils_funcs.cpp
+    libkwineffects/glvertexbuffer.cpp
+    libkwineffects/kwinanimationeffect.cpp
+    libkwineffects/kwineffects.cpp
+    libkwineffects/kwinoffscreeneffect.cpp
+    libkwineffects/kwinoffscreenquickview.cpp
+    libkwineffects/kwinquickeffect.cpp
+    libkwineffects/logging.cpp
+    libkwineffects/logging.cpp
+    libkwineffects/openglcontext.cpp
+    libkwineffects/rendertarget.cpp
+    libkwineffects/rendertarget.cpp
+    libkwineffects/renderviewport.cpp
+    libkwineffects/renderviewport.cpp
+    libkwineffects/version.cpp
     lidswitchtracker.cpp
     main.cpp
     modifier_only_shortcuts.cpp
@@ -199,29 +220,27 @@ target_sources(kwin PRIVATE
 target_link_libraries(kwin
     PUBLIC
 
-    kwineffects
-    kwinglutils
-
     Qt::DBus
     Qt::Quick
     Qt::Widgets
     Wayland::Server
+    KF6::ConfigCore
+    KF6::CoreAddons
+    KF6::WindowSystem
+    epoxy::epoxy
 
     PRIVATE
 
     Qt::Concurrent
     Qt::Sensors
 
-    KF6::ConfigCore
     KF6::ConfigQml
     KF6::ConfigWidgets
-    KF6::CoreAddons
     KF6::Crash
     KF6::GlobalAccel
     KF6::I18n
     KF6::Package
     KF6::Service
-    KF6::WindowSystem
 
     KDecoration2::KDecoration
     KDecoration2::KDecoration2Private
@@ -392,8 +411,14 @@ install(
     DESTINATION
         ${KDE_INSTALL_DBUSINTERFACEDIR}
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin COMPONENT Devel)
+
 install(EXPORT KWinTargets DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/KWin" FILE KWinTargets.cmake NAMESPACE KWin:: )
+
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h
+    ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin COMPONENT Devel)
+
 install(FILES
     core/output.h
     core/renderloop.h
@@ -403,6 +428,25 @@ install(FILES
     utils/edid.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/utils COMPONENT Devel)
 
+install(FILES
+    libkwineffects/colorspace.h
+    libkwineffects/glframebuffer.h
+    libkwineffects/glplatform.h
+    libkwineffects/glshader.h
+    libkwineffects/glshadermanager.h
+    libkwineffects/gltexture.h
+    libkwineffects/glutils.h
+    libkwineffects/glutils_funcs.h
+    libkwineffects/glvertexbuffer.h
+    libkwineffects/kwinanimationeffect.h
+    libkwineffects/kwineffects.h
+    libkwineffects/kwinglobals.h
+    libkwineffects/kwinoffscreeneffect.h
+    libkwineffects/kwinoffscreenquickview.h
+    libkwineffects/kwinquickeffect.h
+    libkwineffects/rendertarget.h
+    libkwineffects/renderviewport.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/libkwineffects COMPONENT Devel)
 
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KWin")
 
diff --git a/src/KWinConfig.cmake.in b/src/KWinConfig.cmake.in
index a1d215e63e..5aaf5785fd 100644
--- a/src/KWinConfig.cmake.in
+++ b/src/KWinConfig.cmake.in
@@ -4,7 +4,9 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt6Core "@QT_MIN_VERSION@")
 find_dependency(Qt6Gui "@QT_MIN_VERSION@")
 find_dependency(Qt6Quick "@QT_MIN_VERSION@")
-find_dependency(KWinEffects)
+find_dependency(KF6Config "@KF6_MIN_VERSION@")
+find_dependency(KF6CoreAddons "@KF6_MIN_VERSION@")
+find_dependency(KF6WindowSystem "@KF6_MIN_VERSION@")
 
 @PACKAGE_SETUP_KWIN_AUTOMOC_VARIABLES@
 include("${CMAKE_CURRENT_LIST_DIR}/KWinTargets.cmake")
diff --git a/src/backends/drm/drm_commit_thread.cpp b/src/backends/drm/drm_commit_thread.cpp
index 98897ef4f4..d6679ee913 100644
--- a/src/backends/drm/drm_commit_thread.cpp
+++ b/src/backends/drm/drm_commit_thread.cpp
@@ -9,7 +9,7 @@
 #include "drm_commit_thread.h"
 #include "drm_commit.h"
 #include "drm_gpu.h"
-#include "logging_p.h"
+#include "drm_logging.h"
 #include "utils/realtime.h"
 
 using namespace std::chrono_literals;
diff --git a/src/backends/x11/standalone/x11_standalone_backend.cpp b/src/backends/x11/standalone/x11_standalone_backend.cpp
index 876a0090a2..c4551af632 100644
--- a/src/backends/x11/standalone/x11_standalone_backend.cpp
+++ b/src/backends/x11/standalone/x11_standalone_backend.cpp
@@ -8,9 +8,10 @@
 */
 #include "x11_standalone_backend.h"
 
+#include "config-kwin.h"
+
 #include "atoms.h"
 #include "core/session.h"
-#include "libkwineffects/kwinconfig.h"
 #include "x11_standalone_cursor.h"
 #include "x11_standalone_edge.h"
 #include "x11_standalone_placeholderoutput.h"
diff --git a/src/config-kwin.h.cmake b/src/config-kwin.h.cmake
index 3d02469acd..ec3f610353 100644
--- a/src/config-kwin.h.cmake
+++ b/src/config-kwin.h.cmake
@@ -23,3 +23,5 @@
 #define BREEZE_KDECORATION_PLUGIN_ID "${BREEZE_KDECORATION_PLUGIN_ID}"
 #endif
 #cmakedefine01 HAVE_XWAYLAND_LISTENFD
+#cmakedefine01 HAVE_GLX
+#cmakedefine01 HAVE_DL_LIBRARY
diff --git a/src/libkwineffects/CMakeLists.txt b/src/libkwineffects/CMakeLists.txt
deleted file mode 100644
index f13aeee9eb..0000000000
--- a/src/libkwineffects/CMakeLists.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-ecm_setup_version(${PROJECT_VERSION}
-                  VARIABLE_PREFIX KWINEFFECTS
-                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h"
-                  PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake"
-                  SOVERSION 14
-)
-
-###  effects lib  ###
-set(kwin_EFFECTSLIB_SRCS
-    anidata.cpp
-    kwinanimationeffect.cpp
-    kwineffects.cpp
-    kwinoffscreeneffect.cpp
-    kwinoffscreenquickview.cpp
-    kwinquickeffect.cpp
-    logging.cpp
-    rendertarget.cpp
-    renderviewport.cpp
-    effecttogglablestate.cpp
-)
-
-add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
-generate_export_header(kwineffects EXPORT_FILE_NAME kwineffects_export.h)
-target_link_libraries(kwineffects
-    PUBLIC
-        KF6::ConfigCore
-        KF6::CoreAddons
-        KF6::WindowSystem
-    PRIVATE
-        XCB::XCB
-        Qt::GuiPrivate
-        Qt::Quick
-        KF6::I18n
-        kwinglutils
-)
-target_include_directories(kwineffects INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/kwin>")
-set_target_properties(kwineffects PROPERTIES
-    VERSION ${KWINEFFECTS_VERSION}
-    SOVERSION ${KWINEFFECTS_SOVERSION}
-)
-
-install(TARGETS kwineffects EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-# kwingl(es)utils library
-set(kwin_GLUTILSLIB_SRCS
-    colorspace.cpp
-    glframebuffer.cpp
-    glplatform.cpp
-    glshader.cpp
-    glshadermanager.cpp
-    gltexture.cpp
-    glutils.cpp
-    glutils_funcs.cpp
-    glvertexbuffer.cpp
-    logging.cpp
-    openglcontext.cpp
-    rendertarget.cpp
-    renderviewport.cpp
-    version.cpp
-)
-
-add_library(kwinglutils SHARED ${kwin_GLUTILSLIB_SRCS})
-generate_export_header(kwinglutils BASE_NAME kwinglutils EXPORT_FILE_NAME kwinglutils_export.h)
-target_link_libraries(kwinglutils PUBLIC KF6::CoreAddons KF6::ConfigCore KF6::WindowSystem epoxy::epoxy PRIVATE XCB::XCB)
-target_include_directories(kwinglutils INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/kwin>")
-set_target_properties(kwinglutils PROPERTIES
-    VERSION ${KWINEFFECTS_VERSION}
-    SOVERSION ${KWINEFFECTS_SOVERSION}
-)
-
-install(TARGETS kwinglutils EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kwinconfig.h
-    ${CMAKE_CURRENT_BINARY_DIR}/kwineffects_export.h
-    ${CMAKE_CURRENT_BINARY_DIR}/kwinglutils_export.h
-    colorspace.h
-    glframebuffer.h
-    glplatform.h
-    glshader.h
-    glshadermanager.h
-    gltexture.h
-    glutils.h
-    glutils_funcs.h
-    glvertexbuffer.h
-    kwinanimationeffect.h
-    kwineffects.h
-    kwinglobals.h
-    kwinoffscreeneffect.h
-    kwinoffscreenquickview.h
-    kwinquickeffect.h
-    rendertarget.h
-    renderviewport.h
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/libkwineffects COMPONENT Devel)
-
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KWinEffects")
-
-
-install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfig.cmake"
-               "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake"
-        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-        COMPONENT Devel )
-
-configure_package_config_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/KWinEffectsConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfig.cmake"
-  INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
-)
-
-install(EXPORT KWinEffectsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KWinEffectsTargets.cmake NAMESPACE KWinEffects:: )
diff --git a/src/libkwineffects/KWinEffectsConfig.cmake.in b/src/libkwineffects/KWinEffectsConfig.cmake.in
deleted file mode 100644
index 54d3d5bc60..0000000000
--- a/src/libkwineffects/KWinEffectsConfig.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-find_dependency(Qt6Core "@QT_MIN_VERSION@")
-find_dependency(Qt6Gui "@QT_MIN_VERSION@")
-find_dependency(KF6Config "@KF6_MIN_VERSION@")
-find_dependency(KF6CoreAddons "@KF6_MIN_VERSION@")
-find_dependency(KF6WindowSystem "@KF6_MIN_VERSION@")
-
-@PACKAGE_SETUP_KWINEFFECTS_AUTOMOC_VARIABLES@
-include("${CMAKE_CURRENT_LIST_DIR}/KWinEffectsTargets.cmake")
diff --git a/src/libkwineffects/Mainpage.dox b/src/libkwineffects/Mainpage.dox
deleted file mode 100644
index 696ecb3428..0000000000
--- a/src/libkwineffects/Mainpage.dox
+++ /dev/null
@@ -1,22 +0,0 @@
-/** @mainpage KWin Effects Library
-
-<p>
-@ref kwineffects is a library for implementing window transition effect
-plugins for KWin.
-
-@authors
-Lubos Lunak \<l.lunak@kde.org\><br>
-Rivo Laks \<rivolaks@hot.ee\><br>
-Lucas Murray \<lmurray@undefinedfire.com\><br>
-Fredrik Höglund \<fredrik@kde.org\><br>
-Martin Gräßlin \<mgraesslin@kde.org\>
-
-@maintainers
-Martin Gräßlin \<mgraesslin@kde.org\>
-
-@licences
-libkwineffects: @gpl
-
-*/
-
-// DOXYGEN_SET_PROJECT_NAME = KWin Effects Library
diff --git a/src/libkwineffects/anidata_p.h b/src/libkwineffects/anidata_p.h
index 3882416baf..0a32285038 100644
--- a/src/libkwineffects/anidata_p.h
+++ b/src/libkwineffects/anidata_p.h
@@ -30,7 +30,7 @@ private:
     Q_DISABLE_COPY(FullScreenEffectLock)
 };
 
-class KWINEFFECTS_EXPORT AniData
+class KWIN_EXPORT AniData
 {
 public:
     AniData();
diff --git a/src/libkwineffects/colorspace.h b/src/libkwineffects/colorspace.h
index 150417adf9..92d0f60318 100644
--- a/src/libkwineffects/colorspace.h
+++ b/src/libkwineffects/colorspace.h
@@ -9,7 +9,7 @@
 #include <QMatrix3x3>
 #include <QVector2D>
 
-#include "libkwineffects/kwineffects_export.h"
+#include "kwin_export.h"
 
 namespace KWin
 {
@@ -24,7 +24,7 @@ enum class NamedColorimetry {
  * Red, green and blue define the chromaticities ("absolute colors") of the red, green and blue LEDs on a display in xy coordinates
  * White defines the the chromaticity of the reference white in xy coordinates
  */
-class KWINEFFECTS_EXPORT Colorimetry
+class KWIN_EXPORT Colorimetry
 {
 public:
     static constexpr Colorimetry createFromName(NamedColorimetry name);
@@ -53,7 +53,7 @@ enum class NamedTransferFunction {
  * Describes the meaning of encoded color values, with additional metadata for how to convert between different encodings
  * Note that not all properties of this description are relevant in all contexts
  */
-class KWINEFFECTS_EXPORT ColorDescription
+class KWIN_EXPORT ColorDescription
 {
 public:
     /**
diff --git a/src/libkwineffects/effecttogglablestate.h b/src/libkwineffects/effecttogglablestate.h
index 225eabf1d6..c1ccd6dd7e 100644
--- a/src/libkwineffects/effecttogglablestate.h
+++ b/src/libkwineffects/effecttogglablestate.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects_export.h"
+#include "libkwineffects/kwinglobals.h"
+
 #include <QAction>
 #include <QObject>
-#include <kwinglobals.h>
 
 namespace KWin
 {
@@ -21,7 +21,7 @@ class Effect;
  * This class helps us simplify this process, especially in the cases where we want activation to happen
  * progressively, like through a touch our touchpad events.
  */
-class KWINEFFECTS_EXPORT EffectTogglableState : public QObject
+class KWIN_EXPORT EffectTogglableState : public QObject
 {
     Q_OBJECT
 public:
@@ -99,7 +99,7 @@ private:
     friend class EffectTogglableTouchBorder;
 };
 
-class KWINEFFECTS_EXPORT EffectTogglableGesture : public QObject
+class KWIN_EXPORT EffectTogglableGesture : public QObject
 {
 public:
     /**
@@ -119,7 +119,7 @@ private:
     EffectTogglableState *const m_state;
 };
 
-class KWINEFFECTS_EXPORT EffectTogglableTouchBorder : public QObject
+class KWIN_EXPORT EffectTogglableTouchBorder : public QObject
 {
 public:
     /**
diff --git a/src/libkwineffects/glframebuffer.h b/src/libkwineffects/glframebuffer.h
index 41a376f291..98d1d4fb7b 100644
--- a/src/libkwineffects/glframebuffer.h
+++ b/src/libkwineffects/glframebuffer.h
@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwinglutils_export.h"
+#include "kwin_export.h"
 
 #include <QRect>
 #include <QStack>
@@ -23,7 +23,7 @@ class RenderTarget;
 class RenderViewport;
 
 // Cleans up all resources hold by the GL Context
-void KWINGLUTILS_EXPORT cleanupGL();
+void KWIN_EXPORT cleanupGL();
 
 /**
  * @short OpenGL framebuffer object
@@ -33,7 +33,7 @@ void KWINGLUTILS_EXPORT cleanupGL();
  *
  * @author Rivo Laks <rivolaks@hot.ee>
  */
-class KWINGLUTILS_EXPORT GLFramebuffer
+class KWIN_EXPORT GLFramebuffer
 {
 public:
     enum Attachment {
diff --git a/src/libkwineffects/glplatform.h b/src/libkwineffects/glplatform.h
index 9c4c97f8b6..41ec8faba1 100644
--- a/src/libkwineffects/glplatform.h
+++ b/src/libkwineffects/glplatform.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "libkwineffects/kwinglobals.h"
-#include "libkwineffects/kwinglutils_export.h"
 #include "openglcontext.h"
 
 #include <QByteArray>
@@ -155,7 +154,7 @@ enum ChipClass {
 };
 // clang-format on
 
-class KWINGLUTILS_EXPORT GLPlatform
+class KWIN_EXPORT GLPlatform
 {
 public:
     ~GLPlatform();
diff --git a/src/libkwineffects/glshader.h b/src/libkwineffects/glshader.h
index 9db95ca888..abe7a7c36f 100644
--- a/src/libkwineffects/glshader.h
+++ b/src/libkwineffects/glshader.h
@@ -10,7 +10,6 @@
 */
 #pragma once
 #include "colorspace.h"
-#include "libkwineffects/kwinglutils_export.h"
 
 #include <QColor>
 #include <QMatrix3x3>
@@ -23,7 +22,7 @@
 namespace KWin
 {
 
-class KWINGLUTILS_EXPORT GLShader
+class KWIN_EXPORT GLShader
 {
 public:
     enum Flags {
diff --git a/src/libkwineffects/glshadermanager.h b/src/libkwineffects/glshadermanager.h
index a1532a7e88..5d629788b3 100644
--- a/src/libkwineffects/glshadermanager.h
+++ b/src/libkwineffects/glshadermanager.h
@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwinglutils_export.h"
+#include "kwin_export.h"
 
 #include <QByteArray>
 #include <QFlags>
@@ -44,7 +44,7 @@ Q_DECLARE_FLAGS(ShaderTraits, ShaderTrait)
  * @author Martin Gräßlin <mgraesslin@kde.org>
  * @since 4.7
  */
-class KWINGLUTILS_EXPORT ShaderManager
+class KWIN_EXPORT ShaderManager
 {
 public:
     explicit ShaderManager();
@@ -177,7 +177,7 @@ private:
  *
  * @since 4.10
  */
-class KWINGLUTILS_EXPORT ShaderBinder
+class KWIN_EXPORT ShaderBinder
 {
 public:
     /**
diff --git a/src/libkwineffects/gltexture.cpp b/src/libkwineffects/gltexture.cpp
index c3fd4686c1..92992bc132 100644
--- a/src/libkwineffects/gltexture.cpp
+++ b/src/libkwineffects/gltexture.cpp
@@ -13,7 +13,6 @@
 #include "libkwineffects/glplatform.h"
 #include "libkwineffects/glutils.h"
 #include "libkwineffects/glutils_funcs.h"
-#include "libkwineffects/kwinconfig.h" // KWIN_HAVE_OPENGL
 #include "libkwineffects/kwineffects.h"
 #include "logging_p.h"
 
diff --git a/src/libkwineffects/gltexture.h b/src/libkwineffects/gltexture.h
index 319aae9aaa..dd5b8a8c66 100644
--- a/src/libkwineffects/gltexture.h
+++ b/src/libkwineffects/gltexture.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglutils_export.h"
+#include "kwin_export.h"
 
 #include <QExplicitlySharedDataPointer>
 #include <QMatrix4x4>
@@ -45,7 +45,7 @@ enum TextureCoordinateType {
     UnnormalizedCoordinates,
 };
 
-class KWINGLUTILS_EXPORT GLTexture
+class KWIN_EXPORT GLTexture
 {
 public:
     explicit GLTexture(GLenum target);
diff --git a/src/libkwineffects/gltexture_p.h b/src/libkwineffects/gltexture_p.h
index 9c89bb1a38..d268f3355d 100644
--- a/src/libkwineffects/gltexture_p.h
+++ b/src/libkwineffects/gltexture_p.h
@@ -12,8 +12,6 @@
 #pragma once
 
 #include "libkwineffects/glutils.h"
-#include "libkwineffects/kwinconfig.h" // KWIN_HAVE_OPENGL
-#include "libkwineffects/kwinglutils_export.h"
 
 #include <QImage>
 #include <QMatrix4x4>
@@ -26,7 +24,7 @@ namespace KWin
 // forward declarations
 class GLVertexBuffer;
 
-class KWINGLUTILS_EXPORT GLTexturePrivate
+class KWIN_EXPORT GLTexturePrivate
     : public QSharedData
 {
 public:
diff --git a/src/libkwineffects/glutils.h b/src/libkwineffects/glutils.h
index ae00e968d4..3f15304c6f 100644
--- a/src/libkwineffects/glutils.h
+++ b/src/libkwineffects/glutils.h
@@ -17,7 +17,6 @@
 #include "libkwineffects/gltexture.h"
 #include "libkwineffects/glutils_funcs.h"
 #include "libkwineffects/glvertexbuffer.h"
-#include "libkwineffects/kwinglutils_export.h"
 
 #include <QByteArray>
 #include <QList>
@@ -30,18 +29,18 @@ namespace KWin
 //  well as checking for GL version and extensions
 //  Note that GL context has to be created by the time this function is called
 typedef void (*resolveFuncPtr)();
-void KWINGLUTILS_EXPORT initGL(const std::function<resolveFuncPtr(const char *)> &resolveFunction);
+void KWIN_EXPORT initGL(const std::function<resolveFuncPtr(const char *)> &resolveFunction);
 // Cleans up all resources hold by the GL Context
-void KWINGLUTILS_EXPORT cleanupGL();
+void KWIN_EXPORT cleanupGL();
 
-bool KWINGLUTILS_EXPORT hasGLVersion(int major, int minor, int release = 0);
+bool KWIN_EXPORT hasGLVersion(int major, int minor, int release = 0);
 // use for both OpenGL and GLX extensions
-bool KWINGLUTILS_EXPORT hasGLExtension(const QByteArray &extension);
+bool KWIN_EXPORT hasGLExtension(const QByteArray &extension);
 
 // detect OpenGL error (add to various places in code to pinpoint the place)
-bool KWINGLUTILS_EXPORT checkGLError(const char *txt);
+bool KWIN_EXPORT checkGLError(const char *txt);
 
-QList<QByteArray> KWINGLUTILS_EXPORT openGLExtensions();
+QList<QByteArray> KWIN_EXPORT openGLExtensions();
 
 } // namespace
 
diff --git a/src/libkwineffects/glutils_funcs.h b/src/libkwineffects/glutils_funcs.h
index e794ec5680..ee8d136547 100644
--- a/src/libkwineffects/glutils_funcs.h
+++ b/src/libkwineffects/glutils_funcs.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglutils_export.h"
+#include "kwin_export.h"
 
 #include <epoxy/gl.h>
 #include <functional>
@@ -31,7 +31,7 @@ namespace KWin
 {
 
 typedef void (*resolveFuncPtr)();
-void KWINGLUTILS_EXPORT glResolveFunctions(const std::function<resolveFuncPtr(const char *)> &resolveFunction);
+void KWIN_EXPORT glResolveFunctions(const std::function<resolveFuncPtr(const char *)> &resolveFunction);
 
 // GL_ARB_robustness / GL_EXT_robustness
 using glGetGraphicsResetStatus_func = GLenum (*)();
@@ -39,8 +39,8 @@ using glReadnPixels_func = void (*)(GLint x, GLint y, GLsizei width, GLsizei hei
                                     GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
 using glGetnUniformfv_func = void (*)(GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
 
-extern KWINGLUTILS_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus;
-extern KWINGLUTILS_EXPORT glReadnPixels_func glReadnPixels;
-extern KWINGLUTILS_EXPORT glGetnUniformfv_func glGetnUniformfv;
+extern KWIN_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus;
+extern KWIN_EXPORT glReadnPixels_func glReadnPixels;
+extern KWIN_EXPORT glGetnUniformfv_func glGetnUniformfv;
 
 } // namespace
diff --git a/src/libkwineffects/glvertexbuffer.h b/src/libkwineffects/glvertexbuffer.h
index a37fd87db8..842102cc0e 100644
--- a/src/libkwineffects/glvertexbuffer.h
+++ b/src/libkwineffects/glvertexbuffer.h
@@ -10,7 +10,6 @@
 */
 #pragma once
 #include "kwineffects.h"
-#include "libkwineffects/kwinglutils_export.h"
 
 #include <QColor>
 #include <QRegion>
@@ -54,7 +53,7 @@ class GLVertexBufferPrivate;
  * @author Martin Gräßlin <mgraesslin@kde.org>
  * @since 4.6
  */
-class KWINGLUTILS_EXPORT GLVertexBuffer
+class KWIN_EXPORT GLVertexBuffer
 {
 public:
     /**
diff --git a/src/libkwineffects/kwinanimationeffect.h b/src/libkwineffects/kwinanimationeffect.h
index 27c85803af..90fa7cc8d6 100644
--- a/src/libkwineffects/kwinanimationeffect.h
+++ b/src/libkwineffects/kwinanimationeffect.h
@@ -10,7 +10,8 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects_export.h"
+#include "kwin_export.h"
+
 #include "libkwineffects/kwinoffscreeneffect.h"
 #include <QEasingCurve>
 #include <QElapsedTimer>
@@ -19,7 +20,7 @@
 namespace KWin
 {
 
-class KWINEFFECTS_EXPORT FPx2
+class KWIN_EXPORT FPx2
 {
 public:
     FPx2()
@@ -190,7 +191,7 @@ class AnimationEffectPrivate;
  *
  * @since 4.8
  */
-class KWINEFFECTS_EXPORT AnimationEffect : public CrossFadeEffect
+class KWIN_EXPORT AnimationEffect : public CrossFadeEffect
 {
     Q_OBJECT
 
diff --git a/src/libkwineffects/kwinconfig.h.cmake b/src/libkwineffects/kwinconfig.h.cmake
deleted file mode 100644
index b56c6b2c07..0000000000
--- a/src/libkwineffects/kwinconfig.h.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-
- This file includes config #define's for KWin's libraries
- that are installed. Installed files and files using them
- should be using these instead of their own.
-
-*/
-
-#ifndef KWINCONFIG_H
-#define KWINCONFIG_H
-
-#define KWIN_PLUGIN_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
-
-/*
-
- These should be primarily used to detect what kind of compositing
- support is available.
-
-*/
-
-#cmakedefine01 HAVE_GLX
-
-#cmakedefine01 HAVE_DL_LIBRARY
-
-#endif
diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h
index df16d3b1a4..e39ad04eda 100644
--- a/src/libkwineffects/kwineffects.h
+++ b/src/libkwineffects/kwineffects.h
@@ -12,8 +12,8 @@
 
 #pragma once
 
-#include "libkwineffects/kwinconfig.h"
-#include "libkwineffects/kwineffects_export.h"
+#include "kwin_export.h"
+
 #include "libkwineffects/kwinglobals.h"
 
 #include <QEasingCurve>
@@ -188,7 +188,7 @@ enum EffectFrameStyle {
 /**
  * Scale a rect by a scalar.
  */
-KWINEFFECTS_EXPORT inline QRectF scaledRect(const QRectF &rect, qreal scale)
+KWIN_EXPORT inline QRectF scaledRect(const QRectF &rect, qreal scale)
 {
     return QRectF{rect.x() * scale, rect.y() * scale, rect.width() * scale, rect.height() * scale};
 }
@@ -196,7 +196,7 @@ KWINEFFECTS_EXPORT inline QRectF scaledRect(const QRectF &rect, qreal scale)
 /**
  * Round a vector to nearest integer.
  */
-KWINEFFECTS_EXPORT inline QVector2D roundVector(const QVector2D &input)
+KWIN_EXPORT inline QVector2D roundVector(const QVector2D &input)
 {
     return QVector2D(std::round(input.x()), std::round(input.y()));
 }
@@ -207,7 +207,7 @@ KWINEFFECTS_EXPORT inline QVector2D roundVector(const QVector2D &input)
  * By default, QPointF::toPoint() rounds which can cause problems in certain
  * cases.
  */
-KWINEFFECTS_EXPORT inline QPoint flooredPoint(const QPointF &point)
+KWIN_EXPORT inline QPoint flooredPoint(const QPointF &point)
 {
     return QPoint(std::floor(point.x()), std::floor(point.y()));
 }
@@ -277,7 +277,7 @@ KWINEFFECTS_EXPORT inline QPoint flooredPoint(const QPointF &point)
  *
  * There is in general no need to call the matching doneCurrent method.
  */
-class KWINEFFECTS_EXPORT Effect : public QObject
+class KWIN_EXPORT Effect : public QObject
 {
     Q_OBJECT
 public:
@@ -687,7 +687,7 @@ protected:
 /**
  * Prefer the KWIN_EFFECT_FACTORY macros.
  */
-class KWINEFFECTS_EXPORT EffectPluginFactory : public KPluginFactory
+class KWIN_EXPORT EffectPluginFactory : public KPluginFactory
 {
     Q_OBJECT
 public:
@@ -785,7 +785,7 @@ public:
  *  desktop or create a special input window to receive mouse and keyboard
  *  events.
  */
-class KWINEFFECTS_EXPORT EffectsHandler : public QObject
+class KWIN_EXPORT EffectsHandler : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int currentDesktop READ currentDesktop WRITE setCurrentDesktop NOTIFY desktopChanged)
@@ -1705,7 +1705,7 @@ protected:
 /**
  * The EffectScreen class represents a screen used by/for Effect classes.
  */
-class KWINEFFECTS_EXPORT EffectScreen : public QObject
+class KWIN_EXPORT EffectScreen : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged)
@@ -1803,7 +1803,7 @@ class EffectWindowVisibleRef;
  * The purpose is to hide internal data and also to serve as a single
  *  representation for the case when Client/Unmanaged becomes Deleted.
  */
-class KWINEFFECTS_EXPORT EffectWindow : public QObject
+class KWIN_EXPORT EffectWindow : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QRectF geometry READ frameGeometry)
@@ -2614,7 +2614,7 @@ private:
  * The EffectWindowDeletedRef provides a convenient way to prevent deleting a closed
  * window until an effect has finished animating it.
  */
-class KWINEFFECTS_EXPORT EffectWindowDeletedRef
+class KWIN_EXPORT EffectWindowDeletedRef
 {
 public:
     EffectWindowDeletedRef()
@@ -2668,7 +2668,7 @@ private:
  * The EffectWindowVisibleRef provides a convenient way to force the visible status of a
  * window until an effect is finished animating it.
  */
-class KWINEFFECTS_EXPORT EffectWindowVisibleRef
+class KWIN_EXPORT EffectWindowVisibleRef
 {
 public:
     EffectWindowVisibleRef()
@@ -2728,7 +2728,7 @@ private:
     int m_reason;
 };
 
-class KWINEFFECTS_EXPORT EffectWindowGroup
+class KWIN_EXPORT EffectWindowGroup
 {
 public:
     virtual ~EffectWindowGroup();
@@ -2753,7 +2753,7 @@ struct GLVertex3D
  * A vertex is one position in a window. WindowQuad consists of four WindowVertex objects
  * and represents one part of a window.
  */
-class KWINEFFECTS_EXPORT WindowVertex
+class KWIN_EXPORT WindowVertex
 {
 public:
     WindowVertex();
@@ -2793,7 +2793,7 @@ private:
  * WindowQuads consists of four WindowVertex objects and represents one part of a window.
  */
 // NOTE: This class expects the (original) vertices to be in the clockwise order starting from topleft.
-class KWINEFFECTS_EXPORT WindowQuad
+class KWIN_EXPORT WindowQuad
 {
 public:
     WindowQuad();
@@ -2811,7 +2811,7 @@ private:
     WindowVertex verts[4];
 };
 
-class KWINEFFECTS_EXPORT WindowQuadList
+class KWIN_EXPORT WindowQuadList
     : public QList<WindowQuad>
 {
 public:
@@ -2828,7 +2828,7 @@ public:
  * for easily converting from WindowQuad and related classes to lists of
  * GLVertex2D. This class assumes rendering happens as unindexed triangles.
  */
-class KWINEFFECTS_EXPORT RenderGeometry : public QList<GLVertex2D>
+class KWIN_EXPORT RenderGeometry : public QList<GLVertex2D>
 {
 public:
     /**
@@ -2936,7 +2936,7 @@ private:
     VertexSnappingMode m_vertexSnappingMode = VertexSnappingMode::Round;
 };
 
-class KWINEFFECTS_EXPORT WindowPrePaintData
+class KWIN_EXPORT WindowPrePaintData
 {
 public:
     int mask;
@@ -2960,7 +2960,7 @@ public:
     void setTransformed();
 };
 
-class KWINEFFECTS_EXPORT PaintData
+class KWIN_EXPORT PaintData
 {
 public:
     virtual ~PaintData();
@@ -3129,7 +3129,7 @@ private:
     const std::unique_ptr<PaintDataPrivate> d;
 };
 
-class KWINEFFECTS_EXPORT WindowPaintData : public PaintData
+class KWIN_EXPORT WindowPaintData : public PaintData
 {
 public:
     WindowPaintData();
@@ -3291,7 +3291,7 @@ private:
     const std::unique_ptr<WindowPaintDataPrivate> d;
 };
 
-class KWINEFFECTS_EXPORT ScreenPrePaintData
+class KWIN_EXPORT ScreenPrePaintData
 {
 public:
     int mask;
@@ -3303,7 +3303,7 @@ public:
  * @internal
  */
 template<typename T>
-class KWINEFFECTS_EXPORT Motion
+class KWIN_EXPORT Motion
 {
 public:
     /**
@@ -3402,7 +3402,7 @@ private:
  * 1D space. Although it can be used directly by itself it is
  * recommended to use a motion manager instead.
  */
-class KWINEFFECTS_EXPORT Motion1D : public Motion<double>
+class KWIN_EXPORT Motion1D : public Motion<double>
 {
 public:
     explicit Motion1D(double initial = 0.0, double strength = 0.08, double smoothness = 4.0);
@@ -3417,7 +3417,7 @@ public:
  * 2D space. Although it can be used directly by itself it is
  * recommended to use a motion manager instead.
  */
-class KWINEFFECTS_EXPORT Motion2D : public Motion<QPointF>
+class KWIN_EXPORT Motion2D : public Motion<QPointF>
 {
 public:
     explicit Motion2D(QPointF initial = QPointF(), double strength = 0.08, double smoothness = 4.0);
@@ -3437,7 +3437,7 @@ public:
  * are moving at any given time it can also be used as a notifier as
  * to see whether the effect is active or not.
  */
-class KWINEFFECTS_EXPORT WindowMotionManager
+class KWIN_EXPORT WindowMotionManager
 {
 public:
     /**
@@ -3601,7 +3601,7 @@ private:
  * another that doesn't.
  * It is recommended to use this class whenever displaying text.
  */
-class KWINEFFECTS_EXPORT EffectFrame
+class KWIN_EXPORT EffectFrame
 {
 public:
     EffectFrame();
@@ -3690,7 +3690,7 @@ private:
 /**
  * The TimeLine class is a helper for controlling animations.
  */
-class KWINEFFECTS_EXPORT TimeLine
+class KWIN_EXPORT TimeLine
 {
 public:
     /**
@@ -3941,7 +3941,7 @@ private:
 /**
  * Pointer to the global EffectsHandler object.
  */
-extern KWINEFFECTS_EXPORT EffectsHandler *effects;
+extern KWIN_EXPORT EffectsHandler *effects;
 
 /***************************************************************
  WindowVertex
diff --git a/src/libkwineffects/kwinglobals.h b/src/libkwineffects/kwinglobals.h
index 5da6f97626..47067b9aad 100644
--- a/src/libkwineffects/kwinglobals.h
+++ b/src/libkwineffects/kwinglobals.h
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include "config-kwin.h"
+
 #include <QCoreApplication>
 #include <QImage>
 #include <QPoint>
@@ -16,8 +18,6 @@
 
 #include <kwin_export.h>
 
-#include "libkwineffects/kwinconfig.h"
-
 #define KWIN_QT5_PORTING 0
 
 namespace KWin
diff --git a/src/libkwineffects/kwinoffscreeneffect.h b/src/libkwineffects/kwinoffscreeneffect.h
index 5dea4c86ac..c91a444e32 100644
--- a/src/libkwineffects/kwinoffscreeneffect.h
+++ b/src/libkwineffects/kwinoffscreeneffect.h
@@ -29,7 +29,7 @@ class ShaderEffectPrivate;
  * If a window is redirected into offscreen texture, the deform() function will be
  * called to transform the offscreen texture.
  */
-class KWINEFFECTS_EXPORT OffscreenEffect : public Effect
+class KWIN_EXPORT OffscreenEffect : public Effect
 {
     Q_OBJECT
 
@@ -93,7 +93,7 @@ private:
  * If window geometry changes shape after this point our "old" pixmap is resized to fit approximately matching
  * frame geometry
  */
-class KWINEFFECTS_EXPORT CrossFadeEffect : public Effect
+class KWIN_EXPORT CrossFadeEffect : public Effect
 {
     Q_OBJECT
 public:
diff --git a/src/libkwineffects/kwinoffscreenquickview.h b/src/libkwineffects/kwinoffscreenquickview.h
index 6e20062755..cfc47bae3f 100644
--- a/src/libkwineffects/kwinoffscreenquickview.h
+++ b/src/libkwineffects/kwinoffscreenquickview.h
@@ -9,14 +9,12 @@
 
 #pragma once
 
+#include "libkwineffects/kwineffects.h"
+
 #include <QObject>
 #include <QRect>
 #include <QUrl>
 
-#include "libkwineffects/kwineffects_export.h"
-
-#include "libkwineffects/kwineffects.h"
-
 #include <memory>
 
 class QKeyEvent;
@@ -44,7 +42,7 @@ class OffscreenQuickView;
  * blitting is performed when we update our FBO to keep kwin's render loop
  * as fast as possible.
  */
-class KWINEFFECTS_EXPORT OffscreenQuickView : public QObject
+class KWIN_EXPORT OffscreenQuickView : public QObject
 {
     Q_OBJECT
 
@@ -155,7 +153,7 @@ private:
  * adding QML support. This will represent a context
  * powered by an engine
  */
-class KWINEFFECTS_EXPORT OffscreenQuickScene : public OffscreenQuickView
+class KWIN_EXPORT OffscreenQuickScene : public OffscreenQuickView
 {
 public:
     explicit OffscreenQuickScene(ExportMode exportMode = ExportMode::Texture);
diff --git a/src/libkwineffects/kwinquickeffect.h b/src/libkwineffects/kwinquickeffect.h
index 85747163aa..212dc75ce1 100644
--- a/src/libkwineffects/kwinquickeffect.h
+++ b/src/libkwineffects/kwinquickeffect.h
@@ -25,7 +25,7 @@ class QuickSceneEffectPrivate;
  *
  * @see QuickSceneEffect, OffscreenQuickView
  */
-class KWINEFFECTS_EXPORT QuickSceneView : public OffscreenQuickView
+class KWIN_EXPORT QuickSceneView : public OffscreenQuickView
 {
     Q_OBJECT
     Q_PROPERTY(QuickSceneEffect *effect READ effect CONSTANT)
@@ -71,7 +71,7 @@ private:
  *
  * @see QuickSceneView
  */
-class KWINEFFECTS_EXPORT QuickSceneEffect : public Effect
+class KWIN_EXPORT QuickSceneEffect : public Effect
 {
     Q_OBJECT
     Q_PROPERTY(QuickSceneView *activeView READ activeView NOTIFY activeViewChanged)
diff --git a/src/libkwineffects/openglcontext.h b/src/libkwineffects/openglcontext.h
index fc579593b5..947812b0a7 100644
--- a/src/libkwineffects/openglcontext.h
+++ b/src/libkwineffects/openglcontext.h
@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwinglutils_export.h"
+#include "kwin_export.h"
 #include "version.h"
 
 #include <stdint.h>
@@ -19,7 +19,7 @@
 namespace KWin
 {
 
-class KWINGLUTILS_EXPORT OpenGlContext
+class KWIN_EXPORT OpenGlContext
 {
 public:
     explicit OpenGlContext();
diff --git a/src/libkwineffects/rendertarget.h b/src/libkwineffects/rendertarget.h
index 5e14a02264..e19ae44406 100644
--- a/src/libkwineffects/rendertarget.h
+++ b/src/libkwineffects/rendertarget.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "libkwineffects/colorspace.h"
-#include "libkwineffects/kwinglutils_export.h"
 
 #include <QImage>
 #include <QMatrix4x4>
@@ -19,7 +18,7 @@ namespace KWin
 class GLFramebuffer;
 class GLTexture;
 
-class KWINGLUTILS_EXPORT RenderTarget
+class KWIN_EXPORT RenderTarget
 {
 public:
     explicit RenderTarget(GLFramebuffer *fbo, const ColorDescription &colorDescription = ColorDescription::sRGB);
diff --git a/src/libkwineffects/renderviewport.h b/src/libkwineffects/renderviewport.h
index 0fd815c024..e7ee2ccd18 100644
--- a/src/libkwineffects/renderviewport.h
+++ b/src/libkwineffects/renderviewport.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects_export.h"
+#include "kwin_export.h"
 
 #include <QMatrix4x4>
 #include <QRectF>
@@ -17,7 +17,7 @@ namespace KWin
 
 class RenderTarget;
 
-class KWINEFFECTS_EXPORT RenderViewport
+class KWIN_EXPORT RenderViewport
 {
 public:
     explicit RenderViewport(const QRectF &renderRect, double scale, const RenderTarget &renderTarget);
diff --git a/src/libkwineffects/version.h b/src/libkwineffects/version.h
index b8d65c607d..c3df431b80 100644
--- a/src/libkwineffects/version.h
+++ b/src/libkwineffects/version.h
@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwinglutils_export.h"
+#include "kwin_export.h"
 
 #include <QByteArray>
 #include <QString>
@@ -15,7 +15,7 @@
 namespace KWin
 {
 
-class KWINGLUTILS_EXPORT Version
+class KWIN_EXPORT Version
 {
 public:
     Version(uint32_t major, uint32_t minor, uint32_t patch = 0);
diff --git a/src/platformsupport/scenes/opengl/eglcontext.cpp b/src/platformsupport/scenes/opengl/eglcontext.cpp
index b355b350e2..badcffcb8c 100644
--- a/src/platformsupport/scenes/opengl/eglcontext.cpp
+++ b/src/platformsupport/scenes/opengl/eglcontext.cpp
@@ -9,9 +9,9 @@
 #include "eglcontext.h"
 #include "core/graphicsbuffer.h"
 #include "egldisplay.h"
-#include "glutils.h"
 #include "kwineglimagetexture.h"
 #include "kwineglutils_p.h"
+#include "libkwineffects/glutils.h"
 #include "utils/common.h"
 #include "utils/drm_format_helper.h"
 #include "utils/egl_context_attribute_builder.h"
diff --git a/src/platformsupport/scenes/opengl/eglcontext.h b/src/platformsupport/scenes/opengl/eglcontext.h
index 38eba711a4..cbef81ce1d 100644
--- a/src/platformsupport/scenes/opengl/eglcontext.h
+++ b/src/platformsupport/scenes/opengl/eglcontext.h
@@ -8,9 +8,8 @@
 */
 #pragma once
 
-#include "gltexture.h"
-#include "kwin_export.h"
-#include "openglcontext.h"
+#include "libkwineffects/gltexture.h"
+#include "libkwineffects/openglcontext.h"
 
 #include <QByteArray>
 #include <QList>
diff --git a/src/platformsupport/scenes/opengl/kwineglimagetexture.h b/src/platformsupport/scenes/opengl/kwineglimagetexture.h
index 5c63435d13..ccb84c9235 100644
--- a/src/platformsupport/scenes/opengl/kwineglimagetexture.h
+++ b/src/platformsupport/scenes/opengl/kwineglimagetexture.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "libkwineffects/gltexture.h"
-#include "libkwineffects/kwinglutils_export.h"
 
 typedef void *EGLImageKHR;
 typedef void *EGLClientBuffer;
@@ -20,7 +19,7 @@ namespace KWin
 
 class EglDisplay;
 
-class KWINGLUTILS_EXPORT EGLImageTexture : public GLTexture
+class KWIN_EXPORT EGLImageTexture : public GLTexture
 {
 public:
     explicit EGLImageTexture(EglDisplay *display, EGLImageKHR image, uint textureId, int internalFormat, const QSize &size, uint32_t target);
diff --git a/src/plugins/backgroundcontrast/CMakeLists.txt b/src/plugins/backgroundcontrast/CMakeLists.txt
index 526e702a16..c16bacfa73 100644
--- a/src/plugins/backgroundcontrast/CMakeLists.txt
+++ b/src/plugins/backgroundcontrast/CMakeLists.txt
@@ -8,8 +8,4 @@ set(contrast_SOURCES
     main.cpp
 )
 kwin_add_builtin_effect(contrast ${contrast_SOURCES})
-target_link_libraries(contrast PRIVATE
-    kwin
-    kwineffects
-    kwinglutils
-)
+target_link_libraries(contrast PRIVATE kwin)
diff --git a/src/plugins/blendchanges/CMakeLists.txt b/src/plugins/blendchanges/CMakeLists.txt
index c3215b2b6c..ebd1b4a8aa 100644
--- a/src/plugins/blendchanges/CMakeLists.txt
+++ b/src/plugins/blendchanges/CMakeLists.txt
@@ -8,7 +8,6 @@ set(blendchanges_SOURCES
 
 kwin_add_builtin_effect(blendchanges ${blendchanges_SOURCES})
 target_link_libraries(blendchanges PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
     Qt::DBus
 )
diff --git a/src/plugins/blur/CMakeLists.txt b/src/plugins/blur/CMakeLists.txt
index 7b30fdae44..869c67f181 100644
--- a/src/plugins/blur/CMakeLists.txt
+++ b/src/plugins/blur/CMakeLists.txt
@@ -14,8 +14,6 @@ kconfig_add_kcfg_files(blur_SOURCES
 kwin_add_builtin_effect(blur ${blur_SOURCES})
 target_link_libraries(blur PRIVATE
     kwin
-    kwineffects
-    kwinglutils
 
     KF6::ConfigGui
 
diff --git a/src/plugins/colorblindnesscorrection/CMakeLists.txt b/src/plugins/colorblindnesscorrection/CMakeLists.txt
index 897b09005b..49b860cb47 100644
--- a/src/plugins/colorblindnesscorrection/CMakeLists.txt
+++ b/src/plugins/colorblindnesscorrection/CMakeLists.txt
@@ -8,8 +8,7 @@ kwin_add_builtin_effect(colorblindnesscorrection
 )
 kconfig_add_kcfg_files(colorblindnesscorrection colorblindnesscorrection_settings.kcfgc GENERATE_MOC)
 target_link_libraries(colorblindnesscorrection PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::ConfigCore
     KF6::ConfigGui
diff --git a/src/plugins/colorpicker/CMakeLists.txt b/src/plugins/colorpicker/CMakeLists.txt
index ce43478261..53946b5877 100644
--- a/src/plugins/colorpicker/CMakeLists.txt
+++ b/src/plugins/colorpicker/CMakeLists.txt
@@ -8,7 +8,7 @@ set(colorpicker_SOURCES
 
 kwin_add_builtin_effect(colorpicker ${colorpicker_SOURCES})
 target_link_libraries(colorpicker PRIVATE
-    kwineffects
+    kwin
 
     KF6::I18n
 
diff --git a/src/plugins/diminactive/CMakeLists.txt b/src/plugins/diminactive/CMakeLists.txt
index 32d125c4ce..83f6e2eb59 100644
--- a/src/plugins/diminactive/CMakeLists.txt
+++ b/src/plugins/diminactive/CMakeLists.txt
@@ -12,7 +12,7 @@ kconfig_add_kcfg_files(diminactive_SOURCES
 
 kwin_add_builtin_effect(diminactive ${diminactive_SOURCES})
 target_link_libraries(diminactive PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/fallapart/CMakeLists.txt b/src/plugins/fallapart/CMakeLists.txt
index 704e3a40bf..bb1ae07c0b 100644
--- a/src/plugins/fallapart/CMakeLists.txt
+++ b/src/plugins/fallapart/CMakeLists.txt
@@ -13,7 +13,7 @@ kconfig_add_kcfg_files(fallapart_SOURCES
 
 kwin_add_builtin_effect(fallapart ${fallapart_SOURCES})
 target_link_libraries(fallapart PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/glide/CMakeLists.txt b/src/plugins/glide/CMakeLists.txt
index 19a86c5bcd..0df339d16d 100644
--- a/src/plugins/glide/CMakeLists.txt
+++ b/src/plugins/glide/CMakeLists.txt
@@ -12,7 +12,7 @@ kconfig_add_kcfg_files(glide_SOURCES
 
 kwin_add_builtin_effect(glide ${glide_SOURCES})
 target_link_libraries(glide PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/highlightwindow/CMakeLists.txt b/src/plugins/highlightwindow/CMakeLists.txt
index 43cfeaa4b0..11cadfa3cb 100644
--- a/src/plugins/highlightwindow/CMakeLists.txt
+++ b/src/plugins/highlightwindow/CMakeLists.txt
@@ -9,7 +9,7 @@ set(highlightwindow_SOURCES
 
 kwin_add_builtin_effect(highlightwindow ${highlightwindow_SOURCES})
 target_link_libraries(highlightwindow PRIVATE
-    kwineffects
+    kwin
 
     Qt::DBus
 )
diff --git a/src/plugins/invert/CMakeLists.txt b/src/plugins/invert/CMakeLists.txt
index ca668dc72b..4d5300db58 100644
--- a/src/plugins/invert/CMakeLists.txt
+++ b/src/plugins/invert/CMakeLists.txt
@@ -9,8 +9,7 @@ set(invert_SOURCES
 
 kwin_add_builtin_effect(invert ${invert_SOURCES})
 target_link_libraries(invert PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::GlobalAccel
     KF6::I18n
diff --git a/src/plugins/kdecorations/aurorae/src/CMakeLists.txt b/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
index 7041ab7349..6e2266a3a7 100644
--- a/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
+++ b/src/plugins/kdecorations/aurorae/src/CMakeLists.txt
@@ -24,7 +24,7 @@ target_compile_definitions(kwin5_aurorae PRIVATE
 
 target_link_libraries(kwin5_aurorae
     KDecoration2::KDecoration
-    kwineffects
+    kwin
     KF6::I18n
     KF6::Package
     KF6::WindowSystem
diff --git a/src/plugins/kscreen/CMakeLists.txt b/src/plugins/kscreen/CMakeLists.txt
index af40fb8ab6..4662f23fbf 100644
--- a/src/plugins/kscreen/CMakeLists.txt
+++ b/src/plugins/kscreen/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kscreen_SOURCES
 kconfig_add_kcfg_files(kscreen_SOURCES kscreenconfig.kcfgc)
 kwin_add_builtin_effect(kscreen ${kscreen_SOURCES})
 target_link_libraries(kscreen PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/magiclamp/CMakeLists.txt b/src/plugins/magiclamp/CMakeLists.txt
index 6e27cc2250..1846444c9f 100644
--- a/src/plugins/magiclamp/CMakeLists.txt
+++ b/src/plugins/magiclamp/CMakeLists.txt
@@ -12,7 +12,7 @@ kconfig_add_kcfg_files(magiclamp_SOURCES
 
 kwin_add_builtin_effect(magiclamp ${magiclamp_SOURCES})
 target_link_libraries(magiclamp PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/magnifier/CMakeLists.txt b/src/plugins/magnifier/CMakeLists.txt
index c6536deebd..caaa74efb1 100644
--- a/src/plugins/magnifier/CMakeLists.txt
+++ b/src/plugins/magnifier/CMakeLists.txt
@@ -12,8 +12,7 @@ kconfig_add_kcfg_files(magnifier_SOURCES
 
 kwin_add_builtin_effect(magnifier ${magnifier_SOURCES})
 target_link_libraries(magnifier PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::ConfigGui
     KF6::ConfigWidgets
diff --git a/src/plugins/magnifier/magnifier.cpp b/src/plugins/magnifier/magnifier.cpp
index 3987f0f3a8..bae73e845e 100644
--- a/src/plugins/magnifier/magnifier.cpp
+++ b/src/plugins/magnifier/magnifier.cpp
@@ -13,7 +13,6 @@
 // KConfigSkeleton
 #include "magnifierconfig.h"
 
-#include "libkwineffects/kwinconfig.h"
 #include <QAction>
 #include <kstandardaction.h>
 
diff --git a/src/plugins/mouseclick/CMakeLists.txt b/src/plugins/mouseclick/CMakeLists.txt
index 539a9491b0..81cd4d7d41 100644
--- a/src/plugins/mouseclick/CMakeLists.txt
+++ b/src/plugins/mouseclick/CMakeLists.txt
@@ -12,8 +12,7 @@ kconfig_add_kcfg_files(mouseclick_SOURCES
 
 kwin_add_builtin_effect(mouseclick ${mouseclick_SOURCES})
 target_link_libraries(mouseclick PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::ConfigGui
     KF6::GlobalAccel
diff --git a/src/plugins/mousemark/CMakeLists.txt b/src/plugins/mousemark/CMakeLists.txt
index eb9dfe5604..e067781317 100644
--- a/src/plugins/mousemark/CMakeLists.txt
+++ b/src/plugins/mousemark/CMakeLists.txt
@@ -12,8 +12,7 @@ kconfig_add_kcfg_files(mousemark_SOURCES
 
 kwin_add_builtin_effect(mousemark ${mousemark_SOURCES})
 target_link_libraries(mousemark PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::ConfigGui
     KF6::GlobalAccel
diff --git a/src/plugins/mousemark/mousemark.cpp b/src/plugins/mousemark/mousemark.cpp
index 7a4198980b..a9b80315f2 100644
--- a/src/plugins/mousemark/mousemark.cpp
+++ b/src/plugins/mousemark/mousemark.cpp
@@ -16,7 +16,6 @@
 #include "mousemarkconfig.h"
 
 #include "libkwineffects/glplatform.h"
-#include "libkwineffects/kwinconfig.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 #include <KGlobalAccel>
diff --git a/src/plugins/outputlocator/CMakeLists.txt b/src/plugins/outputlocator/CMakeLists.txt
index e49906aa76..b90e287d3e 100644
--- a/src/plugins/outputlocator/CMakeLists.txt
+++ b/src/plugins/outputlocator/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 kwin_add_builtin_effect(outputlocator main.cpp outputlocator.cpp)
 target_link_libraries(outputlocator PRIVATE
-    kwineffects
+    kwin
     Qt::DBus
     Qt::Quick
     KF6::I18n
diff --git a/src/plugins/overview/CMakeLists.txt b/src/plugins/overview/CMakeLists.txt
index d57b3ee610..13a850bcdb 100644
--- a/src/plugins/overview/CMakeLists.txt
+++ b/src/plugins/overview/CMakeLists.txt
@@ -28,7 +28,7 @@ qt6_add_qml_module(overview
 )
 
 target_link_libraries(overview PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
     KF6::GlobalAccel
diff --git a/src/plugins/private/CMakeLists.txt b/src/plugins/private/CMakeLists.txt
index eac8ecba33..5bce4311f0 100644
--- a/src/plugins/private/CMakeLists.txt
+++ b/src/plugins/private/CMakeLists.txt
@@ -4,9 +4,9 @@
 
 ecm_add_qml_module(effectsplugin URI "org.kde.kwin.private.effects")
 
-ecm_target_qml_sources(effectsplugin 
-    SOURCES 
-        qml/WindowHeap.qml 
+ecm_target_qml_sources(effectsplugin
+    SOURCES
+        qml/WindowHeap.qml
         qml/WindowHeapDelegate.qml
 )
 
@@ -17,7 +17,7 @@ target_sources(effectsplugin PRIVATE
 )
 
 target_link_libraries(effectsplugin PRIVATE
-    kwineffects
+    kwin
     Qt6::Quick
     Qt6::Qml
     KF6::I18n
diff --git a/src/plugins/screenedge/CMakeLists.txt b/src/plugins/screenedge/CMakeLists.txt
index a83106443d..9a8c90505f 100644
--- a/src/plugins/screenedge/CMakeLists.txt
+++ b/src/plugins/screenedge/CMakeLists.txt
@@ -9,8 +9,7 @@ set(screenedge_SOURCES
 
 kwin_add_builtin_effect(screenedge ${screenedge_SOURCES})
 target_link_libraries(screenedge PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::Svg
     KF6::ConfigCore
diff --git a/src/plugins/screenshot/CMakeLists.txt b/src/plugins/screenshot/CMakeLists.txt
index 2de178798d..07fae9d440 100644
--- a/src/plugins/screenshot/CMakeLists.txt
+++ b/src/plugins/screenshot/CMakeLists.txt
@@ -12,8 +12,7 @@ qt_add_dbus_adaptor(screenshot_SOURCES org.kde.KWin.ScreenShot2.xml screenshotdb
 
 kwin_add_builtin_effect(screenshot ${screenshot_SOURCES})
 target_link_libraries(screenshot PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::Service
     KF6::I18n
diff --git a/src/plugins/screentransform/CMakeLists.txt b/src/plugins/screentransform/CMakeLists.txt
index 1c24b4d38e..0a27a61558 100644
--- a/src/plugins/screentransform/CMakeLists.txt
+++ b/src/plugins/screentransform/CMakeLists.txt
@@ -9,6 +9,5 @@ set(screentransform_SOURCES
 
 kwin_add_builtin_effect(screentransform ${screentransform_SOURCES})
 target_link_libraries(screentransform PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 )
diff --git a/src/plugins/sheet/CMakeLists.txt b/src/plugins/sheet/CMakeLists.txt
index 9c17d25515..1074730f51 100644
--- a/src/plugins/sheet/CMakeLists.txt
+++ b/src/plugins/sheet/CMakeLists.txt
@@ -10,7 +10,7 @@ kconfig_add_kcfg_files(sheet_SOURCES sheetconfig.kcfgc)
 
 kwin_add_builtin_effect(sheet ${sheet_SOURCES})
 target_link_libraries(sheet PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/showfps/CMakeLists.txt b/src/plugins/showfps/CMakeLists.txt
index 343dcaa9da..72d0c140af 100644
--- a/src/plugins/showfps/CMakeLists.txt
+++ b/src/plugins/showfps/CMakeLists.txt
@@ -10,7 +10,7 @@ set(showfps_SOURCES
 kwin_add_builtin_effect(showfps ${showfps_SOURCES})
 
 target_link_libraries(showfps PRIVATE
-    kwineffects
+    kwin
 
     KF6::I18n
 
diff --git a/src/plugins/showpaint/CMakeLists.txt b/src/plugins/showpaint/CMakeLists.txt
index 3c9d6fe930..d39da50bac 100644
--- a/src/plugins/showpaint/CMakeLists.txt
+++ b/src/plugins/showpaint/CMakeLists.txt
@@ -8,8 +8,7 @@ set(showpaint_SOURCES
 
 kwin_add_builtin_effect(showpaint ${showpaint_SOURCES})
 target_link_libraries(showpaint PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::GlobalAccel
     KF6::I18n
diff --git a/src/plugins/slide/CMakeLists.txt b/src/plugins/slide/CMakeLists.txt
index e2582b85a9..646cb5d906 100644
--- a/src/plugins/slide/CMakeLists.txt
+++ b/src/plugins/slide/CMakeLists.txt
@@ -13,7 +13,7 @@ kconfig_add_kcfg_files(slide_SOURCES
 
 kwin_add_builtin_effect(slide ${slide_SOURCES})
 target_link_libraries(slide PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/slideback/CMakeLists.txt b/src/plugins/slideback/CMakeLists.txt
index 91134dff18..fdadc4ffaf 100644
--- a/src/plugins/slideback/CMakeLists.txt
+++ b/src/plugins/slideback/CMakeLists.txt
@@ -9,5 +9,5 @@ set(slideback_SOURCES
 
 kwin_add_builtin_effect(slideback ${slideback_SOURCES})
 target_link_libraries(slideback PRIVATE
-    kwineffects
+    kwin
 )
diff --git a/src/plugins/slidingpopups/CMakeLists.txt b/src/plugins/slidingpopups/CMakeLists.txt
index 457b40c91b..cc787278eb 100644
--- a/src/plugins/slidingpopups/CMakeLists.txt
+++ b/src/plugins/slidingpopups/CMakeLists.txt
@@ -14,7 +14,6 @@ kconfig_add_kcfg_files(slidingpopups_SOURCES
 kwin_add_builtin_effect(slidingpopups ${slidingpopups_SOURCES})
 target_link_libraries(slidingpopups PRIVATE
     kwin
-    kwineffects
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/snaphelper/CMakeLists.txt b/src/plugins/snaphelper/CMakeLists.txt
index 40fc083369..dc675b4dc3 100644
--- a/src/plugins/snaphelper/CMakeLists.txt
+++ b/src/plugins/snaphelper/CMakeLists.txt
@@ -9,6 +9,5 @@ set(snaphelper_SOURCES
 
 kwin_add_builtin_effect(snaphelper ${snaphelper_SOURCES})
 target_link_libraries(snaphelper PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 )
diff --git a/src/plugins/startupfeedback/CMakeLists.txt b/src/plugins/startupfeedback/CMakeLists.txt
index 8dc39fbb7c..78667d40e7 100644
--- a/src/plugins/startupfeedback/CMakeLists.txt
+++ b/src/plugins/startupfeedback/CMakeLists.txt
@@ -10,8 +10,7 @@ set(startupfeedback_SOURCES
 
 kwin_add_builtin_effect(startupfeedback ${startupfeedback_SOURCES})
 target_link_libraries(startupfeedback PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     Qt::DBus
     Qt::Widgets
diff --git a/src/plugins/thumbnailaside/CMakeLists.txt b/src/plugins/thumbnailaside/CMakeLists.txt
index 67fb0ce76d..e545ccdbb6 100644
--- a/src/plugins/thumbnailaside/CMakeLists.txt
+++ b/src/plugins/thumbnailaside/CMakeLists.txt
@@ -12,8 +12,7 @@ kconfig_add_kcfg_files(thumbnailaside_SOURCES
 
 kwin_add_builtin_effect(thumbnailaside ${thumbnailaside_SOURCES})
 target_link_libraries(thumbnailaside PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::ConfigGui
     KF6::GlobalAccel
diff --git a/src/plugins/tileseditor/CMakeLists.txt b/src/plugins/tileseditor/CMakeLists.txt
index 49957fa127..4000565057 100644
--- a/src/plugins/tileseditor/CMakeLists.txt
+++ b/src/plugins/tileseditor/CMakeLists.txt
@@ -14,7 +14,7 @@ set(tileseditor_SOURCES
 kwin_add_builtin_effect(tileseditor ${tileseditor_SOURCES})
 
 target_link_libraries(tileseditor PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
     KF6::GlobalAccel
diff --git a/src/plugins/touchpoints/CMakeLists.txt b/src/plugins/touchpoints/CMakeLists.txt
index 087975bb2e..9fe1a28505 100644
--- a/src/plugins/touchpoints/CMakeLists.txt
+++ b/src/plugins/touchpoints/CMakeLists.txt
@@ -8,8 +8,7 @@ set(touchpoints_SOURCES
 
 kwin_add_builtin_effect(touchpoints ${touchpoints_SOURCES})
 target_link_libraries(touchpoints PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::GlobalAccel
 )
diff --git a/src/plugins/trackmouse/CMakeLists.txt b/src/plugins/trackmouse/CMakeLists.txt
index b0601fec57..07ccdcf2b5 100644
--- a/src/plugins/trackmouse/CMakeLists.txt
+++ b/src/plugins/trackmouse/CMakeLists.txt
@@ -14,8 +14,7 @@ kconfig_add_kcfg_files(trackmouse_SOURCES
 
 kwin_add_builtin_effect(trackmouse ${trackmouse_SOURCES})
 target_link_libraries(trackmouse PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::ConfigGui
     KF6::GlobalAccel
diff --git a/src/plugins/trackmouse/trackmouse.cpp b/src/plugins/trackmouse/trackmouse.cpp
index dbf6fe156b..15c1bbf8e2 100644
--- a/src/plugins/trackmouse/trackmouse.cpp
+++ b/src/plugins/trackmouse/trackmouse.cpp
@@ -20,7 +20,6 @@
 #include <QTime>
 
 #include "libkwineffects/glutils.h"
-#include "libkwineffects/kwinconfig.h"
 #include "libkwineffects/rendertarget.h"
 #include "libkwineffects/renderviewport.h"
 
diff --git a/src/plugins/windowview/CMakeLists.txt b/src/plugins/windowview/CMakeLists.txt
index 31679a1974..871542384b 100644
--- a/src/plugins/windowview/CMakeLists.txt
+++ b/src/plugins/windowview/CMakeLists.txt
@@ -20,7 +20,7 @@ qt_add_dbus_adaptor(windowview_SOURCES org.kde.KWin.Effect.WindowView1.xml windo
 kwin_add_builtin_effect(windowview ${windowview_SOURCES})
 
 target_link_libraries(windowview PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
     KF6::GlobalAccel
diff --git a/src/plugins/wobblywindows/CMakeLists.txt b/src/plugins/wobblywindows/CMakeLists.txt
index d2ccfaa193..f37b12f33f 100644
--- a/src/plugins/wobblywindows/CMakeLists.txt
+++ b/src/plugins/wobblywindows/CMakeLists.txt
@@ -12,7 +12,7 @@ kconfig_add_kcfg_files(wobblywindows_SOURCES
 
 kwin_add_builtin_effect(wobblywindows ${wobblywindows_SOURCES})
 target_link_libraries(wobblywindows PRIVATE
-    kwineffects
+    kwin
 
     KF6::ConfigGui
 )
diff --git a/src/plugins/zoom/CMakeLists.txt b/src/plugins/zoom/CMakeLists.txt
index 3e5962a46f..c27bdbbb2d 100644
--- a/src/plugins/zoom/CMakeLists.txt
+++ b/src/plugins/zoom/CMakeLists.txt
@@ -18,8 +18,7 @@ kconfig_add_kcfg_files(zoom_SOURCES
 
 kwin_add_builtin_effect(zoom ${zoom_SOURCES})
 target_link_libraries(zoom PRIVATE
-    kwineffects
-    kwinglutils
+    kwin
 
     KF6::ConfigGui
     KF6::ConfigWidgets
diff --git a/src/scripting/gesturehandler.h b/src/scripting/gesturehandler.h
index b1e39fa798..076150745c 100644
--- a/src/scripting/gesturehandler.h
+++ b/src/scripting/gesturehandler.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 
 #include <QQmlParserStatus>
 
diff --git a/src/utils/common.h b/src/utils/common.h
index 3ddb19d73b..785c08c6b7 100644
--- a/src/utils/common.h
+++ b/src/utils/common.h
@@ -11,8 +11,7 @@
 #pragma once
 
 // cmake stuff
-#include "libkwineffects/kwinconfig.h"
-#include <config-kwin.h>
+#include "config-kwin.h"
 // kwin
 #include "libkwineffects/kwinglobals.h"
 #include "libkwineffects/version.h"
diff --git a/src/wayland/screenedge_v1.h b/src/wayland/screenedge_v1.h
index 1f5bdc0689..6e2f1a57ce 100644
--- a/src/wayland/screenedge_v1.h
+++ b/src/wayland/screenedge_v1.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "kwinglobals.h"
+#include "libkwineffects/kwinglobals.h"
 
 #include <QObject>
 #include <memory>
diff --git a/src/wayland/textinput.h b/src/wayland/textinput.h
index 217683e8eb..611b1b09e2 100644
--- a/src/wayland/textinput.h
+++ b/src/wayland/textinput.h
@@ -5,17 +5,12 @@
 */
 #pragma once
 
-#include "kwin_export.h"
-
-#include <QVariant>
+#include <QMetaType>
 #include <QtGlobal>
-#include <qobjectdefs.h>
-
-#include <inttypes.h>
 
 namespace KWin
 {
-Q_NAMESPACE_EXPORT(KWIN_EXPORT)
+
 /**
  * ContentHint allows to modify the behavior of the text input.
  */
@@ -67,7 +62,6 @@ enum class TextInputContentHint {
 };
 
 Q_DECLARE_FLAGS(TextInputContentHints, TextInputContentHint)
-Q_ENUM_NS(TextInputContentHint)
 
 /**
  * The ContentPurpose allows to specify the primary purpose of a text input.
@@ -133,7 +127,6 @@ enum class TextInputContentPurpose {
      */
     Pin,
 };
-Q_ENUM_NS(TextInputContentPurpose)
 
 enum class TextInputChangeCause {
     /**
@@ -146,8 +139,6 @@ enum class TextInputChangeCause {
      */
     Other,
 };
-Q_ENUM_NS(TextInputChangeCause)
-
 }
 
 Q_DECLARE_METATYPE(KWin::TextInputContentHint)
diff --git a/src/wayland/textinput_v1.h b/src/wayland/textinput_v1.h
index 1dda8f7d84..ae8ae2a8dc 100644
--- a/src/wayland/textinput_v1.h
+++ b/src/wayland/textinput_v1.h
@@ -5,6 +5,8 @@
 */
 #pragma once
 
+#include "kwin_export.h"
+
 #include <QObject>
 #include <memory>
 
diff --git a/src/wayland/textinput_v2.h b/src/wayland/textinput_v2.h
index 095bd3b405..1118717b31 100644
--- a/src/wayland/textinput_v2.h
+++ b/src/wayland/textinput_v2.h
@@ -5,6 +5,8 @@
 */
 #pragma once
 
+#include "kwin_export.h"
+
 #include <QObject>
 #include <memory>