From a3cff85e7aec126e089a1ee7685fa1ebfd84813a Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Tue, 5 Jun 2018 11:52:57 +0100
Subject: [PATCH] Remove Qt module declarations in includes

Summary:
Test Plan: Compiles

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D13359
---
 autotests/integration/kwin_wayland_test.h           | 2 +-
 autotests/libinput/context_test.cpp                 | 2 +-
 autotests/libinput/device_test.cpp                  | 2 +-
 autotests/libinput/gesture_event_test.cpp           | 2 +-
 autotests/libinput/input_event_test.cpp             | 2 +-
 autotests/libinput/key_event_test.cpp               | 2 +-
 autotests/libinput/pointer_event_test.cpp           | 2 +-
 autotests/libinput/switch_event_test.cpp            | 2 +-
 autotests/libinput/touch_event_test.cpp             | 2 +-
 autotests/libkwineffects/kwinglplatformtest.cpp     | 2 +-
 autotests/libkwineffects/windowquadlisttest.cpp     | 2 +-
 autotests/libxrenderutils/blendpicture_test.cpp     | 2 +-
 autotests/opengl_context_attribute_builder_test.cpp | 2 +-
 autotests/tabbox/test_tabbox_clientmodel.cpp        | 2 +-
 autotests/tabbox/test_tabbox_config.cpp             | 2 +-
 autotests/tabbox/test_tabbox_handler.cpp            | 2 +-
 autotests/test_builtin_effectloader.cpp             | 2 +-
 autotests/test_client_machine.cpp                   | 2 +-
 autotests/test_gbm_surface.cpp                      | 2 +-
 autotests/test_gestures.cpp                         | 2 +-
 autotests/test_plugin_effectloader.cpp              | 2 +-
 autotests/test_screen_edges.cpp                     | 2 +-
 autotests/test_screen_paint_data.cpp                | 4 ++--
 autotests/test_screens.cpp                          | 2 +-
 autotests/test_scripted_effectloader.cpp            | 2 +-
 autotests/test_virtual_desktops.cpp                 | 2 +-
 autotests/test_virtualkeyboard_dbus.cpp             | 2 +-
 autotests/test_window_paint_data.cpp                | 4 ++--
 autotests/test_xcb_size_hints.cpp                   | 2 +-
 autotests/test_xcb_window.cpp                       | 2 +-
 autotests/test_xcb_wrapper.cpp                      | 2 +-
 autotests/test_xkb.cpp                              | 2 +-
 autotests/test_xrandr_screens.cpp                   | 2 +-
 colorcorrection/colorcorrectdbusinterface.h         | 2 +-
 data/update_default_rules.cpp                       | 4 ++--
 dbusinterface.h                                     | 2 +-
 effects/desktopgrid/desktopgrid.cpp                 | 2 +-
 effects/minimizeanimation/minimizeanimation.cpp     | 2 +-
 effects/resize/resize.cpp                           | 2 +-
 effects/screenshot/screenshot.cpp                   | 8 ++++----
 effects/startupfeedback/startupfeedback.cpp         | 4 ++--
 effects/zoom/zoom.cpp                               | 4 ++--
 kcmkwin/kwincompositing/test/modeltest.cpp          | 4 ++--
 kcmkwin/kwincompositing/test/modeltest.h            | 6 +++---
 kcmkwin/kwinoptions/main.cpp                        | 2 +-
 kcmkwin/kwinoptions/mouse.cpp                       | 2 +-
 kcmkwin/kwinoptions/windows.cpp                     | 2 +-
 kcmkwin/kwinrules/kcm.cpp                           | 2 +-
 kcmkwin/kwinrules/main.cpp                          | 2 +-
 kcmkwin/kwinscreenedges/main.cpp                    | 2 +-
 kcmkwin/kwinscreenedges/touch.cpp                   | 2 +-
 kcmkwin/kwinscripts/module.cpp                      | 6 +++---
 kcmkwin/kwintabbox/layoutpreview.cpp                | 2 +-
 kcmkwin/kwintabbox/main.cpp                         | 2 +-
 kcmkwin/kwintabbox/thumbnailitem.cpp                | 2 +-
 libkwineffects/kwineffects.cpp                      | 8 ++++----
 libkwineffects/kwineffects.h                        | 6 +++---
 libkwineffects/kwingltexture.h                      | 2 +-
 main.cpp                                            | 2 +-
 plugins/qpa/integration.cpp                         | 2 +-
 plugins/scenes/xrender/scene_xrender.cpp            | 2 +-
 screenedge.cpp                                      | 4 ++--
 scripting/scriptedeffect.cpp                        | 2 +-
 scripting/scripting.cpp                             | 8 ++++----
 scripting/scripting.h                               | 2 +-
 scripting/workspace_wrapper.h                       | 2 +-
 shadow.h                                            | 2 +-
 67 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/autotests/integration/kwin_wayland_test.h b/autotests/integration/kwin_wayland_test.h
