From 2ac86115233f63624a97f2c3b18b1f41ecb29917 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Fri, 23 Oct 2020 21:37:16 +0200
Subject: [PATCH] If include is define in .h remove it if it's defined in .cpp
 too (scripted)

---
 abstract_client.cpp                                    | 1 -
 activities.cpp                                         | 1 -
 autotests/drm/mock_drm.cpp                             | 1 -
 autotests/libinput/mock_libinput.cpp                   | 1 -
 cursor.cpp                                             | 1 -
 decorations/decoratedclient.cpp                        | 1 -
 decorations/decorationpalette.cpp                      | 3 ---
 effectloader.cpp                                       | 1 -
 effects/blur/blurshader.cpp                            | 1 -
 effects/coverswitch/coverswitch.cpp                    | 2 --
 effects/cube/cube.cpp                                  | 2 --
 effects/cubeslide/cubeslide.cpp                        | 1 -
 effects/flipswitch/flipswitch.cpp                      | 2 --
 effects/mouseclick/mouseclick.cpp                      | 2 --
 effects/mousemark/mousemark.cpp                        | 1 -
 effects/screenshot/screenshot.cpp                      | 1 -
 effects/startupfeedback/startupfeedback.cpp            | 1 -
 inputmethod.cpp                                        | 1 -
 kcmkwin/kwinrules/rulesmodel.cpp                       | 1 -
 libkwineffects/kwineffectquickview.cpp                 | 2 --
 libkwineffects/kwineffects.cpp                         | 2 --
 libkwineffects/kwingltexture.cpp                       | 1 -
 logind.cpp                                             | 1 -
 main.cpp                                               | 2 --
 placement.cpp                                          | 1 -
 platformsupport/scenes/opengl/abstract_egl_backend.cpp | 1 -
 plugins/platforms/drm/drm_backend.cpp                  | 1 -
 plugins/platforms/drm/drm_output.cpp                   | 2 --
 plugins/platforms/drm/egl_stream_backend.cpp           | 3 ---
 plugins/platforms/hwcomposer/hwcomposer_backend.cpp    | 1 -
 plugins/platforms/wayland/wayland_backend.cpp          | 1 -
 plugins/platforms/x11/standalone/glxbackend.cpp        | 2 --
 screencast/pipewirecore.cpp                            | 1 -
 screenedge.cpp                                         | 1 -
 scripting/scripting.cpp                                | 1 -
 tabbox/clientmodel.cpp                                 | 1 -
 tabbox/tabboxhandler.cpp                               | 2 --
 tablet_input.cpp                                       | 1 -
 toplevel.cpp                                           | 1 -
 touch_input.cpp                                        | 1 -
 useractions.cpp                                        | 1 -
 xdgshellclient.cpp                                     | 1 -
 xwl/xwayland.cpp                                       | 1 -
 43 files changed, 57 deletions(-)

diff --git a/abstract_client.cpp b/abstract_client.cpp
index 8969d291a1..35b7fcb619 100644
--- a/abstract_client.cpp
+++ b/abstract_client.cpp
@@ -13,7 +13,6 @@
 #include "decorations/decoratedclient.h"
 #include "decorations/decorationpalette.h"
 #include "decorations/decorationbridge.h"
-#include "cursor.h"
 #include "effects.h"
 #include "focuschain.h"
 #include "outline.h"
diff --git a/activities.cpp b/activities.cpp
index 54e8f8975f..bae5f54af8 100644
--- a/activities.cpp
+++ b/activities.cpp
@@ -12,7 +12,6 @@
 #include "workspace.h"
 // KDE
 #include <KConfigGroup>
-#include <kactivities/controller.h>
 // Qt
 #include <QtConcurrentRun>
 #include <QDBusInterface>
diff --git a/autotests/drm/mock_drm.cpp b/autotests/drm/mock_drm.cpp
index 40fef6e97e..74535a1a4e 100644
--- a/autotests/drm/mock_drm.cpp
+++ b/autotests/drm/mock_drm.cpp
@@ -9,7 +9,6 @@
 #include "mock_drm.h"
 
 #include <QMap>
