Remove some include_directories()

It seems we've settled on dir/dir/header.h includes, so let's use them
consistently.

CMakeLists.txt

@@ -398,11 +398,6 @@ include_directories(BEFORE
     ${CMAKE_CURRENT_BINARY_DIR}/src/libkwineffects
     ${CMAKE_CURRENT_BINARY_DIR}/src/wayland
     ${CMAKE_CURRENT_BINARY_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/libkwineffects
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/effects
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/tabbox
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/platformsupport
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/colors
     ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 

autotests/CMakeLists.txt

@@ -120,8 +120,6 @@ target_link_libraries(testXcbWindow
 add_test(NAME kwin-testXcbWindow COMMAND testXcbWindow)
 ecm_mark_as_test(testXcbWindow)
 
-include_directories(${KWin_SOURCE_DIR}/src)
-
 ########################################################
 # Test OnScreenNotification
 ########################################################

autotests/drm/drmTest.cpp

@@ -12,18 +12,18 @@
 
 #include "mock_drm.h"
 
+#include "core/session.h"
 #include "drm_backend.h"
+#include "drm_connector.h"
+#include "drm_crtc.h"
 #include "drm_dumb_buffer.h"
 #include "drm_egl_backend.h"
 #include "drm_gpu.h"
-#include "drm_connector.h"
-#include "drm_crtc.h"
-#include "drm_plane.h"
 #include "drm_output.h"
 #include "drm_pipeline.h"
+#include "drm_plane.h"
 #include "drm_pointer.h"
-#include "qpainterbackend.h"
-#include "core/session.h"
+#include "platformsupport/scenes/qpainter/qpainterbackend.h"
 
 #include <drm_fourcc.h>
 

autotests/integration/activities_test.cpp

@@ -11,12 +11,12 @@
 #include "activities.h"
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "utils/xcbutils.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <QDBusConnection>
 #include <QDBusMessage>

autotests/integration/decoration_input_test.cpp

@@ -12,12 +12,12 @@
 #include "core/outputbackend.h"
 #include "cursor.h"
 #include "internalwindow.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "touch_input.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
-#include <kwineffects.h>
 
 #include "decorations/decoratedclient.h"
 #include "decorations/decorationbridge.h"

autotests/integration/desktop_window_x11_test.cpp

@@ -10,13 +10,13 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "utils/xcbutils.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <netwm.h>
 #include <xcb/xcb_icccm.h>

autotests/integration/dont_crash_aurorae_destroy_deco.cpp

@@ -12,11 +12,11 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <KDecoration2/Decoration>
 

autotests/integration/dont_crash_empty_deco.cpp

@@ -12,11 +12,11 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <KDecoration2/Decoration>
 

autotests/integration/dont_crash_no_border.cpp

@@ -13,11 +13,11 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <KWayland/Client/surface.h>
 

autotests/integration/input_stacking_order.cpp

@@ -10,12 +10,12 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland/seat_interface.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
-#include <kwineffects.h>
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/connection_thread.h>

autotests/integration/lockscreen.cpp

@@ -12,6 +12,7 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "screenedge.h"
 #include "wayland/keyboard_interface.h"
@@ -19,7 +20,6 @@
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
-#include <kwineffects.h>
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/connection_thread.h>

autotests/integration/plasmawindow_test.cpp

@@ -10,12 +10,12 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland/seat_interface.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/plasmawindowmanagement.h>

autotests/integration/pointer_input.cpp

@@ -12,6 +12,7 @@
 #include "core/outputbackend.h"
 #include "cursor.h"
 #include "effects.h"
+#include "libkwineffects/kwineffects.h"
 #include "options.h"
 #include "pointer_input.h"
 #include "screenedge.h"
@@ -22,7 +23,6 @@
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
-#include <kwineffects.h>
 
 #include <KWayland/Client/buffer.h>
 #include <KWayland/Client/compositor.h>

autotests/integration/screenedge_client_show_test.cpp

@@ -10,12 +10,12 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "screenedge.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <netwm.h>
 #include <xcb/xcb_icccm.h>

autotests/integration/shade_test.cpp

@@ -10,11 +10,11 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <KDecoration2/Decoration>
 

autotests/integration/struts_test.cpp

@@ -10,13 +10,13 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "screenedge.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
-#include <kwineffects.h>
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/plasmashell.h>

autotests/integration/tiles_test.cpp

@@ -10,6 +10,7 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "tiles/tilemanager.h"
 #include "wayland/seat_interface.h"
@@ -17,7 +18,6 @@
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
-#include <kwineffects.h>
 
 #include <QAbstractItemModelTester>
 

autotests/integration/transient_placement.cpp

@@ -10,13 +10,13 @@
 
 #include "core/output.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwineffects.h"
 #include "pointer_input.h"
 #include "wayland/seat_interface.h"
 #include "wayland/surface_interface.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
-#include <kwineffects.h>
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/connection_thread.h>

autotests/libkwineffects/kwinglplatformtest.cpp

@@ -6,9 +6,9 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
+#include "libkwineffects/kwinglplatform.h"
 #include "mock_gl.h"
 #include <QTest>
-#include <kwinglplatform.h>
 
 #include <KConfig>
 #include <KConfigGroup>

autotests/libkwineffects/timelinetest.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include <kwineffects.h>
+#include "libkwineffects/kwineffects.h"
 
 #include <QtTest>
 

autotests/libkwineffects/windowquadlisttest.cpp

@@ -6,8 +6,8 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
+#include "libkwineffects/kwineffects.h"
 #include <QTest>
-#include <kwineffects.h>
 
 Q_DECLARE_METATYPE(KWin::WindowQuadList)
 

autotests/tabbox/CMakeLists.txt

@@ -1,4 +1,3 @@
-include_directories(${KWin_SOURCE_DIR}/src)
 add_definitions(-DKWIN_UNIT_TEST)
 ########################################################
 # Test TabBox::ClientModel

autotests/tabbox/test_tabbox_clientmodel.cpp

@@ -8,8 +8,8 @@
 */
 #include "test_tabbox_clientmodel.h"
 #include "../testutils.h"
-#include "clientmodel.h"
 #include "mock_tabboxhandler.h"
+#include "tabbox/clientmodel.h"
 
 #include <QtTest>
 #include <private/qtx11extras_p.h>

autotests/tabbox/test_tabbox_handler.cpp

@@ -7,8 +7,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "../testutils.h"
-#include "clientmodel.h"
 #include "mock_tabboxhandler.h"
+#include "tabbox/clientmodel.h"
 #include <QtTest>
 #include <private/qtx11extras_p.h>
 

autotests/test_window_paint_data.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include <kwineffects.h>
+#include "libkwineffects/kwineffects.h"
 
 #include "virtualdesktops.h"
 

autotests/testutils.h

@@ -9,7 +9,7 @@
 #ifndef TESTUTILS_H
 #define TESTUTILS_H
 // KWin
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 // XCB
 #include <xcb/xcb.h>
 

src/activities.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 
 #include <QObject>
 #include <QStringList>

src/appmenu.h

@@ -10,7 +10,7 @@
 */
 #pragma once
 // KWin
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 // Qt
 #include <QObject>
 // xcb

src/backends/drm/drm_dmabuf_feedback.cpp

@@ -10,7 +10,7 @@
 
 #include "drm_egl_backend.h"
 #include "drm_gpu.h"
-#include "egl_dmabuf.h"
+#include "platformsupport/scenes/opengl/egl_dmabuf.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 

src/backends/drm/drm_egl_backend.cpp

@@ -7,8 +7,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "drm_egl_backend.h"
-#include "basiceglsurfacetexture_internal.h"
-#include "basiceglsurfacetexture_wayland.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h"
 // kwin
 #include "core/renderloop_p.h"
 #include "drm_abstract_output.h"
@@ -23,18 +23,18 @@
 #include "drm_output.h"
 #include "drm_pipeline.h"
 #include "drm_virtual_egl_layer.h"
-#include "egl_dmabuf.h"
 #include "gbm_dmabuf.h"
 #include "kwineglutils_p.h"
 #include "linux_dmabuf.h"
 #include "options.h"
+#include "platformsupport/scenes/opengl/egl_dmabuf.h"
 #include "scene/surfaceitem_wayland.h"
 #include "wayland/clientconnection.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 // kwin libs
-#include <kwineglimagetexture.h>
-#include <kwinglplatform.h>
+#include "libkwineffects/kwineglimagetexture.h"
+#include "libkwineffects/kwinglplatform.h"
 // system
 #include <drm_fourcc.h>
 #include <errno.h>

src/backends/drm/drm_egl_backend.h

@@ -7,10 +7,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "abstract_egl_backend.h"
 #include "drm_render_backend.h"
+#include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 
-#include <kwinglutils.h>
+#include "libkwineffects/kwinglutils.h"
 
 #include <QHash>
 #include <QPointer>

src/backends/drm/drm_egl_layer.cpp

@@ -15,7 +15,7 @@
 #include "drm_logging.h"
 #include "drm_output.h"
 #include "drm_pipeline.h"
-#include "egl_dmabuf.h"
+#include "platformsupport/scenes/opengl/egl_dmabuf.h"
 #include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"

src/backends/drm/drm_egl_layer_surface.cpp

@@ -17,10 +17,10 @@
 #include "drm_gpu.h"
 #include "drm_logging.h"
 #include "drm_output.h"
-#include "egl_dmabuf.h"
 #include "gbm_dmabuf.h"
 #include "kwineglutils_p.h"
-#include "kwinglplatform.h"
+#include "libkwineffects/kwinglplatform.h"
+#include "platformsupport/scenes/opengl/egl_dmabuf.h"
 #include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"

src/backends/drm/drm_egl_layer_surface.h

@@ -16,7 +16,7 @@
 
 #include "core/outputlayer.h"
 #include "drm_plane.h"
-#include "kwingltexture.h"
+#include "libkwineffects/kwingltexture.h"
 
 namespace KWaylandServer
 {

src/backends/drm/drm_gbm_swapchain.cpp

@@ -18,7 +18,7 @@
 #include "drm_gpu.h"
 #include "drm_logging.h"
 #include "kwineglutils_p.h"
-#include "kwinglplatform.h"
+#include "libkwineffects/kwinglplatform.h"
 
 namespace KWin
 {

src/backends/drm/drm_gpu.cpp

@@ -10,7 +10,6 @@
 
 #include <config-kwin.h>
 
-#include "abstract_egl_backend.h"
 #include "core/renderloop_p.h"
 #include "core/session.h"
 #include "drm_atomic_commit.h"
@@ -25,6 +24,7 @@
 #include "drm_plane.h"
 #include "drm_virtual_output.h"
 #include "gbm_dmabuf.h"
+#include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 // system
 #include <algorithm>
 #include <errno.h>

src/backends/drm/drm_output.cpp

@@ -22,8 +22,8 @@
 #include "drm_egl_backend.h"
 #include "drm_layer.h"
 #include "drm_logging.h"
-#include "kwinglutils.h"
-#include "renderviewport.h"
+#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/renderviewport.h"
 // Qt
 #include <QCryptographicHash>
 #include <QMatrix4x4>

src/backends/drm/drm_qpainter_backend.h

@@ -9,7 +9,7 @@
 #pragma once
 #include "drm_dumb_swapchain.h"
 #include "drm_render_backend.h"
-#include "qpainterbackend.h"
+#include "platformsupport/scenes/qpainter/qpainterbackend.h"
 
 #include <QObject>
 #include <QVector>

src/backends/drm/drm_virtual_egl_layer.cpp

@@ -17,9 +17,9 @@
 #include "drm_output.h"
 #include "drm_pipeline.h"
 #include "drm_virtual_output.h"
-#include "egl_dmabuf.h"
 #include "gbm_dmabuf.h"
 #include "kwineglutils_p.h"
+#include "platformsupport/scenes/opengl/egl_dmabuf.h"
 #include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"

src/backends/drm/drm_virtual_output.cpp

@@ -15,7 +15,7 @@
 #include "drm_layer.h"
 #include "drm_logging.h"
 #include "drm_render_backend.h"
-#include "softwarevsyncmonitor.h"
+#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h"
 
 namespace KWin
 {

src/backends/libinput/connection.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 
 #include <KSharedConfig>
 

src/backends/virtual/virtual_egl_backend.cpp

@@ -8,15 +8,15 @@
 */
 #include "virtual_egl_backend.h"
 // kwin
-#include "basiceglsurfacetexture_internal.h"
-#include "basiceglsurfacetexture_wayland.h"
-#include "virtual_logging.h"
-#include "softwarevsyncmonitor.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h"
+#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h"
 #include "virtual_backend.h"
+#include "virtual_logging.h"
 #include "virtual_output.h"
 // kwin libs
+#include "libkwineffects/kwinglutils.h"
 #include <drm_fourcc.h>
-#include <kwinglutils.h>
 
 #ifndef EGL_PLATFORM_SURFACELESS_MESA
 #define EGL_PLATFORM_SURFACELESS_MESA 0x31DD

src/backends/virtual/virtual_egl_backend.h

@@ -8,8 +8,8 @@
 */
 #pragma once
 
-#include "abstract_egl_backend.h"
 #include "core/outputlayer.h"
+#include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 #include <memory>
 
 namespace KWin

src/backends/virtual/virtual_output.cpp

@@ -10,7 +10,7 @@
 #include "virtual_backend.h"
 
 #include "core/renderloop_p.h"
-#include "softwarevsyncmonitor.h"
+#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h"
 
 namespace KWin
 {

src/backends/virtual/virtual_qpainter_backend.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "virtual_qpainter_backend.h"
-#include "softwarevsyncmonitor.h"
+#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h"
 #include "virtual_backend.h"
 #include "virtual_output.h"
 

src/backends/virtual/virtual_qpainter_backend.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "core/outputlayer.h"
-#include "qpainterbackend.h"
+#include "platformsupport/scenes/qpainter/qpainterbackend.h"
 
 #include <QMap>
 #include <QObject>

src/backends/wayland/wayland_backend.h

@@ -14,8 +14,8 @@
 #include "core/inputbackend.h"
 #include "core/inputdevice.h"
 #include "core/outputbackend.h"
+#include "libkwineffects/kwinglobals.h"
 #include "utils/filedescriptor.h"
-#include <kwinglobals.h>
 // Qt
 #include <QHash>
 #include <QImage>

src/backends/wayland/wayland_egl_backend.cpp

@@ -9,9 +9,9 @@
 */
 
 #include "wayland_egl_backend.h"
-#include "basiceglsurfacetexture_internal.h"
-#include "basiceglsurfacetexture_wayland.h"
 #include "../drm/gbm_dmabuf.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h"
 
 #include "wayland_backend.h"
 #include "wayland_display.h"
@@ -22,8 +22,8 @@
 #include <unistd.h>
 
 // kwin libs
-#include <kwinglplatform.h>
-#include <kwinglutils.h>
+#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/kwinglutils.h"
 
 // KDE
 #include <KWayland/Client/shm_pool.h>

src/backends/wayland/wayland_egl_backend.h

@@ -9,8 +9,8 @@
 */
 #pragma once
 
-#include "abstract_egl_backend.h"
 #include "core/outputlayer.h"
+#include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 #include "utils/damagejournal.h"
 
 #include <KWayland/Client/buffer.h>

src/backends/wayland/wayland_output.cpp

@@ -14,9 +14,9 @@
 #include "wayland_display.h"
 #include "wayland_server.h"
 
-#include "kwingltexture.h"
-#include "kwinglutils.h"
-#include "renderviewport.h"
+#include "libkwineffects/kwingltexture.h"
+#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/renderviewport.h"
 
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/pointer.h>

src/backends/wayland/wayland_qpainter_backend.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "core/outputlayer.h"
-#include "qpainterbackend.h"
+#include "platformsupport/scenes/qpainter/qpainterbackend.h"
 #include "utils/damagejournal.h"
 
 #include <KWayland/Client/buffer.h>

src/backends/x11/standalone/x11_standalone_egl_backend.cpp

@@ -9,11 +9,11 @@
 #include "core/outputbackend.h"
 #include "core/overlaywindow.h"
 #include "core/renderloop_p.h"
-#include "kwinglplatform.h"
+#include "libkwineffects/kwinglplatform.h"
 #include "options.h"
+#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h"
 #include "scene/surfaceitem_x11.h"
 #include "scene/workspacescene.h"
-#include "softwarevsyncmonitor.h"
 #include "workspace.h"
 #include "x11_standalone_backend.h"
 #include "x11_standalone_logging.h"

src/backends/x11/standalone/x11_standalone_egl_backend.h

@@ -11,8 +11,8 @@
 #include "platformsupport/scenes/opengl/openglsurfacetexture_x11.h"
 #include "utils/damagejournal.h"
 
-#include <kwingltexture.h>
-#include <kwingltexture_p.h>
+#include "libkwineffects/kwingltexture.h"
+#include "libkwineffects/kwingltexture_p.h"
 
 namespace KWin
 {

src/backends/x11/standalone/x11_standalone_glx_backend.cpp

@@ -14,7 +14,7 @@
 // own
 #include "x11_standalone_glx_backend.h"
 #include "../common/kwinxrenderutils.h"
-#include "softwarevsyncmonitor.h"
+#include "platformsupport/vsyncconvenience/softwarevsyncmonitor.h"
 #include "x11_standalone_backend.h"
 #include "x11_standalone_glx_context_attribute_builder.h"
 #include "x11_standalone_glxconvenience.h"
@@ -33,9 +33,9 @@
 #include "utils/xcbutils.h"
 #include "workspace.h"
 // kwin libs
-#include <kwinglplatform.h>
-#include <kwinglutils.h>
-#include <kwinoffscreenquickview.h>
+#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/kwinoffscreenquickview.h"
 // Qt
 #include <QDebug>
 #include <QOpenGLContext>

src/backends/x11/standalone/x11_standalone_glx_backend.h

@@ -8,8 +8,8 @@
 */
 #pragma once
 #include "core/outputlayer.h"
-#include "openglbackend.h"
-#include "openglsurfacetexture_x11.h"
+#include "platformsupport/scenes/opengl/openglbackend.h"
+#include "platformsupport/scenes/opengl/openglsurfacetexture_x11.h"
 #include "utils/damagejournal.h"
 #include "x11eventfilter.h"
 
@@ -17,8 +17,8 @@
 #include <fixx11h.h>
 #include <xcb/glx.h>
 
-#include <kwingltexture.h>
-#include <kwingltexture_p.h>
+#include "libkwineffects/kwingltexture.h"
+#include "libkwineffects/kwingltexture_p.h"
 
 #include <QHash>
 #include <memory>

src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "vsyncmonitor.h"
+#include "platformsupport/vsyncconvenience/vsyncmonitor.h"
 
 #include <epoxy/glx.h>
 #include <fixx11h.h>

src/backends/x11/standalone/x11_standalone_overlaywindow.cpp

@@ -10,7 +10,7 @@
 #include "x11_standalone_overlaywindow.h"
 
 #include "composite.h"
-#include "kwinglobals.h"
+#include "libkwineffects/kwinglobals.h"
 #include "scene/workspacescene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"

src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "vsyncmonitor.h"
+#include "platformsupport/vsyncconvenience/vsyncmonitor.h"
 
 #include <epoxy/glx.h>
 #include <fixx11h.h>

src/backends/x11/standalone/x11_standalone_xinputintegration.cpp

@@ -19,10 +19,10 @@
 #include "../common/ge_event_mem_mover.h"
 
 #include "input.h"
+#include "libkwineffects/kwinglobals.h"
 #include "modifier_only_shortcuts.h"
 #include "workspace.h"
 #include "x11eventfilter.h"
-#include <kwinglobals.h>
 
 #include <X11/extensions/XI2proto.h>
 #include <X11/extensions/XInput2.h>

src/backends/x11/windowed/x11_windowed_egl_backend.cpp

@@ -12,8 +12,8 @@
 #include "x11_windowed_output.h"
 #include "../../drm/gbm_dmabuf.h"
 
-#include "basiceglsurfacetexture_internal.h"
-#include "basiceglsurfacetexture_wayland.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_internal.h"
+#include "platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.h"
 
 #include <drm_fourcc.h>
 #include <gbm.h>

src/backends/x11/windowed/x11_windowed_egl_backend.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "core/outputlayer.h"
-#include "kwinglutils.h"
+#include "libkwineffects/kwinglutils.h"
 #include "platformsupport/scenes/opengl/abstract_egl_backend.h"
 
 #include <QMap>

src/backends/x11/windowed/x11_windowed_output.cpp

@@ -17,7 +17,7 @@
 #include "core/renderlayer.h"
 #include "core/renderloop_p.h"
 #include "cursorsource.h"
-#include "renderviewport.h"
+#include "libkwineffects/renderviewport.h"
 #include "scene/cursorscene.h"
 
 #include <NETWM>

src/backends/x11/windowed/x11_windowed_qpainter_backend.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "core/outputlayer.h"
-#include "qpainterbackend.h"
+#include "platformsupport/scenes/qpainter/qpainterbackend.h"
 
 #include <QImage>
 #include <QObject>

src/colors/colordevice.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 
 #include <QObject>
 #include <memory>

src/colors/colormanager.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "kwinglobals.h"
+#include "libkwineffects/kwinglobals.h"
 
 #include <QObject>
 #include <memory>

src/composite.cpp

@@ -23,8 +23,8 @@
 #include "effects.h"
 #include "ftrace.h"
 #include "internalwindow.h"
-#include "openglbackend.h"
-#include "qpainterbackend.h"
+#include "platformsupport/scenes/opengl/openglbackend.h"
+#include "platformsupport/scenes/qpainter/qpainterbackend.h"
 #include "scene/cursorscene.h"
 #include "scene/itemrenderer_opengl.h"
 #include "scene/itemrenderer_qpainter.h"
@@ -42,8 +42,8 @@
 #include "x11syncmanager.h"
 #include "x11window.h"
 
-#include <kwinglplatform.h>
-#include <kwingltexture.h>
+#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/kwingltexture.h"
 
 #include <KCrash>
 #include <KGlobalAccel>

src/composite.h

@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 
 #include <QObject>
 #include <QRegion>

src/core/outputbackend.cpp

@@ -11,10 +11,10 @@
 
 #include "dmabuftexture.h"
 #include "inputbackend.h"
-#include "openglbackend.h"
 #include "output.h"
 #include "outputconfiguration.h"
-#include "qpainterbackend.h"
+#include "platformsupport/scenes/opengl/openglbackend.h"
+#include "platformsupport/scenes/qpainter/qpainterbackend.h"
 
 namespace KWin
 {

src/core/outputbackend.h

@@ -9,9 +9,9 @@
 
 #pragma once
 
+#include "libkwineffects/kwinglobals.h"
 #include <epoxy/egl.h>
 #include <kwin_export.h>
-#include <kwinglobals.h>
 
 #include <QObject>
 

src/core/outputlayer.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "kwin_export.h"
-#include "rendertarget.h"
+#include "libkwineffects/rendertarget.h"
 
 #include <QObject>
 #include <QRegion>

src/core/renderbackend.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "kwinglobals.h"
-#include "rendertarget.h"
+#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/rendertarget.h"
 
 #include <QObject>
 

src/core/renderjournal.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "kwinglobals.h"
+#include "libkwineffects/kwinglobals.h"
 
 #include <QElapsedTimer>
 #include <QQueue>

src/core/renderloop.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "kwinglobals.h"
+#include "libkwineffects/kwinglobals.h"
 #include "options.h"
 
 #include <QObject>

src/core/session.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 
 #include <QObject>
 #include <QString>

src/cursor.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 // kwin
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 // Qt
 #include <QHash>
 #include <QObject>

src/cursordelegate_opengl.cpp

@@ -9,10 +9,10 @@
 #include "core/output.h"
 #include "core/renderlayer.h"
 #include "cursor.h"
-#include "kwingltexture.h"
-#include "kwinglutils.h"
-#include "rendertarget.h"
-#include "renderviewport.h"
+#include "libkwineffects/kwingltexture.h"
+#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/rendertarget.h"
+#include "libkwineffects/renderviewport.h"
 #include "scene/cursorscene.h"
 
 #include <cmath>

src/cursordelegate_qpainter.cpp

@@ -9,8 +9,8 @@
 #include "core/output.h"
 #include "core/renderlayer.h"
 #include "cursor.h"
-#include "rendertarget.h"
-#include "renderviewport.h"
+#include "libkwineffects/rendertarget.h"
+#include "libkwineffects/renderviewport.h"
 #include "scene/cursorscene.h"
 
 #include <QPainter>

src/debug_console.cpp

@@ -12,6 +12,8 @@
 #include "input_event.h"
 #include "internalwindow.h"
 #include "keyboard_input.h"
+#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/kwinglutils.h"
 #include "main.h"
 #include "platformsupport/scenes/opengl/openglbackend.h"
 #include "unmanaged.h"
@@ -33,8 +35,6 @@
 #include "x11window.h"
 #include "xkb.h"
 #include <cerrno>
-#include <kwinglplatform.h>
-#include <kwinglutils.h>
 
 #include "ui_debug_console.h"
 

src/decorations/decorationbridge.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include <kwinglobals.h>
+#include "libkwineffects/kwinglobals.h"
 
 #include <KDecoration2/Private/DecorationBridge>
 

src/dmabuftexture.cpp

@@ -6,7 +6,7 @@
 
 #include "dmabuftexture.h"
 
-#include "kwinglutils.h"
+#include "libkwineffects/kwinglutils.h"
 
 #include <unistd.h>
 

src/effectloader.cpp

@@ -11,10 +11,10 @@
 // config
 #include <config-kwin.h>
 // KWin
+#include "libkwineffects/kwineffects.h"
 #include "plugin.h"
 #include "scripting/scriptedeffect.h"
 #include "utils/common.h"
-#include <kwineffects.h>
 // KDE
 #include <KConfigGroup>
 #include <KPackage/Package>

src/effects.cpp

@@ -31,7 +31,7 @@
 #include "unmanaged.h"
 #include "x11window.h"
 #if KWIN_BUILD_TABBOX
-#include "tabbox.h"
+#include "tabbox/tabbox.h"
 #endif
 #include "screenedge.h"
 #include "scripting/scriptedeffect.h"

src/effects.h

@@ -10,9 +10,9 @@
 
 #pragma once
 
-#include "kwineffects.h"
+#include "libkwineffects/kwineffects.h"
 
-#include "kwinoffscreenquickview.h"
+#include "libkwineffects/kwinoffscreenquickview.h"
 #include "scene/workspacescene.h"
 
 #include <QFont>

src/effects/backgroundcontrast/contrast.cpp

@@ -10,8 +10,8 @@
 #include "contrastshader.h"
 // KConfigSkeleton
 
-#include "rendertarget.h"
-#include "renderviewport.h"
+#include "libkwineffects/rendertarget.h"
+#include "libkwineffects/renderviewport.h"
 #include "utils/xcbutils.h"
 #include "wayland/contrast_interface.h"
 #include "wayland/display.h"

src/effects/backgroundcontrast/contrast.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <kwineffects.h>
-#include <kwinglplatform.h>
-#include <kwinglutils.h>
+#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/kwinglutils.h"
 
 #include <QVector2D>
 #include <QVector>

src/effects/backgroundcontrast/contrastshader.cpp

@@ -7,8 +7,8 @@
 
 #include "contrastshader.h"
 
-#include <kwineffects.h>
-#include <kwinglplatform.h>
+#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/kwinglplatform.h"
 
 #include <QByteArray>
 #include <QMatrix4x4>

src/effects/backgroundcontrast/contrastshader.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <kwinglutils.h>
+#include "libkwineffects/kwinglutils.h"
 
 class QMatrix4x4;
 

src/effects/blendchanges/blendchanges.cpp

@@ -8,7 +8,7 @@
 */
 // own
 #include "blendchanges.h"
-#include "kwinglutils.h"
+#include "libkwineffects/kwinglutils.h"
 
 #include <QDBusConnection>
 #include <QTimer>

src/effects/blendchanges/blendchanges.h

@@ -7,9 +7,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
+#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/kwinoffscreeneffect.h"
 #include <chrono>
-#include <kwinoffscreeneffect.h>
-#include <kwineffects.h>
 
 namespace KWin
 {

src/effects/blur/blur.cpp

@@ -11,8 +11,8 @@
 // KConfigSkeleton
 #include "blurconfig.h"
 
-#include "rendertarget.h"
-#include "renderviewport.h"
+#include "libkwineffects/rendertarget.h"
+#include "libkwineffects/renderviewport.h"
 #include "utils/xcbutils.h"
 #include "wayland/blur_interface.h"
 #include "wayland/display.h"

src/effects/blur/blur.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <kwineffects.h>
-#include <kwinglplatform.h>
-#include <kwinglutils.h>
+#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/kwinglplatform.h"
+#include "libkwineffects/kwinglutils.h"
 
 #include <QStack>
 #include <QVector2D>

src/effects/blur/blurshader.cpp

@@ -7,7 +7,7 @@
 
 #include "blurshader.h"
 
-#include <kwineffects.h>
+#include "libkwineffects/kwineffects.h"
 
 static void ensureResources()
 {

src/effects/blur/blurshader.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <kwinglutils.h>
+#include "libkwineffects/kwinglutils.h"
 
 #include <QMatrix4x4>
 #include <QObject>

src/effects/colorpicker/colorpicker.cpp

@@ -7,13 +7,13 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "colorpicker.h"
+#include "libkwineffects/kwinglutils.h"
+#include "libkwineffects/kwinglutils_funcs.h"
+#include "libkwineffects/rendertarget.h"
+#include "libkwineffects/renderviewport.h"
 #include <KLocalizedString>
 #include <QDBusConnection>
 #include <QDBusMetaType>
-#include <kwinglutils.h>
-#include <kwinglutils_funcs.h>
-#include <rendertarget.h>
-#include <renderviewport.h>
 
 Q_DECLARE_METATYPE(QColor)
 

src/effects/colorpicker/colorpicker.h

@@ -8,12 +8,12 @@
 */
 #pragma once
 
+#include "libkwineffects/kwineffects.h"
 #include <QColor>
 #include <QDBusContext>
 #include <QDBusMessage>
 #include <QDBusUnixFileDescriptor>
 #include <QObject>
-#include <kwineffects.h>
 
 namespace KWin
 {

src/effects/desktopgrid/desktopgrideffect.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <kwinquickeffect.h>
+#include "libkwineffects/kwinquickeffect.h"
 
 namespace KWin
 {

src/effects/diminactive/diminactive.h

@@ -12,7 +12,7 @@
 #pragma once
 
 // kwineffects
-#include <kwineffects.h>
+#include "libkwineffects/kwineffects.h"
 
 namespace KWin
 {

src/effects/fallapart/fallapart.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <kwinoffscreeneffect.h>
+#include "libkwineffects/kwinoffscreeneffect.h"
 
 namespace KWin
 {

src/effects/glide/glide.cpp

@@ -16,8 +16,8 @@
 // KConfigSkeleton
 #include "glideconfig.h"
 
-#include "rendertarget.h"
-#include "renderviewport.h"
+#include "libkwineffects/rendertarget.h"
+#include "libkwineffects/renderviewport.h"
 
 // Qt
 #include <QMatrix4x4>

src/effects/glide/glide.h

@@ -13,7 +13,7 @@
 #pragma once
 
 // kwineffects
-#include <kwineffects.h>
+#include "libkwineffects/kwineffects.h"
 
 namespace KWin
 {