index 6d95fe4dcc..e91e7e91d4 100644
--- a/autotests/integration/kwin_wayland_test.h
+++ b/autotests/integration/kwin_wayland_test.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../main.h"
 
 // Qt
-#include <QtTest/QtTest>
+#include <QtTest>
 
 namespace KWayland
 {
diff --git a/autotests/libinput/context_test.cpp b/autotests/libinput/context_test.cpp
index c3670c6597..a860bcd3df 100644
--- a/autotests/libinput/context_test.cpp
+++ b/autotests/libinput/context_test.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "mock_udev.h"
 #include "../../libinput/context.h"
 #include "../../udev.h"
-#include <QtTest/QtTest>
+#include <QtTest>
 Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg)
 
 using namespace KWin;
diff --git a/autotests/libinput/device_test.cpp b/autotests/libinput/device_test.cpp
index a93cc43259..7a86776d65 100644
--- a/autotests/libinput/device_test.cpp
+++ b/autotests/libinput/device_test.cpp
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <KSharedConfig>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <linux/input.h>
 
diff --git a/autotests/libinput/gesture_event_test.cpp b/autotests/libinput/gesture_event_test.cpp
index fe7e511537..77c04992e0 100644
--- a/autotests/libinput/gesture_event_test.cpp
+++ b/autotests/libinput/gesture_event_test.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../libinput/device.h"
 #include "../../libinput/events.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <linux/input.h>
 
diff --git a/autotests/libinput/input_event_test.cpp b/autotests/libinput/input_event_test.cpp
index c9373aa3c2..b1a83aa63b 100644
--- a/autotests/libinput/input_event_test.cpp
+++ b/autotests/libinput/input_event_test.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../libinput/device.h"
 #include "../input_event.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 Q_DECLARE_METATYPE(KWin::SwitchEvent::State);
 
diff --git a/autotests/libinput/key_event_test.cpp b/autotests/libinput/key_event_test.cpp
index 4f22008d1e..97aea0cfaf 100644
--- a/autotests/libinput/key_event_test.cpp
+++ b/autotests/libinput/key_event_test.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../libinput/device.h"
 #include "../../libinput/events.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <linux/input.h>
 
diff --git a/autotests/libinput/pointer_event_test.cpp b/autotests/libinput/pointer_event_test.cpp
index 03af54da07..bad852076b 100644
--- a/autotests/libinput/pointer_event_test.cpp
+++ b/autotests/libinput/pointer_event_test.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../libinput/device.h"
 #include "../../libinput/events.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <linux/input.h>
 
diff --git a/autotests/libinput/switch_event_test.cpp b/autotests/libinput/switch_event_test.cpp
index 6d59245339..ea0b2e986f 100644
--- a/autotests/libinput/switch_event_test.cpp
+++ b/autotests/libinput/switch_event_test.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../libinput/device.h"
 #include "../../libinput/events.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <memory>
 
diff --git a/autotests/libinput/touch_event_test.cpp b/autotests/libinput/touch_event_test.cpp
index 5aa0a7c3cb..53bae1e648 100644
--- a/autotests/libinput/touch_event_test.cpp
+++ b/autotests/libinput/touch_event_test.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../libinput/device.h"
 #include "../../libinput/events.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <linux/input.h>
 