-#include <QVector>
 
 static QMap<int, QVector<_drmModeProperty>> s_drmProperties{};
 
diff --git a/autotests/libinput/mock_libinput.cpp b/autotests/libinput/mock_libinput.cpp
index d854b44687..6c69227330 100644
--- a/autotests/libinput/mock_libinput.cpp
+++ b/autotests/libinput/mock_libinput.cpp
@@ -6,7 +6,6 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include <libinput.h>
 #include "mock_libinput.h"
 #include <config-kwin.h>
 
diff --git a/cursor.cpp b/cursor.cpp
index ed3f153a0f..bb9555f259 100644
--- a/cursor.cpp
+++ b/cursor.cpp
@@ -9,7 +9,6 @@
 
 #include "cursor.h"
 // kwin
-#include <kwinglobals.h>
 #include "input.h"
 #include "keyboard_input.h"
 #include "main.h"
diff --git a/decorations/decoratedclient.cpp b/decorations/decoratedclient.cpp
index 6ef1f0076a..d33a8884a0 100644
--- a/decorations/decoratedclient.cpp
+++ b/decorations/decoratedclient.cpp
@@ -13,7 +13,6 @@
 #include "abstract_client.h"
 #include "composite.h"
 #include "cursor.h"
-#include "options.h"
 #include "platform.h"
 #include "workspace.h"
 
diff --git a/decorations/decorationpalette.cpp b/decorations/decorationpalette.cpp
index ae16e083a8..e5d8385f65 100644
--- a/decorations/decorationpalette.cpp
+++ b/decorations/decorationpalette.cpp
@@ -14,10 +14,7 @@
 #include "decorations_logging.h"
 
 #include <KConfigGroup>
-#include <KSharedConfig>
-#include <KColorScheme>
 
-#include <QPalette>
 #include <QFileInfo>
 #include <QStandardPaths>
 
diff --git a/effectloader.cpp b/effectloader.cpp
index d27a29da23..e1063155dc 100644
--- a/effectloader.cpp
+++ b/effectloader.cpp
@@ -23,7 +23,6 @@
 #include <QtConcurrentRun>
 #include <QDebug>
 #include <QFutureWatcher>
-#include <QMap>
 #include <QStringList>
 
 namespace KWin
diff --git a/effects/blur/blurshader.cpp b/effects/blur/blurshader.cpp
index fc9fc778e9..457290954e 100644
--- a/effects/blur/blurshader.cpp
+++ b/effects/blur/blurshader.cpp
@@ -9,7 +9,6 @@
 
 #include <kwineffects.h>
 #include <kwinglplatform.h>
-#include <kwinglutils.h>
 
 #include <QByteArray>
 #include <QTextStream>
diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp
index d92487e0e6..db8f6d12d4 100644
--- a/effects/coverswitch/coverswitch.cpp
+++ b/effects/coverswitch/coverswitch.cpp
@@ -12,7 +12,6 @@
 
 #include <kwinconfig.h>
 #include <QFile>
-#include <QFont>
 #include <QIcon>
 #include <QMatrix4x4>
 #include <QMouseEvent>
@@ -20,7 +19,6 @@
 #include <KLocalizedString>
 #include <kcolorscheme.h>
 
-#include <kwinglutils.h>
 #include <kwinglplatform.h>
 
 #include <cmath>
diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp
index dc491b38b0..9aa45f8a8c 100644
--- a/effects/cube/cube.cpp
+++ b/effects/cube/cube.cpp
@@ -10,7 +10,6 @@
 // KConfigSkeleton
 #include "cubeconfig.h"
 
-#include "cube_inside.h"
 
 #include <QAction>
 #include <KGlobalAccel>
@@ -30,7 +29,6 @@
 
 #include <cmath>
 
-#include <kwinglutils.h>
 #include <kwinglplatform.h>
 
 namespace KWin
