From c72e519d9c7738ab3e96469ac64916f018cfa8cc Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Mon, 17 Mar 2014 16:24:10 +0100
Subject: [PATCH] Remove KDE/ prefix in include directories

It's unneeded and deprecated since KF5.
---
 activation.cpp                                       |  2 +-
 activities.cpp                                       |  2 +-
 autotests/test_virtual_desktops.cpp                  |  2 +-
 client.cpp                                           |  4 ++--
 client.h                                             |  2 +-
 clients/aurorae/src/colorhelper.cpp                  |  2 +-
 clients/aurorae/src/lib/auroraetheme.cpp             |  4 ++--
 .../aurorae/themes/plastik/code/plastikbutton.cpp    |  2 +-
 .../oxygen/config/oxygenanimationconfigwidget.cpp    |  2 +-
 composite.cpp                                        |  8 ++++----
 composite.h                                          |  2 +-
 compositingprefs.cpp                                 |  2 +-
 decorations.cpp                                      |  2 +-
 effects.cpp                                          | 12 ++++++------
 effects/blur/blur_config.cpp                         |  2 +-
 effects/coverswitch/coverswitch.cpp                  |  2 +-
 effects/coverswitch/coverswitch_config.cpp           |  2 +-
 effects/cube/cube.cpp                                |  4 ++--
 effects/cube/cube_config.cpp                         |  4 ++--
 effects/cube/cubeslide_config.cpp                    |  2 +-
 effects/dashboard/dashboard.cpp                      |  2 +-
 effects/dashboard/dashboard_config.cpp               |  2 +-
 effects/desktopgrid/desktopgrid.cpp                  |  4 ++--
 effects/desktopgrid/desktopgrid_config.cpp           |  4 ++--
 effects/diminactive/diminactive_config.cpp           |  4 ++--
 effects/fallapart/fallapart.cpp                      |  2 +-
 effects/flipswitch/flipswitch.cpp                    |  4 ++--
 effects/flipswitch/flipswitch_config.cpp             |  4 ++--
 effects/glide/glide_config.cpp                       |  2 +-
 effects/invert/invert.cpp                            |  4 ++--
 effects/invert/invert_config.cpp                     |  6 +++---
 effects/lookingglass/lookingglass.cpp                |  6 +++---
 effects/lookingglass/lookingglass_config.cpp         |  6 +++---
 effects/magiclamp/magiclamp_config.cpp               |  2 +-
 effects/magnifier/magnifier.cpp                      |  2 +-
 effects/magnifier/magnifier_config.cpp               |  6 +++---
 effects/mouseclick/mouseclick.cpp                    |  4 ++--
 effects/mouseclick/mouseclick_config.cpp             |  6 +++---
 effects/mousemark/mousemark.cpp                      |  4 ++--
 effects/mousemark/mousemark_config.cpp               |  6 +++---
 effects/presentwindows/presentwindows.cpp            |  4 ++--
 effects/presentwindows/presentwindows_config.cpp     |  4 ++--
 effects/resize/resize_config.cpp                     |  2 +-
 effects/showfps/showfps.cpp                          |  2 +-
 effects/showfps/showfps_config.cpp                   |  4 ++--
 effects/slidingpopups/slidingpopups.cpp              |  2 +-
 effects/startupfeedback/startupfeedback.cpp          |  8 ++++----
 effects/startupfeedback/startupfeedback.h            |  2 +-
 effects/thumbnailaside/thumbnailaside.cpp            |  4 ++--
 effects/thumbnailaside/thumbnailaside_config.cpp     |  6 +++---
 effects/trackmouse/trackmouse.cpp                    |  4 ++--
 effects/trackmouse/trackmouse_config.cpp             |  6 +++---
 effects/windowgeometry/windowgeometry.cpp            |  4 ++--
 effects/windowgeometry/windowgeometry_config.cpp     |  6 +++---
 effects/wobblywindows/wobblywindows_config.cpp       |  4 ++--
 effects/zoom/zoom.cpp                                |  6 +++---
 effects/zoom/zoom_config.cpp                         |  6 +++---
 kcmkwin/kwindecoration/buttons.cpp                   |  2 +-
 kcmkwin/kwindecoration/buttonsconfigdialog.cpp       |  2 +-
 kcmkwin/kwindecoration/decorationmodel.cpp           |  2 +-
 kcmkwin/kwindecoration/kwindecoration.cpp            |  4 ++--
 kcmkwin/kwindecoration/preview.cpp                   |  2 +-
 kcmkwin/kwindesktop/desktopnameswidget.cpp           |  2 +-
 kcmkwin/kwinoptions/main.cpp                         |  2 +-
 kcmkwin/kwinoptions/mouse.h                          |  2 +-
 kcmkwin/kwinoptions/windows.cpp                      |  4 ++--
 kcmkwin/kwinrules/detectwidget.cpp                   |  2 +-
 kcmkwin/kwinrules/kcm.cpp                            |  2 +-
 kcmkwin/kwinrules/main.cpp                           |  2 +-
 kcmkwin/kwinrules/ruleswidget.cpp                    |  2 +-
 kcmkwin/kwinrules/yesnobox.h                         |  2 +-
 kcmkwin/kwinscreenedges/main.cpp                     |  4 ++--
 kcmkwin/kwinscreenedges/monitor.cpp                  |  2 +-
 kcmkwin/kwinscripts/main.cpp                         |  2 +-
 kcmkwin/kwinscripts/module.cpp                       | 12 ++++++------
 kcmkwin/kwinscripts/module.h                         |  4 ++--
 kcmkwin/kwintabbox/layoutpreview.cpp                 |  8 ++++----
 killer/killer.cpp                                    |  6 +++---
 libkdecorations/kcommondecoration.cpp                |  2 +-
 libkdecorations/kdecoration.cpp                      |  2 +-
 libkdecorations/kdecoration_plugins_p.cpp            |  2 +-
 libkwineffects/kwineffects.h                         |  2 +-
 libkwineffects/kwinglutils.cpp                       |  4 ++--
 libkwineffects/kwinxrenderutils.h                    |  2 +-
 main.cpp                                             | 10 +++++-----
 main.h                                               |  2 +-
 netinfo.h                                            |  2 +-
 rules.cpp                                            |  2 +-
 scene_opengl.cpp                                     |  4 ++--
 screenedge.h                                         |  2 +-
 screens.h                                            |  2 +-
 scripting/genericscriptedconfig.cpp                  |  4 ++--
 scripting/scriptedeffect.cpp                         |  2 +-
 scripting/scripting.cpp                              |  6 +++---
 scripting/scriptingutils.h                           |  4 ++--
 tabbox/tabbox.cpp                                    |  2 +-
 toplevel.h                                           |  2 +-
 useractions.cpp                                      |  8 ++++----
 utils.h                                              |  2 +-
 virtualdesktops.cpp                                  |  8 ++++----
 virtualdesktops.h                                    |  2 +-
 workspace.cpp                                        | 12 ++++++------
 102 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/activation.cpp b/activation.cpp