diff --git a/autotests/libkwineffects/kwinglplatformtest.cpp b/autotests/libkwineffects/kwinglplatformtest.cpp
index 07a2ca13f5..2f069b89bd 100644
--- a/autotests/libkwineffects/kwinglplatformtest.cpp
+++ b/autotests/libkwineffects/kwinglplatformtest.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "mock_gl.h"
-#include <QtTest/QTest>
+#include <QTest>
 #include <kwinglplatform.h>
 
 #include <KConfig>
diff --git a/autotests/libkwineffects/windowquadlisttest.cpp b/autotests/libkwineffects/windowquadlisttest.cpp
index eedf020dbe..a2519296ca 100644
--- a/autotests/libkwineffects/windowquadlisttest.cpp
+++ b/autotests/libkwineffects/windowquadlisttest.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include <kwineffects.h>
-#include <QtTest/QTest>
+#include <QTest>
 
 Q_DECLARE_METATYPE(KWin::WindowQuadList)
 
diff --git a/autotests/libxrenderutils/blendpicture_test.cpp b/autotests/libxrenderutils/blendpicture_test.cpp
index 5cf3239f0c..697b12d29c 100644
--- a/autotests/libxrenderutils/blendpicture_test.cpp
+++ b/autotests/libxrenderutils/blendpicture_test.cpp
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QLoggingCategory>
 #include <QX11Info>
 
diff --git a/autotests/opengl_context_attribute_builder_test.cpp b/autotests/opengl_context_attribute_builder_test.cpp
index 43229ef587..4450415e7e 100644
--- a/autotests/opengl_context_attribute_builder_test.cpp
+++ b/autotests/opengl_context_attribute_builder_test.cpp
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../abstract_opengl_context_attribute_builder.h"
 #include "../egl_context_attribute_builder.h"
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <epoxy/egl.h>
 
 #include <kwinconfig.h>
diff --git a/autotests/tabbox/test_tabbox_clientmodel.cpp b/autotests/tabbox/test_tabbox_clientmodel.cpp
index f7b94a62f7..201f7be4b3 100644
--- a/autotests/tabbox/test_tabbox_clientmodel.cpp
+++ b/autotests/tabbox/test_tabbox_clientmodel.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "clientmodel.h"
 #include "../testutils.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QX11Info>
 using namespace KWin;
 
diff --git a/autotests/tabbox/test_tabbox_config.cpp b/autotests/tabbox/test_tabbox_config.cpp
index 60a3d353c6..4a2774f494 100644
--- a/autotests/tabbox/test_tabbox_config.cpp
+++ b/autotests/tabbox/test_tabbox_config.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../../tabbox/tabboxconfig.h"
-#include <QtTest/QtTest>
+#include <QtTest>
 using namespace KWin;
 using namespace KWin::TabBox;
 
diff --git a/autotests/tabbox/test_tabbox_handler.cpp b/autotests/tabbox/test_tabbox_handler.cpp
index 83e92c4f96..e1bdf8840c 100644
--- a/autotests/tabbox/test_tabbox_handler.cpp
+++ b/autotests/tabbox/test_tabbox_handler.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "mock_tabboxhandler.h"
 #include "clientmodel.h"
 #include "../testutils.h"
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QX11Info>
 
 using namespace KWin;
diff --git a/autotests/test_builtin_effectloader.cpp b/autotests/test_builtin_effectloader.cpp
index 6dd3313056..dc741bdc06 100644
--- a/autotests/test_builtin_effectloader.cpp
+++ b/autotests/test_builtin_effectloader.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfig>
 #include <KConfigGroup>
 // Qt
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QStringList>
 Q_DECLARE_METATYPE(KWin::CompositingType)
 Q_DECLARE_METATYPE(KWin::LoadEffectFlag)
diff --git a/autotests/test_client_machine.cpp b/autotests/test_client_machine.cpp
index 1d97f6d972..6c83ebe5de 100644
--- a/autotests/test_client_machine.cpp
+++ b/autotests/test_client_machine.cpp
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../xcbutils.h"
 // Qt
 #include <QApplication>
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QX11Info>
 // xcb
 #include <xcb/xcb.h>