diff --git a/effects/cubeslide/cubeslide.cpp b/effects/cubeslide/cubeslide.cpp
index 2f4cb303f6..a32714a33f 100644
--- a/effects/cubeslide/cubeslide.cpp
+++ b/effects/cubeslide/cubeslide.cpp
@@ -12,7 +12,6 @@
 #include "cubeslideconfig.h"
 
 #include <kwinconfig.h>
-#include <kwinglutils.h>
 
 #include <QVector3D>
 
diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp
index 15e6ccdd55..bdc175f9ac 100644
--- a/effects/flipswitch/flipswitch.cpp
+++ b/effects/flipswitch/flipswitch.cpp
@@ -12,9 +12,7 @@
 
 #include <QAction>
 #include <kwinconfig.h>
-#include <QFont>
 #include <QKeyEvent>
-#include <QMatrix4x4>
 
 #include <KGlobalAccel>
 #include <KLocalizedString>
diff --git a/effects/mouseclick/mouseclick.cpp b/effects/mouseclick/mouseclick.cpp
index 1ce5af2352..01a335bdd3 100644
--- a/effects/mouseclick/mouseclick.cpp
+++ b/effects/mouseclick/mouseclick.cpp
@@ -12,10 +12,8 @@
 #include "mouseclickconfig.h"
 
 #include <QAction>
-#include <kwinglutils.h>
 
 #ifdef KWIN_HAVE_XRENDER_COMPOSITING
-#include <kwinxrenderutils.h>
 #include <xcb/xcb.h>
 #include <xcb/render.h>
 #endif
diff --git a/effects/mousemark/mousemark.cpp b/effects/mousemark/mousemark.cpp
index 738c187511..73eaa2881f 100644
--- a/effects/mousemark/mousemark.cpp
+++ b/effects/mousemark/mousemark.cpp
@@ -16,7 +16,6 @@
 #include <QAction>
 #include <kwinconfig.h>
 #include <kwinglplatform.h>
-#include <kwinglutils.h>
 #include <KGlobalAccel>
 #include <KLocalizedString>
 
diff --git a/effects/screenshot/screenshot.cpp b/effects/screenshot/screenshot.cpp
index 58e4dc4a88..b2f2698e77 100644
--- a/effects/screenshot/screenshot.cpp
+++ b/effects/screenshot/screenshot.cpp
@@ -15,7 +15,6 @@
 #include <QDataStream>
 #include <QTemporaryFile>
 #include <QDir>
-#include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QDBusReply>
 #include <QVarLengthArray>
diff --git a/effects/startupfeedback/startupfeedback.cpp b/effects/startupfeedback/startupfeedback.cpp
index 065d5dd238..d3fce09cad 100644
--- a/effects/startupfeedback/startupfeedback.cpp
+++ b/effects/startupfeedback/startupfeedback.cpp
@@ -17,7 +17,6 @@
 // KDE
 #include <KConfigGroup>
 #include <KSharedConfig>
-#include <KStartupInfo>
 #include <KSelectionOwner>
 #include <KWindowSystem>
 // KWin
diff --git a/inputmethod.cpp b/inputmethod.cpp
index 02226b4494..9c70d8d4f1 100644
--- a/inputmethod.cpp
+++ b/inputmethod.cpp
@@ -18,7 +18,6 @@
 
 #include <KWaylandServer/display.h>
 #include <KWaylandServer/seat_interface.h>
-#include <KWaylandServer/textinput_v2_interface.h>
 #include <KWaylandServer/textinput_v3_interface.h>
 #include <KWaylandServer/surface_interface.h>
 #include <KWaylandServer/inputmethod_v1_interface.h>
diff --git a/kcmkwin/kwinrules/rulesmodel.cpp b/kcmkwin/kwinrules/rulesmodel.cpp
index 9ae8c801c8..7691ce68c5 100644
--- a/kcmkwin/kwinrules/rulesmodel.cpp
+++ b/kcmkwin/kwinrules/rulesmodel.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "rulesmodel.h"
-#include <rules.h>
 
 #include <QFileInfo>
 #include <QIcon>