index 6261eaa3a0..78836d0f29 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <fixx11h.h>
 #include <kstartupinfo.h>
 #include <kstringhandler.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #include "atoms.h"
 #include "group.h"
diff --git a/activities.cpp b/activities.cpp
index d0c14e7e8d..33b60f011d 100644
--- a/activities.cpp
+++ b/activities.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "client.h"
 #include "workspace.h"
 // KDE
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 #include <kactivities/controller.h>
 // Qt
 #include <QtConcurrentRun>
diff --git a/autotests/test_virtual_desktops.cpp b/autotests/test_virtual_desktops.cpp
index ab38a3431a..2d6787eda6 100644
--- a/autotests/test_virtual_desktops.cpp
+++ b/autotests/test_virtual_desktops.cpp
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../virtualdesktops.h"
 // KDE
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 
 #include <QAction>
 #include <QtTest/QtTest>
diff --git a/client.cpp b/client.cpp
index 3625665409..d64eded277 100644
--- a/client.cpp
+++ b/client.cpp
@@ -44,8 +44,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "workspace.h"
 #include "screenedge.h"
 // KDE
-#include <KDE/KWindowSystem>
-#include <KDE/KColorScheme>
+#include <KWindowSystem>
+#include <KColorScheme>
 // Qt
 #include <QApplication>
 #include <QDebug>
diff --git a/client.h b/client.h
index 24fe70b361..01c1ebb80a 100644
--- a/client.h
+++ b/client.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "toplevel.h"
 #include "xcbutils.h"
 // KDE
-#include <KDE/NETWinInfo>
+#include <NETWinInfo>
 // Qt
 #include <QPixmap>
 #include <QWindow>
diff --git a/clients/aurorae/src/colorhelper.cpp b/clients/aurorae/src/colorhelper.cpp
index b8a09f966a..73b7decdce 100644
--- a/clients/aurorae/src/colorhelper.cpp
+++ b/clients/aurorae/src/colorhelper.cpp
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "colorhelper.h"
 
-#include <KDE/KColorScheme>
+#include <KColorScheme>
 
 ColorHelper::ColorHelper(QObject *parent)
     : QObject(parent)
diff --git a/clients/aurorae/src/lib/auroraetheme.cpp b/clients/aurorae/src/lib/auroraetheme.cpp
index e1343b4770..83431cadc3 100644
--- a/clients/aurorae/src/lib/auroraetheme.cpp
+++ b/clients/aurorae/src/lib/auroraetheme.cpp
@@ -25,8 +25,8 @@
 #include <QHash>
 #include <QStandardPaths>
 // KDE
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
+#include <KConfig>
+#include <KConfigGroup>
 
 Q_LOGGING_CATEGORY(AURORAE, "aurorae")
 
diff --git a/clients/aurorae/themes/plastik/code/plastikbutton.cpp b/clients/aurorae/themes/plastik/code/plastikbutton.cpp
index 29f6cc6c2f..6ad55a68e3 100644
--- a/clients/aurorae/themes/plastik/code/plastikbutton.cpp
+++ b/clients/aurorae/themes/plastik/code/plastikbutton.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "plastikbutton.h"
 #include <kdecoration.h>
-#include <KDE/KColorScheme>
+#include <KColorScheme>
 #include <QPainter>
 
 namespace KWin