diff --git a/autotests/test_gbm_surface.cpp b/autotests/test_gbm_surface.cpp
index 17268c9c1e..b1c7a3c981 100644
--- a/autotests/test_gbm_surface.cpp
+++ b/autotests/test_gbm_surface.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../plugins/platforms/drm/gbm_surface.h"
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <gbm.h>
 
diff --git a/autotests/test_gestures.cpp b/autotests/test_gestures.cpp
index a2600d7164..9c01e840c1 100644
--- a/autotests/test_gestures.cpp
+++ b/autotests/test_gestures.cpp
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../gestures.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 #include <QSignalSpy>
 
 using namespace KWin;
diff --git a/autotests/test_plugin_effectloader.cpp b/autotests/test_plugin_effectloader.cpp
index 38d7a6877a..59e295b9d3 100644
--- a/autotests/test_plugin_effectloader.cpp
+++ b/autotests/test_plugin_effectloader.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfigGroup>
 #include <KPluginLoader>
 // Qt
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QStringList>
 Q_DECLARE_METATYPE(KWin::CompositingType)
 Q_DECLARE_METATYPE(KWin::LoadEffectFlag)
diff --git a/autotests/test_screen_edges.cpp b/autotests/test_screen_edges.cpp
index ccb1f21296..a89d06b2dc 100644
--- a/autotests/test_screen_edges.cpp
+++ b/autotests/test_screen_edges.cpp
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Frameworks
 #include <KConfigGroup>
 // Qt
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QX11Info>
 // xcb
 #include <xcb/xcb.h>
diff --git a/autotests/test_screen_paint_data.cpp b/autotests/test_screen_paint_data.cpp
index 01655575b1..952a229500 100644
--- a/autotests/test_screen_paint_data.cpp
+++ b/autotests/test_screen_paint_data.cpp
@@ -21,10 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 
 #include <QMatrix4x4>
-#include <QtGui/QVector2D>
+#include <QVector2D>
 #include <QVector3D>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 using namespace KWin;
 
diff --git a/autotests/test_screens.cpp b/autotests/test_screens.cpp
index 228ba438cb..172a1af2de 100644
--- a/autotests/test_screens.cpp
+++ b/autotests/test_screens.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // frameworks
 #include <KConfigGroup>
 // Qt
-#include <QtTest/QtTest>
+#include <QtTest>
 
 Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core")
 
diff --git a/autotests/test_scripted_effectloader.cpp b/autotests/test_scripted_effectloader.cpp
index 8b9f0193d8..b308dc7f2c 100644
--- a/autotests/test_scripted_effectloader.cpp
+++ b/autotests/test_scripted_effectloader.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfigGroup>
 #include <KPackage/PackageLoader>
 // Qt
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QStringList>
 Q_DECLARE_METATYPE(KWin::LoadEffectFlag)
 Q_DECLARE_METATYPE(KWin::LoadEffectFlags)
diff --git a/autotests/test_virtual_desktops.cpp b/autotests/test_virtual_desktops.cpp
index 6b7a59b1eb..feb6b85eca 100644
--- a/autotests/test_virtual_desktops.cpp
+++ b/autotests/test_virtual_desktops.cpp
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfigGroup>
 
 #include <QAction>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 namespace KWin {
 
diff --git a/autotests/test_virtualkeyboard_dbus.cpp b/autotests/test_virtualkeyboard_dbus.cpp
index 7bb4377f17..ba83c87262 100644
--- a/autotests/test_virtualkeyboard_dbus.cpp
+++ b/autotests/test_virtualkeyboard_dbus.cpp
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#include <QtTest/QTest>
+#include <QTest>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QDBusPendingReply>
diff --git a/autotests/test_window_paint_data.cpp b/autotests/test_window_paint_data.cpp
index ceb2067a72..8b8c9f793b 100644
--- a/autotests/test_window_paint_data.cpp
+++ b/autotests/test_window_paint_data.cpp
@@ -20,11 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <QtGui/QVector2D>
+#include <QVector2D>
 #include <QGraphicsRotation>
 #include <QGraphicsScale>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 using namespace KWin;
 