diff --git a/libkwineffects/kwineffectquickview.cpp b/libkwineffects/kwineffectquickview.cpp
index b2554cfc5e..dae215532d 100644
--- a/libkwineffects/kwineffectquickview.cpp
+++ b/libkwineffects/kwineffectquickview.cpp
@@ -10,7 +10,6 @@
 #include "kwineffectquickview.h"
 
 #include "kwinglutils.h"
-#include "kwineffects.h"
 #include "logging_p.h"
 
 #include <QQmlEngine>
@@ -19,7 +18,6 @@
 #include <QQmlComponent>
 #include <QQuickView>
 #include <QQuickRenderControl>
-#include <QUrl>
 
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
diff --git a/libkwineffects/kwineffects.cpp b/libkwineffects/kwineffects.cpp
index f53086e283..d03122a10d 100644
--- a/libkwineffects/kwineffects.cpp
+++ b/libkwineffects/kwineffects.cpp
@@ -17,12 +17,10 @@
 #endif
 
 #include <QVariant>
-#include <QList>
 #include <QTimeLine>
 #include <QFontMetrics>
 #include <QPainter>
 #include <QPixmap>
-#include <QVector2D>
 #include <QGraphicsRotation>
 #include <QGraphicsScale>
 #include <QtMath>
diff --git a/libkwineffects/kwingltexture.cpp b/libkwineffects/kwingltexture.cpp
index 195980e45f..f55a83e7ce 100644
--- a/libkwineffects/kwingltexture.cpp
+++ b/libkwineffects/kwingltexture.cpp
@@ -22,7 +22,6 @@
 #include <QVector2D>
 #include <QVector3D>
 #include <QVector4D>