diff --git a/clients/oxygen/config/oxygenanimationconfigwidget.cpp b/clients/oxygen/config/oxygenanimationconfigwidget.cpp
index c1e140d132..0ddecb2fc4 100644
--- a/clients/oxygen/config/oxygenanimationconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenanimationconfigwidget.cpp
@@ -32,7 +32,7 @@
 #include <QButtonGroup>
 #include <QHoverEvent>
 #include <QTextStream>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 namespace Oxygen
 {
diff --git a/composite.cpp b/composite.cpp
index 8e961b6554..1b2e7a40b1 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -47,10 +47,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTimerEvent>
 #include <QDateTime>
 #include <QDBusConnection>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
-#include <KDE/KNotification>
-#include <KDE/KSelectionWatcher>
+#include <KGlobalAccel>
+#include <KLocalizedString>
+#include <KNotification>
+#include <KSelectionWatcher>
 
 #include <xcb/composite.h>
 #include <xcb/damage.h>
diff --git a/composite.h b/composite.h
index 7529f9d804..7e18a660c0 100644
--- a/composite.h
+++ b/composite.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KWin
 #include <kwinglobals.h>
 // KDE
-#include <KDE/KSelectionOwner>
+#include <KSelectionOwner>
 // Qt
 #include <QObject>
 #include <QElapsedTimer>
diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 631e4ce2bc..228fca5a00 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kwinglplatform.h"
 
 #include <kconfiggroup.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdeversion.h>
 #include <ksharedconfig.h>
 
diff --git a/decorations.cpp b/decorations.cpp
index 523e4d5d1a..b15b733691 100644
--- a/decorations.cpp
+++ b/decorations.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "workspace.h"
 #include <kdecorationfactory.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <stdlib.h>
 #include <QPixmap>
 
diff --git a/effects.cpp b/effects.cpp
index bc62975c61..822bb5c202 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -55,12 +55,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDBusPendingCallWatcher>
 #include <QStandardPaths>
 
-#include <KDE/KLibrary>
-#include <KDE/KDesktopFile>
-#include <KDE/KConfigGroup>
-#include <KDE/KService>
-#include <KDE/KServiceTypeTrader>
-#include <KDE/KPluginInfo>
+#include <KLibrary>
+#include <KDesktopFile>
+#include <KConfigGroup>
+#include <KService>
+#include <KServiceTypeTrader>
+#include <KPluginInfo>
 #include <Plasma/Theme>
 
 #include <assert.h>
diff --git a/effects/blur/blur_config.cpp b/effects/blur/blur_config.cpp
index aab8a03f69..51675492f7 100644
--- a/effects/blur/blur_config.cpp
+++ b/effects/blur/blur_config.cpp
@@ -22,7 +22,7 @@
 #include "blurconfig.h"
 
 #include <kwineffects.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 namespace KWin
 {
diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp
index 107697175f..f329c0db39 100644
--- a/effects/coverswitch/coverswitch.cpp
+++ b/effects/coverswitch/coverswitch.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QIcon>
 #include <QMatrix4x4>
 #include <QMouseEvent>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kcolorscheme.h>
 
 #include <kwinglutils.h>
diff --git a/effects/coverswitch/coverswitch_config.cpp b/effects/coverswitch/coverswitch_config.cpp
index eef51f61ec..d8ad4fde0f 100644
--- a/effects/coverswitch/coverswitch_config.cpp
+++ b/effects/coverswitch/coverswitch_config.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "coverswitchconfig.h"
 
 #include <kwineffects.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QVBoxLayout>
 
diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp
index c4fd93d63e..23084a6563 100644
--- a/effects/cube/cube.cpp
+++ b/effects/cube/cube.cpp
@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "cube_inside.h"
 
 #include <QAction>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <kwinconfig.h>
 
 #include <QApplication>
diff --git a/effects/cube/cube_config.cpp b/effects/cube/cube_config.cpp
index 5025f4f36b..5bd98b051f 100644
--- a/effects/cube/cube_config.cpp
+++ b/effects/cube/cube_config.cpp
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfiggroup.h>
 #include <kcolorscheme.h>
 #include <KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QVBoxLayout>
 #include <QColor>
diff --git a/effects/cube/cubeslide_config.cpp b/effects/cube/cubeslide_config.cpp
index 659bafe86b..425d0e081c 100644
--- a/effects/cube/cubeslide_config.cpp
+++ b/effects/cube/cubeslide_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 
 #include <kconfiggroup.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 #include <QVBoxLayout>
 
 namespace KWin
diff --git a/effects/dashboard/dashboard.cpp b/effects/dashboard/dashboard.cpp
index 4781f6ac00..ffed0044eb 100644
--- a/effects/dashboard/dashboard.cpp
+++ b/effects/dashboard/dashboard.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KConfigSkeleton
 #include "dashboardconfig.h"
 
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 
 namespace KWin
 {
diff --git a/effects/dashboard/dashboard_config.cpp b/effects/dashboard/dashboard_config.cpp
index c72e68fe1c..046e08a84e 100644
--- a/effects/dashboard/dashboard_config.cpp
+++ b/effects/dashboard/dashboard_config.cpp
@@ -22,7 +22,7 @@
 #include "dashboardconfig.h"
 
 #include <kwineffects.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 namespace KWin
 {
diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 402bc9d960..1a02f4e32b 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -30,8 +30,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QAction>
 #include <QApplication>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <netwm_def.h>
 #include <QEvent>
 #include <QMouseEvent>
diff --git a/effects/desktopgrid/desktopgrid_config.cpp b/effects/desktopgrid/desktopgrid_config.cpp
index fb010fa0b4..3b8f145b20 100644
--- a/effects/desktopgrid/desktopgrid_config.cpp
+++ b/effects/desktopgrid/desktopgrid_config.cpp
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kconfiggroup.h>
 #include <KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QVBoxLayout>
 
diff --git a/effects/diminactive/diminactive_config.cpp b/effects/diminactive/diminactive_config.cpp
index 823cee2909..84a9f32429 100644
--- a/effects/diminactive/diminactive_config.cpp
+++ b/effects/diminactive/diminactive_config.cpp
@@ -24,9 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfiggroup.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QWidget>
 #include <QVBoxLayout>
diff --git a/effects/fallapart/fallapart.cpp b/effects/fallapart/fallapart.cpp
index 5a8d60c78f..80ca51ef54 100644
--- a/effects/fallapart/fallapart.cpp
+++ b/effects/fallapart/fallapart.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "fallapart.h"
 #include <assert.h>
 #include <math.h>
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 
 namespace KWin
 {
diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp
index 0d1c9a4745..cca32f298e 100644
--- a/effects/flipswitch/flipswitch.cpp
+++ b/effects/flipswitch/flipswitch.cpp
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QMatrix4x4>
 
 #include <QAction>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 
 #include <kwinglutils.h>
 
diff --git a/effects/flipswitch/flipswitch_config.cpp b/effects/flipswitch/flipswitch_config.cpp
index e356929b23..085b96dc73 100644
--- a/effects/flipswitch/flipswitch_config.cpp
+++ b/effects/flipswitch/flipswitch_config.cpp
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kconfiggroup.h>
 #include <KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QVBoxLayout>
 
diff --git a/effects/glide/glide_config.cpp b/effects/glide/glide_config.cpp
index 1450552596..c709706517 100644
--- a/effects/glide/glide_config.cpp
+++ b/effects/glide/glide_config.cpp
@@ -23,7 +23,7 @@
 #include "glideconfig.h"
 
 #include <kwineffects.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 namespace KWin
 {
diff --git a/effects/invert/invert.cpp b/effects/invert/invert.cpp
index a121129dde..21a29739e9 100644
--- a/effects/invert/invert.cpp
+++ b/effects/invert/invert.cpp
@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwinglutils.h>
 #include <kwinglplatform.h>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <QStandardPaths>
 
 #include <QMatrix4x4>
diff --git a/effects/invert/invert_config.cpp b/effects/invert/invert_config.cpp
index f84b3b944e..f069b20a37 100644
--- a/effects/invert/invert_config.cpp
+++ b/effects/invert/invert_config.cpp
@@ -23,11 +23,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <KActionCollection>
 #include <KShortcutsEditor>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QVBoxLayout>
 
diff --git a/effects/lookingglass/lookingglass.cpp b/effects/lookingglass/lookingglass.cpp
index 4f779c43ed..9703ed6e52 100644
--- a/effects/lookingglass/lookingglass.cpp
+++ b/effects/lookingglass/lookingglass.cpp
@@ -28,9 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglutils.h>
 #include <kwinglplatform.h>
 
-#include <KDE/KStandardAction>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KStandardAction>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <QVector2D>
 
 #include <kmessagebox.h>
diff --git a/effects/lookingglass/lookingglass_config.cpp b/effects/lookingglass/lookingglass_config.cpp
index f5f7ca5e77..91cd411f78 100644
--- a/effects/lookingglass/lookingglass_config.cpp
+++ b/effects/lookingglass/lookingglass_config.cpp
@@ -26,11 +26,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <kconfiggroup.h>
 #include <KActionCollection>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QDebug>
 #include <QWidget>
diff --git a/effects/magiclamp/magiclamp_config.cpp b/effects/magiclamp/magiclamp_config.cpp
index fe95c1e91c..a0088555e3 100644
--- a/effects/magiclamp/magiclamp_config.cpp
+++ b/effects/magiclamp/magiclamp_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 
 #include <kconfiggroup.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QVBoxLayout>
 
diff --git a/effects/magnifier/magnifier.cpp b/effects/magnifier/magnifier.cpp
index f7f815c8b8..fe204cd45d 100644
--- a/effects/magnifier/magnifier.cpp
+++ b/effects/magnifier/magnifier.cpp
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinxrenderutils.h>
 #include <xcb/render.h>
 #endif
-#include <KDE/KGlobalAccel>
+#include <KGlobalAccel>
 
 namespace KWin
 {
diff --git a/effects/magnifier/magnifier_config.cpp b/effects/magnifier/magnifier_config.cpp
index 8ac816b889..ffb3262ed6 100644
--- a/effects/magnifier/magnifier_config.cpp
+++ b/effects/magnifier/magnifier_config.cpp
@@ -25,11 +25,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <kconfiggroup.h>
 #include <KActionCollection>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QDebug>
 #include <QWidget>
diff --git a/effects/mouseclick/mouseclick.cpp b/effects/mouseclick/mouseclick.cpp
index 2a5b0a28a5..9c3e1e2ac2 100644
--- a/effects/mouseclick/mouseclick.cpp
+++ b/effects/mouseclick/mouseclick.cpp
@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <xcb/render.h>
 #endif
 
-#include <KDE/KConfigGroup>
-#include <KDE/KGlobalAccel>
+#include <KConfigGroup>
+#include <KGlobalAccel>
 
 #include <QPainter>
 
diff --git a/effects/mouseclick/mouseclick_config.cpp b/effects/mouseclick/mouseclick_config.cpp
index 3b90ec38a7..83eb256794 100644
--- a/effects/mouseclick/mouseclick_config.cpp
+++ b/effects/mouseclick/mouseclick_config.cpp
@@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KActionCollection>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QWidget>
 
diff --git a/effects/mousemark/mousemark.cpp b/effects/mousemark/mousemark.cpp
index c9b1be5cfd..0a45602998 100644
--- a/effects/mousemark/mousemark.cpp
+++ b/effects/mousemark/mousemark.cpp
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwinconfig.h>
 #include <kwinglutils.h>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 
 #include <QPainter>
 
diff --git a/effects/mousemark/mousemark_config.cpp b/effects/mousemark/mousemark_config.cpp
index 003362f06a..11fb6df10e 100644
--- a/effects/mousemark/mousemark_config.cpp
+++ b/effects/mousemark/mousemark_config.cpp
@@ -26,10 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QDebug>
 #include <QWidget>
diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp
index 5942ead0b0..a24c3b96cd 100755
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //KConfigSkeleton
 #include "presentwindowsconfig.h"
 #include <QAction>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 
 #include <kwinglutils.h>
 
diff --git a/effects/presentwindows/presentwindows_config.cpp b/effects/presentwindows/presentwindows_config.cpp
index 015d45d811..228e0b54b7 100644
--- a/effects/presentwindows/presentwindows_config.cpp
+++ b/effects/presentwindows/presentwindows_config.cpp
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kconfiggroup.h>
 #include <KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QVBoxLayout>
 
diff --git a/effects/resize/resize_config.cpp b/effects/resize/resize_config.cpp
index f7d1a6ab97..997271db32 100644
--- a/effects/resize/resize_config.cpp
+++ b/effects/resize/resize_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 
 #include <kconfiggroup.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QVBoxLayout>
 
diff --git a/effects/showfps/showfps.cpp b/effects/showfps/showfps.cpp
index a02fd0956d..b5eef26d72 100644
--- a/effects/showfps/showfps.cpp
+++ b/effects/showfps/showfps.cpp
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <xcb/render.h>
 #endif
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <math.h>
 #include <QPainter>
 #include <QVector2D>
diff --git a/effects/showfps/showfps_config.cpp b/effects/showfps/showfps_config.cpp
index 5fb75ca206..64d45b7e18 100644
--- a/effects/showfps/showfps_config.cpp
+++ b/effects/showfps/showfps_config.cpp
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
-#include <KDE/KAboutData>
+#include <KLocalizedString>
+#include <KAboutData>
 
 namespace KWin
 {
diff --git a/effects/slidingpopups/slidingpopups.cpp b/effects/slidingpopups/slidingpopups.cpp
index fb3dd15801..05e340d9ff 100644
--- a/effects/slidingpopups/slidingpopups.cpp
+++ b/effects/slidingpopups/slidingpopups.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "slidingpopups.h"
 
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 #include <QTimeLine>
 #include <QApplication>
 
diff --git a/effects/startupfeedback/startupfeedback.cpp b/effects/startupfeedback/startupfeedback.cpp
index 120c826282..b31d9da41f 100644
--- a/effects/startupfeedback/startupfeedback.cpp
+++ b/effects/startupfeedback/startupfeedback.cpp
@@ -23,10 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtCore/QStandardPaths>
 #include <QtGui/QPainter>
 // KDE
-#include <KDE/KConfigGroup>
-#include <KDE/KIconLoader>
-#include <KDE/KStartupInfo>
-#include <KDE/KSelectionOwner>
+#include <KConfigGroup>
+#include <KIconLoader>
+#include <KStartupInfo>
+#include <KSelectionOwner>
 // KWin
 #include <kwinglutils.h>
 // X11
diff --git a/effects/startupfeedback/startupfeedback.h b/effects/startupfeedback/startupfeedback.h
index e2b16c6993..878f7853ee 100644
--- a/effects/startupfeedback/startupfeedback.h
+++ b/effects/startupfeedback/startupfeedback.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_STARTUPFEEDBACK_H
 #include <QObject>
 #include <kwineffects.h>
-#include <KDE/KStartupInfo>
+#include <KStartupInfo>
 
 class KSelectionOwner;
 namespace KWin
diff --git a/effects/thumbnailaside/thumbnailaside.cpp b/effects/thumbnailaside/thumbnailaside.cpp
index 4be14275a2..11f2ac1dd4 100644
--- a/effects/thumbnailaside/thumbnailaside.cpp
+++ b/effects/thumbnailaside/thumbnailaside.cpp
@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "thumbnailasideconfig.h"
 
 #include <QAction>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 
 namespace KWin
 {
diff --git a/effects/thumbnailaside/thumbnailaside_config.cpp b/effects/thumbnailaside/thumbnailaside_config.cpp
index 7c5dc0fb49..9ec763a718 100644
--- a/effects/thumbnailaside/thumbnailaside_config.cpp
+++ b/effects/thumbnailaside/thumbnailaside_config.cpp
@@ -25,11 +25,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfiggroup.h>
 #include <KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QWidget>
 #include <QVBoxLayout>
diff --git a/effects/trackmouse/trackmouse.cpp b/effects/trackmouse/trackmouse.cpp
index 8cade77ac6..8dc50b1939 100644
--- a/effects/trackmouse/trackmouse.cpp
+++ b/effects/trackmouse/trackmouse.cpp
@@ -33,8 +33,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglutils.h>
 #include <kwinxrenderutils.h>
 
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 
 #include <math.h>
 
diff --git a/effects/trackmouse/trackmouse_config.cpp b/effects/trackmouse/trackmouse_config.cpp
index f54bafbffa..4f52fdf5c3 100644
--- a/effects/trackmouse/trackmouse_config.cpp
+++ b/effects/trackmouse/trackmouse_config.cpp
@@ -22,10 +22,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <KActionCollection>
-#include <KDE/KAboutData>
-#include <KDE/KGlobalAccel>
+#include <KAboutData>
+#include <KGlobalAccel>
 
 #include <QVBoxLayout>
 #include <QLabel>
diff --git a/effects/windowgeometry/windowgeometry.cpp b/effects/windowgeometry/windowgeometry.cpp
index 6086a2ce0c..2994e620ae 100644
--- a/effects/windowgeometry/windowgeometry.cpp
+++ b/effects/windowgeometry/windowgeometry.cpp
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinconfig.h>
 #include <kconfiggroup.h>
 #include <kwindowsystem.h>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 
 using namespace KWin;
 
diff --git a/effects/windowgeometry/windowgeometry_config.cpp b/effects/windowgeometry/windowgeometry_config.cpp
index 9034f0c4d1..b90746cbdc 100644
--- a/effects/windowgeometry/windowgeometry_config.cpp
+++ b/effects/windowgeometry/windowgeometry_config.cpp
@@ -25,10 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 #include <KActionCollection>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <kconfiggroup.h>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 namespace KWin
 {
diff --git a/effects/wobblywindows/wobblywindows_config.cpp b/effects/wobblywindows/wobblywindows_config.cpp
index 827d8681ac..83c4bc7670 100644
--- a/effects/wobblywindows/wobblywindows_config.cpp
+++ b/effects/wobblywindows/wobblywindows_config.cpp
@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
-#include <KDE/KAboutData>
+#include <KLocalizedString>
+#include <KAboutData>
 #include <kconfiggroup.h>
 
 namespace KWin
diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp
index 3ccee78ef9..573f44cb14 100644
--- a/effects/zoom/zoom.cpp
+++ b/effects/zoom/zoom.cpp
@@ -29,9 +29,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtGui/QVector2D>
 #include <QtDBus/QDBusConnection>
 #include <kstandardaction.h>
-#include <KDE/KConfigGroup>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KConfigGroup>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 
 #include <kwinglutils.h>
 #ifdef KWIN_HAVE_XRENDER_COMPOSITING
diff --git a/effects/zoom/zoom_config.cpp b/effects/zoom/zoom_config.cpp
index 5edd8c6a48..8301239156 100644
--- a/effects/zoom/zoom_config.cpp
+++ b/effects/zoom/zoom_config.cpp
@@ -26,10 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QAction>
 #include <kwineffects.h>
 
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <KActionCollection>
-#include <KDE/KAboutData>
+#include <KAboutData>
 
 #include <QVBoxLayout>
 
diff --git a/kcmkwin/kwindecoration/buttons.cpp b/kcmkwin/kwindecoration/buttons.cpp
index 2947eaf173..c4d0368928 100644
--- a/kcmkwin/kwindecoration/buttons.cpp
+++ b/kcmkwin/kwindecoration/buttons.cpp
@@ -42,7 +42,7 @@
 #include <QMimeData>
 #include <QScrollBar>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #ifdef KWIN_BUILD_KAPPMENU
 #include <KConfigGroup>
diff --git a/kcmkwin/kwindecoration/buttonsconfigdialog.cpp b/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
index 2a22b43c79..40ca9009ce 100644
--- a/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
+++ b/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdecoration.h>
 
 namespace KWin
diff --git a/kcmkwin/kwindecoration/decorationmodel.cpp b/kcmkwin/kwindecoration/decorationmodel.cpp
index a3d8a4a2fa..c196e3efd7 100644
--- a/kcmkwin/kwindecoration/decorationmodel.cpp
+++ b/kcmkwin/kwindecoration/decorationmodel.cpp
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfigGroup>
 #include <KDesktopFile>
 #include <KIcon>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KPluginInfo>
 #include <KPluginTrader>
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 9284d3d574..f626ae6d0b 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -47,10 +47,10 @@
 #include <KAboutData>
 #include <kconfigloader.h>
 #include <KDialog>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <KMessageBox>
 #include <KNewStuff3/KNS3/DownloadDialog>
-#include <KDE/KConfigDialogManager>
+#include <KConfigDialogManager>
 #include <KPluginFactory>
 
 // KCModule plugin interface
diff --git a/kcmkwin/kwindecoration/preview.cpp b/kcmkwin/kwindecoration/preview.cpp
index d199139afb..26d357da6c 100644
--- a/kcmkwin/kwindecoration/preview.cpp
+++ b/kcmkwin/kwindecoration/preview.cpp
@@ -20,7 +20,7 @@
 
 #include "preview.h"
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <QApplication>
 #include <QPainter>
diff --git a/kcmkwin/kwindesktop/desktopnameswidget.cpp b/kcmkwin/kwindesktop/desktopnameswidget.cpp
index f7ea7f6fb9..a5c6f70756 100644
--- a/kcmkwin/kwindesktop/desktopnameswidget.cpp
+++ b/kcmkwin/kwindesktop/desktopnameswidget.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QLabel>
 #include <QGridLayout>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <KLineEdit>
 
 namespace KWin
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 61aaa78565..cd15d03f3c 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -25,7 +25,7 @@
 
 #include <QtDBus/QtDBus>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kaboutdata.h>
 #include <KPluginFactory>
diff --git a/kcmkwin/kwinoptions/mouse.h b/kcmkwin/kwinoptions/mouse.h
index 9e137d88a5..c7a1e3c117 100644
--- a/kcmkwin/kwinoptions/mouse.h
+++ b/kcmkwin/kwinoptions/mouse.h
@@ -26,7 +26,7 @@ class KConfig;
 
 #include <kcmodule.h>
 #include <KComboBox>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #include "ui_actions.h"
 #include "ui_mouse.h"
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 9e4c609d7b..0396ebc214 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -34,8 +34,8 @@
 #include <QtDBus/QtDBus>
 #include <QGroupBox>
 
-#include <KDE/KConfig>
-#include <KDE/KLocalizedString>
+#include <KConfig>
+#include <KLocalizedString>
 #include <kdialog.h>
 
 #include <X11/X.h>
diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp
index 3f1aa692a7..b9b049e8f5 100644
--- a/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kcmkwin/kwinrules/detectwidget.cpp
@@ -19,7 +19,7 @@
 #include "detectwidget.h"
 #include "../../cursor.h"
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <QDebug>
 #include <kwindowsystem.h>
 #include <QLabel>
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index e87722173e..167d6aa532 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -21,7 +21,7 @@
 #include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kaboutdata.h>
 #include <QtDBus/QtDBus>
 
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index 915bd2fa2b..c9e80d2ca8 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -19,7 +19,7 @@
 #include <QCommandLineParser>
 #include <QApplication>
 #include <kconfig.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kwindowsystem.h>
 #include <QtDBus/QtDBus>
 #include <X11/Xlib.h>
diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp
index 48fe076a45..a1c5c49973 100644
--- a/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kcmkwin/kwinrules/ruleswidget.cpp
@@ -27,7 +27,7 @@
 #include <QFileInfo>
 #include <QLabel>
 #include <kwindowsystem.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <QRegExp>
 
 #ifdef KWIN_BUILD_ACTIVITIES
diff --git a/kcmkwin/kwinrules/yesnobox.h b/kcmkwin/kwinrules/yesnobox.h
index 1ba83d0bcb..222ff6e3d7 100644
--- a/kcmkwin/kwinrules/yesnobox.h
+++ b/kcmkwin/kwinrules/yesnobox.h
@@ -23,7 +23,7 @@
 #include <QHBoxLayout>
 #include <QRadioButton>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 class YesNoBox : public QWidget {
     Q_OBJECT
diff --git a/kcmkwin/kwinscreenedges/main.cpp b/kcmkwin/kwinscreenedges/main.cpp
index 68e3ce4f7d..fc786aa90e 100644
--- a/kcmkwin/kwinscreenedges/main.cpp
+++ b/kcmkwin/kwinscreenedges/main.cpp
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kservicetypetrader.h>
 
-#include <KDE/KAboutData>
-#include <KDE/KConfigGroup>
+#include <KAboutData>
+#include <KConfigGroup>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <QtDBus/QtDBus>
diff --git a/kcmkwin/kwinscreenedges/monitor.cpp b/kcmkwin/kwinscreenedges/monitor.cpp
index 98ea7abdb2..4ee67664fa 100644
--- a/kcmkwin/kwinscreenedges/monitor.cpp
+++ b/kcmkwin/kwinscreenedges/monitor.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "monitor.h"
 
 #include <QDebug>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <qgraphicsitem.h>
 #include <qgraphicsview.h>
 #include <qgraphicsscene.h>
diff --git a/kcmkwin/kwinscripts/main.cpp b/kcmkwin/kwinscripts/main.cpp
index edd73b6515..f5ee04b307 100644
--- a/kcmkwin/kwinscripts/main.cpp
+++ b/kcmkwin/kwinscripts/main.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KPluginFactory>
+#include <KPluginFactory>
 
 #include "module.h"
 
diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp
index 45377cf4a4..2c3ddc4405 100644
--- a/kcmkwin/kwinscripts/module.cpp
+++ b/kcmkwin/kwinscripts/module.cpp
@@ -27,12 +27,12 @@
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusPendingCall>
 
-#include <KDE/KAboutData>
-#include <KDE/KPluginFactory>
-#include <KDE/KMessageBox>
-#include <KDE/KMessageWidget>
-#include <KDE/KPluginInfo>
-#include <KDE/KServiceTypeTrader>
+#include <KAboutData>
+#include <KPluginFactory>
+#include <KMessageBox>
+#include <KMessageWidget>
+#include <KPluginInfo>
+#include <KServiceTypeTrader>
 #include <Plasma/Package>
 #include <KNewStuff3/KNS3/DownloadDialog>
 
diff --git a/kcmkwin/kwinscripts/module.h b/kcmkwin/kwinscripts/module.h
index 0b2236a714..387c6dab2c 100644
--- a/kcmkwin/kwinscripts/module.h
+++ b/kcmkwin/kwinscripts/module.h
@@ -19,8 +19,8 @@
 #ifndef MODULE_H
 #define MODULE_H
 
-#include <KDE/KCModule>
-#include <KDE/KSharedConfig>
+#include <KCModule>
+#include <KSharedConfig>
 
 namespace Ui
 {
diff --git a/kcmkwin/kwintabbox/layoutpreview.cpp b/kcmkwin/kwintabbox/layoutpreview.cpp
index d0249e599f..87ed1baea1 100644
--- a/kcmkwin/kwintabbox/layoutpreview.cpp
+++ b/kcmkwin/kwintabbox/layoutpreview.cpp
@@ -26,10 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QtCore/QStandardPaths>
-#include <KDE/KConfigGroup>
-#include <KDE/KDesktopFile>
-#include <KDE/KLocalizedString>
-#include <KDE/KService>
+#include <KConfigGroup>
+#include <KDesktopFile>
+#include <KLocalizedString>
+#include <KService>
 
 namespace KWin
 {
diff --git a/killer/killer.cpp b/killer/killer.cpp
index 3d0cc76c2d..5f36cf87af 100644
--- a/killer/killer.cpp
+++ b/killer/killer.cpp
@@ -22,9 +22,9 @@ DEALINGS IN THE SOFTWARE.
 
 ****************************************************************************/
 
-#include <KDE/KMessageBox>
-#include <KDE/KLocalizedString>
-#include <KDE/KAuth/Action>
+#include <KMessageBox>
+#include <KLocalizedString>
+#include <KAuth/Action>
 #include <QApplication>
 #include <qcommandlineparser.h>
 #include <QDebug>
diff --git a/libkdecorations/kcommondecoration.cpp b/libkdecorations/kcommondecoration.cpp
index 07eab606ea..f6d31014b2 100644
--- a/libkdecorations/kcommondecoration.cpp
+++ b/libkdecorations/kcommondecoration.cpp
@@ -35,7 +35,7 @@
 #include <QWidget>
 
 #include "kdecorationfactory.h"
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #include "kcommondecoration.moc"
 
diff --git a/libkdecorations/kdecoration.cpp b/libkdecorations/kdecoration.cpp
index ec164c3c7d..a1ae1d779d 100644
--- a/libkdecorations/kdecoration.cpp
+++ b/libkdecorations/kdecoration.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #include <QApplication>
 #include <QMenu>
 #include <QWindow>
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 #include <assert.h>
 #include <X11/Xlib.h>
 #include <fixx11h.h>
diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp
index 15aa119a6e..e44e441e4c 100644
--- a/libkdecorations/kdecoration_plugins_p.cpp
+++ b/libkdecorations/kdecoration_plugins_p.cpp
@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
 #include <KPluginLoader>
 #include <KPluginTrader>
 #include <kconfiggroup.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <assert.h>
 
 #include <QDebug>
diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h
index d37535f970..e2a7b84ba0 100644
--- a/libkwineffects/kwineffects.h
+++ b/libkwineffects/kwineffects.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QHash>
 #include <QStack>
 
-#include <KDE/KPluginFactory>
+#include <KPluginFactory>
 
 #include <assert.h>
 #include <limits.h>
diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp
index 23b225ac7e..c075743935 100644
--- a/libkwineffects/kwinglutils.cpp
+++ b/libkwineffects/kwinglutils.cpp
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kwineffects.h"
 #include "kwinglplatform.h"
 
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
+#include <KConfig>
+#include <KConfigGroup>
 
 #include <QDebug>
 #include <QPixmap>
diff --git a/libkwineffects/kwinxrenderutils.h b/libkwineffects/kwinxrenderutils.h
index 8366fd3a9f..c57b6fc127 100644
--- a/libkwineffects/kwinxrenderutils.h
+++ b/libkwineffects/kwinxrenderutils.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglobals.h>
 #include <kwineffects_export.h>
 // KDE
-#include <KDE/KSharedPtr>
+#include <KSharedPtr>
 // Qt
 #include <QRegion>
 #include <QVector>
diff --git a/main.cpp b/main.cpp
index 8e3eb6b442..4b5a7675a8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -32,11 +32,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <ksmserver_interface.h>
 
 // KDE
-#include <KDE/KAboutData>
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KCrash>
-#include <KDE/KLocalizedString>
+#include <KAboutData>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KCrash>
+#include <KLocalizedString>
 // Qt
 #include <qplatformdefs.h>
 #include <QDebug>
diff --git a/main.h b/main.h
index de4f9989ef..c1db5a7ca7 100644
--- a/main.h
+++ b/main.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef MAIN_H
 #define MAIN_H
 
-#include <KDE/KSelectionWatcher>
+#include <KSelectionWatcher>
 // Qt
 #include <QApplication>
 #include <QAbstractNativeEventFilter>
diff --git a/netinfo.h b/netinfo.h
index bf98b5b161..6a79ea55ee 100644
--- a/netinfo.h
+++ b/netinfo.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_NETINFO_H
 #define KWIN_NETINFO_H
 
-#include <KDE/NETRootInfo>
+#include <NETRootInfo>
 
 #include <xcb/xcb.h>
 
diff --git a/rules.cpp b/rules.cpp
index 7a50f1bb5d..fde8350d20 100644
--- a/rules.cpp
+++ b/rules.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <fixx11h.h>
 #include <kconfig.h>
-#include <KDE/KXMessages>
+#include <KXMessages>
 #include <QRegExp>
 #include <QTemporaryFile>
 #include <QFile>
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 2985df6665..84bca4fa36 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -67,8 +67,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QVector4D>
 #include <QMatrix4x4>
 
-#include <KDE/KLocalizedString>
-#include <KDE/KNotification>
+#include <KLocalizedString>
+#include <KNotification>
 #include <KProcess>
 
 namespace KWin
diff --git a/screenedge.h b/screenedge.h
index f1c579cf19..d6db151ce0 100644
--- a/screenedge.h
+++ b/screenedge.h
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kwinglobals.h"
 #include "xcbutils.h"
 // KDE includes
-#include <KDE/KConfig>
+#include <KConfig>
 // Qt
 #include <QObject>
 #include <QVector>
diff --git a/screens.h b/screens.h
index e4df1fa45d..3e5ab8b95e 100644
--- a/screens.h
+++ b/screens.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KWin includes
 #include <kwinglobals.h>
 // KDE includes
-#include <KDE/KConfig>
+#include <KConfig>
 // Qt includes
 #include <QObject>
 #include <QRect>
diff --git a/scripting/genericscriptedconfig.cpp b/scripting/genericscriptedconfig.cpp
index b29877af57..19ee333d95 100644
--- a/scripting/genericscriptedconfig.cpp
+++ b/scripting/genericscriptedconfig.cpp
@@ -20,8 +20,8 @@
 
 #include "genericscriptedconfig.h"
 #include "config-kwin.h"
-#include <KDE/KAboutData>
-#include <KDE/KLocalizedString>
+#include <KAboutData>
+#include <KLocalizedString>
 #include <kconfigloader.h>
 
 #include <QDBusConnection>
diff --git a/scripting/scriptedeffect.cpp b/scripting/scriptedeffect.cpp
index 3eba9c4bc8..d789691904 100644
--- a/scripting/scriptedeffect.cpp
+++ b/scripting/scriptedeffect.cpp
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../screenedge.h"
 #endif
 // KDE
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 #include <kconfigloader.h>
 // Qt
 #include <QDebug>
diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp
index f6af34754d..0ee864ae6c 100644
--- a/scripting/scripting.cpp
+++ b/scripting/scripting.cpp
@@ -32,9 +32,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../options.h"
 #include "../workspace.h"
 // KDE
-#include <KDE/KConfigGroup>
-#include <KDE/KPluginInfo>
-#include <KDE/KServiceTypeTrader>
+#include <KConfigGroup>
+#include <KPluginInfo>
+#include <KServiceTypeTrader>
 // Qt
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
diff --git a/scripting/scriptingutils.h b/scripting/scriptingutils.h
index 6477c3d880..dff15aa92a 100644
--- a/scripting/scriptingutils.h
+++ b/scripting/scriptingutils.h
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "screenedge.h"
 #endif
 
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <QAction>
 #include <QDebug>
 #include <QtScript/QScriptEngine>
diff --git a/tabbox/tabbox.cpp b/tabbox/tabbox.cpp
index ce15837aea..589cd8fabb 100644
--- a/tabbox/tabbox.cpp
+++ b/tabbox/tabbox.cpp
@@ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KDE
 #include <KConfig>
 #include <KConfigGroup>
-#include <KDE/KGlobalAccel>
+#include <KGlobalAccel>
 #include <KLocalizedString>
 #include <kkeyserver.h>
 // X11
diff --git a/toplevel.h b/toplevel.h
index 3525dac57b..7e818a34a1 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "virtualdesktops.h"
 #include "xcbutils.h"
 // KDE
-#include <KDE/NETWinInfo>
+#include <NETWinInfo>
 // Qt
 #include <QObject>
 // xcb
diff --git a/useractions.cpp b/useractions.cpp
index 34f92149c8..2d3767cd39 100755
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -46,8 +46,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kactivities/info.h>
 #endif
 
-#include <KDE/KProcess>
-#include <KDE/KToolInvocation>
+#include <KProcess>
+#include <KToolInvocation>
 
 #ifndef KWIN_NO_XF86VM
 #include <X11/extensions/xf86vmode.h>
@@ -58,8 +58,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtConcurrentRun>
 #include <QPushButton>
 
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
+#include <KGlobalAccel>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <QRegExp>
 #include <QMenu>
diff --git a/utils.h b/utils.h
index 69cfa03b92..7097daa78e 100644
--- a/utils.h
+++ b/utils.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // kwin
 #include <kwinglobals.h>
 // KDE
-#include <KDE/NET>
+#include <NET>
 // Qt
 #include <QList>
 #include <QPoint>
diff --git a/virtualdesktops.cpp b/virtualdesktops.cpp
index c71f4f7057..fd0f5edc1b 100644
--- a/virtualdesktops.cpp
+++ b/virtualdesktops.cpp
@@ -20,10 +20,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "virtualdesktops.h"
 // KDE
-#include <KDE/KConfigGroup>
-#include <KDE/KGlobalAccel>
-#include <KDE/KLocalizedString>
-#include <KDE/NETRootInfo>
+#include <KConfigGroup>
+#include <KGlobalAccel>
+#include <KLocalizedString>
+#include <NETRootInfo>
 // Qt
 #include <QAction>
 
diff --git a/virtualdesktops.h b/virtualdesktops.h
index 145b638fe4..d536b69458 100644
--- a/virtualdesktops.h
+++ b/virtualdesktops.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QPoint>
 #include <QSize>
 // KDE includes
-#include <KDE/KConfig>
+#include <KConfig>
 
 class KLocalizedString;
 class NETRootInfo;
diff --git a/workspace.cpp b/workspace.cpp
index 65f84572c2..a60ded319e 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -63,12 +63,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "xcbutils.h"
 #include "main.h"
 // KDE
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KLocalizedString>
-#include <KDE/KStartupInfo>
-#include <KDE/KWindowInfo>
-#include <KDE/KWindowSystem>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KLocalizedString>
+#include <KStartupInfo>
+#include <KWindowInfo>
+#include <KWindowSystem>
 // Qt
 #include <QtConcurrentRun>