diff --git a/autotests/test_xcb_size_hints.cpp b/autotests/test_xcb_size_hints.cpp
index 59b6bfc6cc..61ca2c4804 100644
--- a/autotests/test_xcb_size_hints.cpp
+++ b/autotests/test_xcb_size_hints.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../xcbutils.h"
 // Qt
 #include <QApplication>
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QX11Info>
 #include <netwm.h>
 // xcb
diff --git a/autotests/test_xcb_window.cpp b/autotests/test_xcb_window.cpp
index ee703f3a89..236f1237e7 100644
--- a/autotests/test_xcb_window.cpp
+++ b/autotests/test_xcb_window.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../xcbutils.h"
 // Qt
 #include <QApplication>
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QX11Info>
 // xcb
 #include <xcb/xcb.h>
diff --git a/autotests/test_xcb_wrapper.cpp b/autotests/test_xcb_wrapper.cpp
index 4a428c90f1..fe0bcbae12 100644
--- a/autotests/test_xcb_wrapper.cpp
+++ b/autotests/test_xcb_wrapper.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../xcbutils.h"
 // Qt
 #include <QApplication>
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QX11Info>
 #include <netwm.h>
 // xcb
diff --git a/autotests/test_xkb.cpp b/autotests/test_xkb.cpp
index f10ccc0ff9..7714f09952 100644
--- a/autotests/test_xkb.cpp
+++ b/autotests/test_xkb.cpp
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../xkb.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <xkbcommon/xkbcommon-keysyms.h>
 
 using namespace KWin;
diff --git a/autotests/test_xrandr_screens.cpp b/autotests/test_xrandr_screens.cpp
index 674198b39f..e0f6b14a53 100644
--- a/autotests/test_xrandr_screens.cpp
+++ b/autotests/test_xrandr_screens.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../xcbutils.h"
 #include "mock_workspace.h"
 // Qt
-#include <QtTest/QtTest>
+#include <QtTest>
 // system
 #include <unistd.h>
 