-#include <QMatrix4x4>
 
 namespace KWin
 {
diff --git a/logind.cpp b/logind.cpp
index 005d162314..fb9211789a 100644
--- a/logind.cpp
+++ b/logind.cpp
@@ -10,7 +10,6 @@
 
 #include <QCoreApplication>
 #include <QDebug>
-#include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QDBusPendingCallWatcher>
 #include <QDBusServiceWatcher>
diff --git a/main.cpp b/main.cpp
index e300226470..c6c13f77f3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,7 +9,6 @@
 */
 
 #include "main.h"
-#include <config-kwin.h>
 // kwin
 #include "platform.h"
 #include "atoms.h"
@@ -30,7 +29,6 @@
 #include <KAboutData>
 #include <KLocalizedString>
 #include <KPluginMetaData>
-#include <KSharedConfig>
 #include <KWaylandServer/surface_interface.h>
 // Qt
 #include <qplatformdefs.h>
diff --git a/placement.cpp b/placement.cpp
index 590903cb02..9c6f5ac188 100644
--- a/placement.cpp
+++ b/placement.cpp
@@ -20,7 +20,6 @@
 #include "screens.h"
 #endif
 
-#include <QRect>
 #include <QTextStream>
 #include <QTimer>
 
diff --git a/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/platformsupport/scenes/opengl/abstract_egl_backend.cpp
index 36feab1070..542b973d51 100644
--- a/platformsupport/scenes/opengl/abstract_egl_backend.cpp
+++ b/platformsupport/scenes/opengl/abstract_egl_backend.cpp
@@ -9,7 +9,6 @@
 #include "abstract_egl_backend.h"
 #include "egl_dmabuf.h"
 #include "kwineglext.h"
-#include "texture.h"
 #include "composite.h"
 #include "egl_context_attribute_builder.h"
 #include "options.h"
diff --git a/plugins/platforms/drm/drm_backend.cpp b/plugins/platforms/drm/drm_backend.cpp
index 8a3ed45f27..4fba2ace4e 100644
--- a/plugins/platforms/drm/drm_backend.cpp
+++ b/plugins/platforms/drm/drm_backend.cpp
@@ -44,7 +44,6 @@
 #include <unistd.h>
 // drm
 #include <xf86drm.h>
-#include <xf86drmMode.h>
 #include <libdrm/drm_mode.h>
 
 #include "drm_gpu.h"
diff --git a/plugins/platforms/drm/drm_output.cpp b/plugins/platforms/drm/drm_output.cpp
index 62c9df8663..75dca58678 100644
--- a/plugins/platforms/drm/drm_output.cpp
+++ b/plugins/platforms/drm/drm_output.cpp
@@ -8,7 +8,6 @@
 */
 #include "drm_output.h"
 #include "drm_backend.h"
-#include "drm_object_plane.h"
 #include "drm_object_crtc.h"
 #include "drm_object_connector.h"
 
@@ -33,7 +32,6 @@
 #include <cerrno>
 // drm
 #include <xf86drm.h>
-#include <xf86drmMode.h>
 #include <libdrm/drm_mode.h>
 
 #include "drm_gpu.h"
diff --git a/plugins/platforms/drm/egl_stream_backend.cpp b/plugins/platforms/drm/egl_stream_backend.cpp
index ab6d25c21f..debd3eb8eb 100644
--- a/plugins/platforms/drm/egl_stream_backend.cpp
+++ b/plugins/platforms/drm/egl_stream_backend.cpp
@@ -20,12 +20,9 @@
 #include "wayland_server.h"
 #include <kwinglplatform.h>
 #include <QOpenGLContext>
-#include <KWaylandServer/surface_interface.h>
 #include <KWaylandServer/buffer_interface.h>
-#include <KWaylandServer/eglstream_controller_interface.h>
 #include <KWaylandServer/display.h>
 #include <KWaylandServer/resource.h>
-#include <wayland-server-core.h>
 #include "drm_gpu.h"
 
 namespace KWin
diff --git a/plugins/platforms/hwcomposer/hwcomposer_backend.cpp b/plugins/platforms/hwcomposer/hwcomposer_backend.cpp
index 411010b7d3..196ea3718b 100644
--- a/plugins/platforms/hwcomposer/hwcomposer_backend.cpp
+++ b/plugins/platforms/hwcomposer/hwcomposer_backend.cpp
@@ -11,7 +11,6 @@
 #include "logging.h"
 #include "screens_hwcomposer.h"
 #include "composite.h"
-#include "input.h"
 #include "main.h"
 #include "wayland_server.h"
 // KWayland
diff --git a/plugins/platforms/wayland/wayland_backend.cpp b/plugins/platforms/wayland/wayland_backend.cpp
index ae3d35e5b8..d12e1d55af 100644
--- a/plugins/platforms/wayland/wayland_backend.cpp
+++ b/plugins/platforms/wayland/wayland_backend.cpp
@@ -9,7 +9,6 @@
 */
 #include "wayland_backend.h"
 
-#include <config-kwin.h>
 
 #if HAVE_WAYLAND_EGL
 #include "egl_wayland_backend.h"
diff --git a/plugins/platforms/x11/standalone/glxbackend.cpp b/plugins/platforms/x11/standalone/glxbackend.cpp
index 109619947c..d0d454c6df 100644
--- a/plugins/platforms/x11/standalone/glxbackend.cpp
+++ b/plugins/platforms/x11/standalone/glxbackend.cpp
@@ -23,7 +23,6 @@
 #include "scene.h"
 #include "screens.h"
 #include "xcbutils.h"
-#include "texture.h"
 // kwin libs
 #include <kwinglplatform.h>
 #include <kwinglutils.h>
@@ -61,7 +60,6 @@ typedef struct xcb_glx_buffer_swap_complete_event_t {
 #endif
 
 #include <tuple>
-#include <memory>
 
 namespace KWin
 {
diff --git a/screencast/pipewirecore.cpp b/screencast/pipewirecore.cpp
index b386ed540c..32b480e54d 100644
--- a/screencast/pipewirecore.cpp
+++ b/screencast/pipewirecore.cpp
@@ -11,7 +11,6 @@
 
 #include <KLocalizedString>
 
-#include <QDebug>
 #include <QSocketNotifier>
 
 namespace KWin
diff --git a/screenedge.cpp b/screenedge.cpp
index db61900814..b81d7e2e42 100644
--- a/screenedge.cpp
+++ b/screenedge.cpp
@@ -40,7 +40,6 @@
 #include <QMouseEvent>
 #include <QSharedPointer>
 #include <QTimer>
-#include <QVector>
 #include <QTextStream>
 #include <QDBusInterface>
 #include <QDBusPendingCall>
diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp
index 7f3b2fe9d1..11645dfba5 100644
--- a/scripting/scripting.cpp
+++ b/scripting/scripting.cpp
@@ -26,7 +26,6 @@
 #include <KPackage/PackageLoader>
 // Qt
 #include <QDBusConnection>
-#include <QDBusMessage>
 #include <QDBusPendingCallWatcher>
 #include <QDebug>
 #include <QFutureWatcher>
diff --git a/tabbox/clientmodel.cpp b/tabbox/clientmodel.cpp
index d28d27a2f2..ac8ea2a97d 100644
--- a/tabbox/clientmodel.cpp
+++ b/tabbox/clientmodel.cpp
@@ -11,7 +11,6 @@
 #include "clientmodel.h"
 // tabbox
 #include "tabboxconfig.h"
-#include "tabboxhandler.h"
 // Qt
 #include <QIcon>
 #include <QUuid>
diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index d14d2c42f8..ee70e51aab 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -15,14 +15,12 @@
 // tabbox
 #include "clientmodel.h"
 #include "desktopmodel.h"
-#include "tabboxconfig.h"
 #include "thumbnailitem.h"
 #include "scripting/scripting.h"
 #include "switcheritem.h"
 #include "tabbox_logging.h"
 // Qt
 #include <QKeyEvent>
-#include <QModelIndex>
 #include <QStandardPaths>
 #include <QTimer>
 #include <QQmlContext>
diff --git a/tablet_input.cpp b/tablet_input.cpp
index 457a5aa486..4af28fdae7 100644
--- a/tablet_input.cpp
+++ b/tablet_input.cpp
@@ -9,7 +9,6 @@
 #include "tablet_input.h"
 #include "abstract_client.h"
 #include "decorations/decoratedclient.h"
-#include "input.h"
 #include "input_event.h"
 #include "input_event_spy.h"
 #include "libinput/device.h"
diff --git a/toplevel.cpp b/toplevel.cpp
index 126c8165ed..329f058a04 100644
--- a/toplevel.cpp
+++ b/toplevel.cpp
@@ -19,7 +19,6 @@
 #include "screens.h"
 #include "shadow.h"
 #include "workspace.h"
-#include "xcbutils.h"
 
 #include <KWaylandServer/surface_interface.h>
 
diff --git a/touch_input.cpp b/touch_input.cpp
index 5fdbac9a8f..269fc9521b 100644
--- a/touch_input.cpp
+++ b/touch_input.cpp
@@ -9,7 +9,6 @@
 */
 #include "touch_input.h"
 #include "abstract_client.h"
-#include "input.h"
 #include "pointer_input.h"
 #include "input_event_spy.h"
 #include "toplevel.h"
diff --git a/useractions.cpp b/useractions.cpp
index 46657c5b5e..885237adc5 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -46,7 +46,6 @@
 #include <QAction>
 #include <QCheckBox>
 #include <QtConcurrentRun>
-#include <QPointer>
 #include <QPushButton>
 
 #include <KGlobalAccel>
diff --git a/xdgshellclient.cpp b/xdgshellclient.cpp
index 494cc7dfc5..20375081af 100644
--- a/xdgshellclient.cpp
+++ b/xdgshellclient.cpp
@@ -27,7 +27,6 @@
 #include <KWaylandServer/server_decoration_palette_interface.h>
 #include <KWaylandServer/surface_interface.h>
 #include <KWaylandServer/xdgdecoration_v1_interface.h>
-#include <KWaylandServer/xdgshell_interface.h>
 
 using namespace KWaylandServer;
 
diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp
index 5bb08b1620..57efddea04 100644
--- a/xwl/xwayland.cpp
+++ b/xwl/xwayland.cpp
@@ -24,7 +24,6 @@
 
 #include <QAbstractEventDispatcher>
 #include <QFile>
-#include <QFutureWatcher>
 #include <QTimer>
 #include <QtConcurrentRun>