diff --git a/colorcorrection/colorcorrectdbusinterface.h b/colorcorrection/colorcorrectdbusinterface.h
index 5764b543af..1cb583c464 100644
--- a/colorcorrection/colorcorrectdbusinterface.h
+++ b/colorcorrection/colorcorrectdbusinterface.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_NIGHTCOLOR_DBUS_INTERFACE_H
 
 #include <QObject>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 namespace KWin
 {
diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index 4e96e0f22a..b607c8855e 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kconfig.h>
 #include <kconfiggroup.h>
-#include <QtDBus/QtDBus>
-#include <QtCore/QStandardPaths>
+#include <QtDBus>
+#include <QStandardPaths>
 #include <QDebug>
 
 int main( int argc, char* argv[] )
diff --git a/dbusinterface.h b/dbusinterface.h
index 489030acbf..dd23d7c3cf 100644
--- a/dbusinterface.h
+++ b/dbusinterface.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_DBUS_INTERFACE_H
 
 #include <QObject>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 namespace KWin
 {
diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 57d19d226e..3f58ad304e 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QEvent>
 #include <QMouseEvent>
 #include <QTimer>
-#include <QtGui/QVector2D>
+#include <QVector2D>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQuickItem>
diff --git a/effects/minimizeanimation/minimizeanimation.cpp b/effects/minimizeanimation/minimizeanimation.cpp
index de23069bf6..f8c903b0bc 100644
--- a/effects/minimizeanimation/minimizeanimation.cpp
+++ b/effects/minimizeanimation/minimizeanimation.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "minimizeanimation.h"
 #include <QTimeLine>
-#include <QtGui/QVector2D>
+#include <QVector2D>
 
 namespace KWin
 {
diff --git a/effects/resize/resize.cpp b/effects/resize/resize.cpp
index bec9340871..e1035626d9 100644
--- a/effects/resize/resize.cpp
+++ b/effects/resize/resize.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <KColorScheme>
 
-#include <QtGui/QVector2D>
+#include <QVector2D>
 #include <QPainter>
 
 namespace KWin
diff --git a/effects/screenshot/screenshot.cpp b/effects/screenshot/screenshot.cpp
index af1903eb76..5b7c7cde3d 100644
--- a/effects/screenshot/screenshot.cpp
+++ b/effects/screenshot/screenshot.cpp
@@ -24,11 +24,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinxrenderutils.h>
 #include <QtConcurrentRun>
 #include <QDataStream>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QDir>
-#include <QtDBus/QDBusConnection>
+#include <QTemporaryFile>
+#include <QDir>
+#include <QDBusConnection>
 #include <QVarLengthArray>
-#include <QtGui/QPainter>
+#include <QPainter>
 #include <QMatrix4x4>
 #include <xcb/xcb_image.h>
 
diff --git a/effects/startupfeedback/startupfeedback.cpp b/effects/startupfeedback/startupfeedback.cpp
index 02d9cd660d..08e1e2d7c3 100644
--- a/effects/startupfeedback/startupfeedback.cpp
+++ b/effects/startupfeedback/startupfeedback.cpp
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFile>
 #include <QSize>
 #include <QStyle>
-#include <QtCore/QStandardPaths>
-#include <QtGui/QPainter>
+#include <QStandardPaths>
+#include <QPainter>
 // KDE
 #include <KConfigGroup>
 #include <KSharedConfig>
diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp
index 1dd615053c..1868c6bbef 100644
--- a/effects/zoom/zoom.cpp
+++ b/effects/zoom/zoom.cpp
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <QApplication>
 #include <QStyle>
-#include <QtGui/QVector2D>
-#include <QtDBus/QDBusConnection>
+#include <QVector2D>
+#include <QDBusConnection>
 #include <kstandardaction.h>
 #include <KConfigGroup>
 #include <KGlobalAccel>
diff --git a/kcmkwin/kwincompositing/test/modeltest.cpp b/kcmkwin/kwincompositing/test/modeltest.cpp
index c077d9ba2a..66fe0577f4 100644
--- a/kcmkwin/kwincompositing/test/modeltest.cpp
+++ b/kcmkwin/kwincompositing/test/modeltest.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 
-#include <QtGui/QtGui>
+#include <QtGui>
 
 #include "modeltest.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 /*!
     Connect to all of the models signals.  Whenever anything happens recheck everything.
diff --git a/kcmkwin/kwincompositing/test/modeltest.h b/kcmkwin/kwincompositing/test/modeltest.h
index 45c68f4b63..49d25d915e 100644
--- a/kcmkwin/kwincompositing/test/modeltest.h
+++ b/kcmkwin/kwincompositing/test/modeltest.h
@@ -43,9 +43,9 @@
 #ifndef MODELTEST_H
 #define MODELTEST_H
 
-#include <QtCore/QObject>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QStack>
+#include <QObject>
+#include <QAbstractItemModel>
+#include <QStack>
 
 class ModelTest : public QObject
 {
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 5c018def1b..6bb1a61e2c 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -23,7 +23,7 @@
 //Added by qt3to4:
 #include <QVBoxLayout>
 
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 #include <KLocalizedString>
 #include <kconfig.h>
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index b39aad7c7c..0d9678c305 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -37,7 +37,7 @@
 #include <QDebug>
 #include <kcolorscheme.h>
 #include <kseparator.h>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index a4f7983daa..3dbe15ee82 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -29,7 +29,7 @@
 #include <QHBoxLayout>
 #include <QFormLayout>
 #include <QDesktopWidget>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 #include <QGroupBox>
 
 #include <KConfig>
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index ca0fe5056c..2a0ef2cf6f 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -23,7 +23,7 @@
 #include <QVBoxLayout>
 #include <KLocalizedString>
 #include <kaboutdata.h>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 #include <QX11Info>
 
 #include "ruleslist.h"
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index 42ee9fce90..0103bfc6cf 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -21,7 +21,7 @@
 #include <kconfig.h>
 #include <KLocalizedString>
 #include <kwindowsystem.h>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 #include <QX11Info>
 #include <X11/Xlib.h>
 #include <fixx11h.h>
diff --git a/kcmkwin/kwinscreenedges/main.cpp b/kcmkwin/kwinscreenedges/main.cpp
index 975e2d515d..6cc3016ac9 100644
--- a/kcmkwin/kwinscreenedges/main.cpp
+++ b/kcmkwin/kwinscreenedges/main.cpp
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KPackage/Package>
 #include <KPackage/PackageLoader>
 #include <KPluginInfo>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 K_PLUGIN_FACTORY(KWinScreenEdgesConfigFactory, registerPlugin<KWin::KWinScreenEdgesConfig>();)
 
diff --git a/kcmkwin/kwinscreenedges/touch.cpp b/kcmkwin/kwinscreenedges/touch.cpp
index df5cb38be4..96793fdf90 100644
--- a/kcmkwin/kwinscreenedges/touch.cpp
+++ b/kcmkwin/kwinscreenedges/touch.cpp
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KPackage/Package>
 #include <KPackage/PackageLoader>
 #include <KPluginInfo>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 K_PLUGIN_FACTORY(KWinScreenEdgesConfigFactory, registerPlugin<KWin::KWinScreenEdgesConfig>();)
 
diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp
index 846f5a6baf..e1eb28ce58 100644
--- a/kcmkwin/kwinscripts/module.cpp
+++ b/kcmkwin/kwinscripts/module.cpp
@@ -23,9 +23,9 @@
 #include <QFileDialog>
 #include <QStringList>
 #include <QStandardPaths>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusPendingCall>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusPendingCall>
 
 #include <KAboutData>
 #include <KLocalizedString>
diff --git a/kcmkwin/kwintabbox/layoutpreview.cpp b/kcmkwin/kwintabbox/layoutpreview.cpp
index 0b19498f8f..f63a756bcb 100644
--- a/kcmkwin/kwintabbox/layoutpreview.cpp
+++ b/kcmkwin/kwintabbox/layoutpreview.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDesktopWidget>
 #include <QQmlEngine>
 #include <QQmlContext>
-#include <QtCore/QStandardPaths>
+#include <QStandardPaths>
 #include <KConfigGroup>
 #include <KDesktopFile>
 #include <KLocalizedString>
diff --git a/kcmkwin/kwintabbox/main.cpp b/kcmkwin/kwintabbox/main.cpp
index efd52c8308..82e72fe55c 100644
--- a/kcmkwin/kwintabbox/main.cpp
+++ b/kcmkwin/kwintabbox/main.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwin_effects_interface.h>
 
 // Qt
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 #include <QDesktopWidget>
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
diff --git a/kcmkwin/kwintabbox/thumbnailitem.cpp b/kcmkwin/kwintabbox/thumbnailitem.cpp
index 8e226175f3..8c8edb488b 100644
--- a/kcmkwin/kwintabbox/thumbnailitem.cpp
+++ b/kcmkwin/kwintabbox/thumbnailitem.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "thumbnailitem.h"
 // Qt
-#include <QtCore/QStandardPaths>
+#include <QStandardPaths>
 #include <QQuickWindow>
 #include <QSGSimpleTextureNode>
 
diff --git a/libkwineffects/kwineffects.cpp b/libkwineffects/kwineffects.cpp
index d60fdf3523..1330b3cc83 100644
--- a/libkwineffects/kwineffects.cpp
+++ b/libkwineffects/kwineffects.cpp
@@ -30,10 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QVariant>
 #include <QList>
 #include <QTimeLine>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QVector2D>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QPixmap>
+#include <QVector2D>
 #include <QGraphicsRotation>
 #include <QGraphicsScale>
 
diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h
index 04e77aa1f0..ea540e9a01 100644
--- a/libkwineffects/kwineffects.h
+++ b/libkwineffects/kwineffects.h
@@ -31,9 +31,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QPair>
 #include <QSet>
 #include <QRect>
-#include <QtGui/QRegion>
-#include <QtGui/QVector2D>
-#include <QtGui/QVector3D>
+#include <QRegion>
+#include <QVector2D>
+#include <QVector3D>
 
 #include <QVector>
 #include <QLoggingCategory>
diff --git a/libkwineffects/kwingltexture.h b/libkwineffects/kwingltexture.h
index 965348332c..6a212de104 100644
--- a/libkwineffects/kwingltexture.h
+++ b/libkwineffects/kwingltexture.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QRegion>
 #include <QSharedPointer>
 #include <QExplicitlySharedDataPointer>
-#include <QtGui/QMatrix4x4>
+#include <QMatrix4x4>
 
 #include <epoxy/gl.h>
 
diff --git a/main.cpp b/main.cpp
index 4ed8528795..9f58432d3d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <qcommandlineparser.h>
 #include <QQuickWindow>
 #include <QStandardPaths>
-#include <QtDBus/QtDBus>
+#include <QtDBus>
 
 // system
 #ifdef HAVE_UNISTD_H
diff --git a/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp
index c59da310cc..055b8fb133 100644
--- a/plugins/qpa/integration.cpp
+++ b/plugins/qpa/integration.cpp
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <qpa/qplatforminputcontext.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <qpa/qwindowsysteminterface.h>
-#include <QtCore/private/qeventdispatcher_unix_p.h>
+#include <private/qeventdispatcher_unix_p.h>
 
 #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtThemeSupport/private/qgenericunixthemes_p.h>
diff --git a/plugins/scenes/xrender/scene_xrender.cpp b/plugins/scenes/xrender/scene_xrender.cpp
index 7e0864a07d..30911f15a1 100644
--- a/plugins/scenes/xrender/scene_xrender.cpp
+++ b/plugins/scenes/xrender/scene_xrender.cpp
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <xcb/xfixes.h>
 
 #include <QDebug>
-#include <QtGui/QPainter>
+#include <QPainter>
 #include <qmath.h>
 
 namespace KWin
diff --git a/screenedge.cpp b/screenedge.cpp
index 1a1a885707..4d60672aa8 100644
--- a/screenedge.cpp
+++ b/screenedge.cpp
@@ -53,8 +53,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTimer>
 #include <QVector>
 #include <QTextStream>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusPendingCall>
+#include <QDBusInterface>
+#include <QDBusPendingCall>
 #include <QWidget>
 
 namespace KWin {
diff --git a/scripting/scriptedeffect.cpp b/scripting/scriptedeffect.cpp
index a05ef02a37..9c2e6908e3 100644
--- a/scripting/scriptedeffect.cpp
+++ b/scripting/scriptedeffect.cpp
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFile>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValueIterator>
-#include <QtCore/QStandardPaths>
+#include <QStandardPaths>
 
 typedef KWin::EffectWindow* KEffectWindowRef;
 
diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp
index 22cefe0cde..4522ac81ac 100644
--- a/scripting/scripting.cpp
+++ b/scripting/scripting.cpp
@@ -36,9 +36,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfigGroup>
 #include <KPackage/PackageLoader>
 // Qt
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusPendingCallWatcher>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusPendingCallWatcher>
 #include <QDebug>
 #include <QFutureWatcher>
 #include <QSettings>
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QQmlExpression>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValue>
-#include <QtCore/QStandardPaths>
+#include <QStandardPaths>
 #include <QQuickWindow>
 
 QScriptValue kwinScriptPrint(QScriptContext *context, QScriptEngine *engine)
diff --git a/scripting/scripting.h b/scripting/scripting.h
index 93183eca68..ded87c271e 100644
--- a/scripting/scripting.h
+++ b/scripting/scripting.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QHash>
 #include <QStringList>
 #include <QtScript/QScriptEngineAgent>
-#include <QtQml/QJSValue>
+#include <QJSValue>
 
 class QQmlComponent;
 class QQmlContext;
diff --git a/scripting/workspace_wrapper.h b/scripting/workspace_wrapper.h
index d21989a788..e26d30210c 100644
--- a/scripting/workspace_wrapper.h
+++ b/scripting/workspace_wrapper.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QSize>
 #include <QStringList>
 #include <QRect>
-#include <QtQml/QQmlListProperty>
+#include <QQmlListProperty>
 #include <kwinglobals.h>
 
 namespace KWin
diff --git a/shadow.h b/shadow.h
index b64cf7a471..f8240e4612 100644
--- a/shadow.h
+++ b/shadow.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_SHADOW_H
 
 #include <QObject>
-#include <QtGui/QPixmap>
+#include <QPixmap>
 #include <kwineffects.h>
 #include <qvarlengtharray.h>