diff --git a/kcontrol/input/kcmcursortheme.cpp b/kcontrol/input/kcmcursortheme.cpp
index 44e62c4c..bb95a6a0 100644
--- a/kcontrol/input/kcmcursortheme.cpp
+++ b/kcontrol/input/kcmcursortheme.cpp
@@ -18,8 +18,8 @@
 
 #include "kcmcursortheme.h"
 
-#include <KDE/KAboutData>
-#include <KDE/KPluginFactory>
+#include <KAboutData>
+#include <KPluginFactory>
 
 K_PLUGIN_FACTORY(CursorThemeConfigFactory,
     registerPlugin<CursorThemeConfig>();
diff --git a/kcontrol/input/kcmcursortheme.h b/kcontrol/input/kcmcursortheme.h
index f955f4d1..d9e32b23 100644
--- a/kcontrol/input/kcmcursortheme.h
+++ b/kcontrol/input/kcmcursortheme.h
@@ -19,7 +19,7 @@
 #ifndef KCMCURSORTHEME_H
 #define KCMCURSORTHEME_H
 
-#include <KDE/KCModule>
+#include <KCModule>
 #include "themepage.h"
 
 class CursorThemeConfig : public KCModule
diff --git a/kcontrol/keys/export_scheme_dialog.cpp b/kcontrol/keys/export_scheme_dialog.cpp
index 49ca7f3d..e029d102 100644
--- a/kcontrol/keys/export_scheme_dialog.cpp
+++ b/kcontrol/keys/export_scheme_dialog.cpp
@@ -19,7 +19,7 @@
 
 #include "export_scheme_dialog.h"
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 #include <QtGui/QCheckBox>
 
diff --git a/kcontrol/keys/globalshortcuts.cpp b/kcontrol/keys/globalshortcuts.cpp
index 309b01e5..f1d71c44 100644
--- a/kcontrol/keys/globalshortcuts.cpp
+++ b/kcontrol/keys/globalshortcuts.cpp
@@ -21,9 +21,9 @@
 
 #include "kglobalshortcutseditor.h"
 
-#include <KDE/KLocale>
-#include <KDE/KMessageBox>
-#include <KDE/KPluginFactory>
+#include <KLocale>
+#include <KMessageBox>
+#include <KPluginFactory>
 
 
 #include <QtGui/QLayout>
diff --git a/kcontrol/keys/kglobalshortcutseditor.cpp b/kcontrol/keys/kglobalshortcutseditor.cpp
index 662c280c..0f930027 100644
--- a/kcontrol/keys/kglobalshortcutseditor.cpp
+++ b/kcontrol/keys/kglobalshortcutseditor.cpp
@@ -24,13 +24,13 @@
 #include "kglobalaccel_interface.h"
 #include "kglobalaccel_component_interface.h"
 
-#include <KDE/KActionCollection>
-#include <KDE/KDebug>
-#include <KDE/KFileDialog>
-#include <KDE/KGlobalAccel>
-#include <KDE/KMessageBox>
-#include <KDE/KShortcut>
-#include <KDE/KStringHandler>
+#include <KActionCollection>
+#include <KDebug>
+#include <KFileDialog>
+#include <KGlobalAccel>
+#include <KMessageBox>
+#include <KShortcut>
+#include <KStringHandler>
 
 #include <QtGui/QStackedWidget>
 #include <QtGui/QMenu>
diff --git a/kcontrol/kfontinst/apps/Installer.cpp b/kcontrol/kfontinst/apps/Installer.cpp
index 9747fe3f..210b7f76 100644
--- a/kcontrol/kfontinst/apps/Installer.cpp
+++ b/kcontrol/kfontinst/apps/Installer.cpp
@@ -25,14 +25,14 @@
 #include "Misc.h"
 #include "FontsPackage.h"
 #include <QtCore/QFile>
-#include <KDE/KCmdLineArgs>
-#include <KDE/KAboutData>
-#include <KDE/KApplication>
-#include <KDE/KZip>
-#include <KDE/KTempDir>
-#include <KDE/KMessageBox>
-#include <KDE/KStandardDirs>
-#include <KDE/KIO/NetAccess>
+#include <KCmdLineArgs>
+#include <KAboutData>
+#include <KApplication>
+#include <KZip>
+#include <KTempDir>
+#include <KMessageBox>
+#include <KStandardDirs>
+#include <KIO/NetAccess>
 #include "JobRunner.h"
 #include "CreateParent.h"
 
diff --git a/kcontrol/kfontinst/apps/Installer.h b/kcontrol/kfontinst/apps/Installer.h
index 29237e58..f259491d 100644
--- a/kcontrol/kfontinst/apps/Installer.h
+++ b/kcontrol/kfontinst/apps/Installer.h
@@ -25,7 +25,7 @@
  */
 
 #include <QtCore/QSet>
-#include <KDE/KUrl>
+#include <KUrl>
 
 class QWidget;
 class KTempDir;
diff --git a/kcontrol/kfontinst/apps/Printer.cpp b/kcontrol/kfontinst/apps/Printer.cpp
index 3a0e26c6..0a0aee9c 100644
--- a/kcontrol/kfontinst/apps/Printer.cpp
+++ b/kcontrol/kfontinst/apps/Printer.cpp
@@ -39,9 +39,9 @@
 #include <QtGui/QGridLayout>
 #include <QtGui/QProgressBar>
 #include <QtGui/QCloseEvent>
-#include <KDE/KCmdLineArgs>
-#include <KDE/KAboutData>
-#include <KDE/KApplication>
+#include <KCmdLineArgs>
+#include <KAboutData>
+#include <KApplication>
 #include <kdeprintdialog.h>
 
 #if defined(Q_WS_X11) || defined(Q_WS_QWS)
diff --git a/kcontrol/kfontinst/apps/Printer.h b/kcontrol/kfontinst/apps/Printer.h
index 910e3285..146bc3e3 100644
--- a/kcontrol/kfontinst/apps/Printer.h
+++ b/kcontrol/kfontinst/apps/Printer.h
@@ -24,7 +24,7 @@
 #ifndef __PRINTER_H__
 #define __PRINTER_H__
 
-#include <KDE/KDialog>
+#include <KDialog>
 #include <QtCore/QThread>
 #include <QtCore/QList>
 #include <QtGui/QFont>
diff --git a/kcontrol/kfontinst/apps/Viewer.cpp b/kcontrol/kfontinst/apps/Viewer.cpp
index ff283fda..7e8f9775 100644
--- a/kcontrol/kfontinst/apps/Viewer.cpp
+++ b/kcontrol/kfontinst/apps/Viewer.cpp
@@ -23,19 +23,19 @@
 
 #include "Viewer.h"
 #include "KfiConstants.h"
-#include <KDE/KCmdLineArgs>
-#include <KDE/KAboutData>
-#include <KDE/KUniqueApplication>
-#include <KDE/KPluginLoader>
-#include <KDE/KPluginFactory>
-#include <KDE/KLocale>
-#include <KDE/KGlobal>
-#include <KDE/KFileDialog>
-#include <KDE/KConfig>
-#include <KDE/KStandardAction>
-#include <KDE/KActionCollection>
-#include <KDE/KShortcutsDialog>
-#include <KDE/KParts/BrowserExtension>
+#include <KCmdLineArgs>
+#include <KAboutData>
+#include <KUniqueApplication>
+#include <KPluginLoader>
+#include <KPluginFactory>
+#include <KLocale>
+#include <KGlobal>
+#include <KFileDialog>
+#include <KConfig>
+#include <KStandardAction>
+#include <KActionCollection>
+#include <KShortcutsDialog>
+#include <KParts/BrowserExtension>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/apps/Viewer.h b/kcontrol/kfontinst/apps/Viewer.h
index b0fafe52..b5b786ec 100644
--- a/kcontrol/kfontinst/apps/Viewer.h
+++ b/kcontrol/kfontinst/apps/Viewer.h
@@ -24,8 +24,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KParts/ReadOnlyPart>
-#include <KDE/KParts/MainWindow>
+#include <KParts/ReadOnlyPart>
+#include <KParts/MainWindow>
 
 class QAction;
 
diff --git a/kcontrol/kfontinst/dbus/Folder.cpp b/kcontrol/kfontinst/dbus/Folder.cpp
index 328dfad0..7bddf176 100644
--- a/kcontrol/kfontinst/dbus/Folder.cpp
+++ b/kcontrol/kfontinst/dbus/Folder.cpp
@@ -29,10 +29,10 @@
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
 #include <QtXml/QDomNode>
-#include <KDE/KStandardDirs>
-#include <KDE/KSaveFile>
-#include <KDE/KShell>
-#include <KDE/KDebug>
+#include <KStandardDirs>
+#include <KSaveFile>
+#include <KShell>
+#include <KDebug>
 #include <fontconfig/fontconfig.h>
 #include "Folder.h"
 #include "FcConfig.h"
diff --git a/kcontrol/kfontinst/dbus/FontInst.cpp b/kcontrol/kfontinst/dbus/FontInst.cpp
index ef6c5b8d..37d5adeb 100644
--- a/kcontrol/kfontinst/dbus/FontInst.cpp
+++ b/kcontrol/kfontinst/dbus/FontInst.cpp
@@ -24,7 +24,7 @@
 #include <QtDBus/QDBusConnection>
 #include <QtCore/QTimer>
 #include <kauth.h>
-#include <KDE/KDebug>
+#include <KDebug>
 #include <kio/global.h>
 #include <kde_file.h>
 #include <fontconfig/fontconfig.h>
diff --git a/kcontrol/kfontinst/dbus/FontInst.h b/kcontrol/kfontinst/dbus/FontInst.h
index e53ee6aa..1365efda 100644
--- a/kcontrol/kfontinst/dbus/FontInst.h
+++ b/kcontrol/kfontinst/dbus/FontInst.h
@@ -28,7 +28,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QSet>
 #include <QtDBus/QtDBus>
-#include <KDE/KJob>
+#include <KJob>
 #include "Family.h"
 #include "Folder.h"
 #include "FontinstIface.h"
diff --git a/kcontrol/kfontinst/dbus/Helper.cpp b/kcontrol/kfontinst/dbus/Helper.cpp
index ec5d9f99..bb491604 100644
--- a/kcontrol/kfontinst/dbus/Helper.cpp
+++ b/kcontrol/kfontinst/dbus/Helper.cpp
@@ -26,7 +26,7 @@
 #include "FontInst.h"
 #include "Misc.h"
 #include "Utils.h"
-#include <KDE/KDebug>
+#include <KDebug>
 #include <QtXml/QDomDocument>
 #include <QtCore/QTextCodec>
 #include <kio/global.h>
diff --git a/kcontrol/kfontinst/dbus/Utils.cpp b/kcontrol/kfontinst/dbus/Utils.cpp
index 3a170085..a8caef0a 100644
--- a/kcontrol/kfontinst/dbus/Utils.cpp
+++ b/kcontrol/kfontinst/dbus/Utils.cpp
@@ -24,7 +24,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QByteArray>
 #include <QtCore/QTextStream>
-#include <KDE/KShell>
+#include <KShell>
 #include <fontconfig/fontconfig.h>
 #include "Utils.h"
 #include "FontInst.h"
diff --git a/kcontrol/kfontinst/kcmfontinst/ActionLabel.cpp b/kcontrol/kfontinst/kcmfontinst/ActionLabel.cpp
index 31b37f12..0dbca8ad 100644
--- a/kcontrol/kfontinst/kcmfontinst/ActionLabel.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/ActionLabel.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "ActionLabel.h"
-#include <KDE/KIconLoader>
+#include <KIconLoader>
 #include <QtGui/QLabel>
 #include <QtCore/QTimer>
 #include <QtGui/QPixmap>
diff --git a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
index 0e6fd4ff..7809a489 100644
--- a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
@@ -28,15 +28,15 @@
 #include "FcEngine.h"
 #include "FontList.h"
 #include "JobRunner.h"
-#include <KDE/KGlobal>
-#include <KDE/KIconLoader>
-#include <KDE/KLocale>
-#include <KDE/KMessageBox>
-#include <KDE/SuProcess>
-#include <KDE/KFileItem>
-#include <KDE/KPropertiesDialog>
-#include <KDE/KShell>
-#include <KDE/KStandardDirs>
+#include <KGlobal>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMessageBox>
+#include <SuProcess>
+#include <KFileItem>
+#include <KPropertiesDialog>
+#include <KShell>
+#include <KStandardDirs>
 #include <QtGui/QLabel>
 #include <QtCore/QTimer>
 #include <QtGui/QGridLayout>
diff --git a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.h b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.h
index 6ff807b6..917a11bf 100644
--- a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.h
+++ b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.h
@@ -27,7 +27,7 @@
 #include <QtGui/QPixmap>
 #include <QtCore/QThread>
 #include <QtGui/QTreeWidget>
-#include <KDE/KDialog>
+#include <KDialog>
 #include "Misc.h"
 #include "JobRunner.h"
 
diff --git a/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp b/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp
index 67ced798..998945e4 100644
--- a/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/FontFilter.cpp
@@ -24,12 +24,12 @@
 #include "FontFilter.h"
 #include "FontFilterProxyStyle.h"
 #include "FontList.h"
-#include <KDE/KLocale>
-#include <KDE/KIconLoader>
-#include <KDE/KToggleAction>
-#include <KDE/KSelectAction>
-#include <KDE/KIcon>
-#include <KDE/KMimeType>
+#include <KLocale>
+#include <KIconLoader>
+#include <KToggleAction>
+#include <KSelectAction>
+#include <KIcon>
+#include <KMimeType>
 #include <QtGui/QLabel>
 #include <QtGui/QPen>
 #include <QtGui/QPainter>
diff --git a/kcontrol/kfontinst/kcmfontinst/FontFilter.h b/kcontrol/kfontinst/kcmfontinst/FontFilter.h
index 276af332..65b35bef 100644
--- a/kcontrol/kfontinst/kcmfontinst/FontFilter.h
+++ b/kcontrol/kfontinst/kcmfontinst/FontFilter.h
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KLineEdit>
+#include <KLineEdit>
 #include <QtGui/QPixmap>
 #include <QtGui/QFontDatabase>
 
diff --git a/kcontrol/kfontinst/kcmfontinst/FontList.cpp b/kcontrol/kfontinst/kcmfontinst/FontList.cpp
index 52a69a2e..f388d7ad 100644
--- a/kcontrol/kfontinst/kcmfontinst/FontList.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/FontList.cpp
@@ -22,16 +22,16 @@
  */
 
 #include "FontList.h"
-#include <KDE/KGlobal>
-#include <KDE/KStandardDirs>
-#include <KDE/KLocale>
-#include <KDE/KMimeType>
-#include <KDE/KMenu>
-#include <KDE/KIcon>
-#include <KDE/KIconLoader>
+#include <KGlobal>
+#include <KStandardDirs>
+#include <KLocale>
+#include <KMimeType>
+#include <KMenu>
+#include <KIcon>
+#include <KIconLoader>
 #include <kde_file.h>
-#include <KDE/KMessageBox>
-#include <KDE/KColorScheme>
+#include <KMessageBox>
+#include <KColorScheme>
 #include <QtCore/QProcess>
 #include <QtGui/QFont>
 #include <QtCore/QMap>
diff --git a/kcontrol/kfontinst/kcmfontinst/FontList.h b/kcontrol/kfontinst/kcmfontinst/FontList.h
index 9847ac7d..184941fd 100644
--- a/kcontrol/kfontinst/kcmfontinst/FontList.h
+++ b/kcontrol/kfontinst/kcmfontinst/FontList.h
@@ -24,9 +24,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KUrl>
-#include <KDE/KFileItem>
-#include <KDE/KIO/Job>
+#include <KUrl>
+#include <KFileItem>
+#include <KIO/Job>
 #include <QtCore/QList>
 #include <QtCore/QSet>
 #include <QtCore/QHash>
diff --git a/kcontrol/kfontinst/kcmfontinst/FontsPackage.cpp b/kcontrol/kfontinst/kcmfontinst/FontsPackage.cpp
index ff93798d..8f992055 100644
--- a/kcontrol/kfontinst/kcmfontinst/FontsPackage.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/FontsPackage.cpp
@@ -21,9 +21,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KZip>
-#include <KDE/KTempDir>
-#include <KDE/KStandardDirs>
+#include <KZip>
+#include <KTempDir>
+#include <KStandardDirs>
 #include "FontsPackage.h"
 #include "KfiConstants.h"
 #include "Misc.h"
diff --git a/kcontrol/kfontinst/kcmfontinst/FontsPackage.h b/kcontrol/kfontinst/kcmfontinst/FontsPackage.h
index db0cfc06..f0962fac 100644
--- a/kcontrol/kfontinst/kcmfontinst/FontsPackage.h
+++ b/kcontrol/kfontinst/kcmfontinst/FontsPackage.h
@@ -27,7 +27,7 @@
 class KTempDir;
 
 #include <QtCore/QSet>
-#include <KDE/KUrl>
+#include <KUrl>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/kcmfontinst/GroupList.cpp b/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
index 1394838b..214885b8 100644
--- a/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
@@ -23,14 +23,14 @@
 
 #include "GroupList.h"
 #include "FontList.h"
-#include <KDE/KGlobal>
-#include <KDE/KStandardDirs>
-#include <KDE/KLocale>
-#include <KDE/KMimeType>
-#include <KDE/KIconLoader>
+#include <KGlobal>
+#include <KStandardDirs>
+#include <KLocale>
+#include <KMimeType>
+#include <KIconLoader>
 #include <kde_file.h>
-#include <KDE/KMessageBox>
-#include <KDE/KSaveFile>
+#include <KMessageBox>
+#include <KSaveFile>
 #include <QtGui/QFont>
 #include <QtGui/QFontDatabase>
 #include <QtGui/QDropEvent>
diff --git a/kcontrol/kfontinst/kcmfontinst/GroupList.h b/kcontrol/kfontinst/kcmfontinst/GroupList.h
index 41080384..21234d43 100644
--- a/kcontrol/kfontinst/kcmfontinst/GroupList.h
+++ b/kcontrol/kfontinst/kcmfontinst/GroupList.h
@@ -24,10 +24,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KUrl>
-#include <KDE/KFileItem>
-#include <KDE/KIO/Job>
-#include <KDE/KDirLister>
+#include <KUrl>
+#include <KFileItem>
+#include <KIO/Job>
+#include <KDirLister>
 #include <QtCore/QList>
 #include <QtGui/QTreeView>
 #include <QtCore/QAbstractItemModel>
diff --git a/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp b/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp
index e70e0945..ab9e3a1c 100644
--- a/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/JobRunner.cpp
@@ -26,13 +26,13 @@
 #include "Misc.h"
 #include "Fc.h"
 #include "ActionLabel.h"
-#include <KDE/KGlobal>
-#include <KDE/KIconLoader>
-#include <KDE/KLocale>
-#include <KDE/KIO/NetAccess>
-#include <KDE/KStandardDirs>
-#include <KDE/KTempDir>
-#include <KDE/KSharedConfig>
+#include <KGlobal>
+#include <KIconLoader>
+#include <KLocale>
+#include <KIO/NetAccess>
+#include <KStandardDirs>
+#include <KTempDir>
+#include <KSharedConfig>
 #include <kio/global.h>
 #include <QtGui/QGridLayout>
 #include <QtGui/QProgressBar>
diff --git a/kcontrol/kfontinst/kcmfontinst/JobRunner.h b/kcontrol/kfontinst/kcmfontinst/JobRunner.h
index 2c115a0a..1affcc48 100644
--- a/kcontrol/kfontinst/kcmfontinst/JobRunner.h
+++ b/kcontrol/kfontinst/kcmfontinst/JobRunner.h
@@ -24,8 +24,8 @@
 #ifndef __JOB_RUNNER_H__
 #define __JOB_RUNNER_H__
 
-#include <KDE/KUrl>
-#include <KDE/KDialog>
+#include <KUrl>
+#include <KDialog>
 #include "FontInstInterface.h"
 
 class QLabel;
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 030042db..2b570398 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -45,29 +45,29 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QProcess>
 #include <QtCore/QTextStream>
-#include <KDE/KAboutData>
-#include <KDE/KToolBar>
-#include <KDE/KFileDialog>
-#include <KDE/KMessageBox>
-#include <KDE/KIO/Job>
-#include <KDE/KIO/NetAccess>
-#include <KDE/KPushButton>
-#include <KDE/KGlobal>
-#include <KDE/KGuiItem>
-#include <KDE/KInputDialog>
-#include <KDE/KIconLoader>
-#include <KDE/KProgressDialog>
-#include <KDE/KTempDir>
-#include <KDE/KTemporaryFile>
-#include <KDE/KIcon>
-#include <KDE/KActionMenu>
-#include <KDE/KToggleAction>
-#include <KDE/KStandardDirs>
-#include <KDE/KMenu>
-#include <KDE/KPluginFactory>
-#include <KDE/KPluginLoader>
-#include <KDE/KStandardAction>
-#include <KDE/KZip>
+#include <KAboutData>
+#include <KToolBar>
+#include <KFileDialog>
+#include <KMessageBox>
+#include <KIO/Job>
+#include <KIO/NetAccess>
+#include <KPushButton>
+#include <KGlobal>
+#include <KGuiItem>
+#include <KInputDialog>
+#include <KIconLoader>
+#include <KProgressDialog>
+#include <KTempDir>
+#include <KTemporaryFile>
+#include <KIcon>
+#include <KActionMenu>
+#include <KToggleAction>
+#include <KStandardDirs>
+#include <KMenu>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KStandardAction>
+#include <KZip>
 
 #define CFG_GROUP                  "Main Settings"
 #define CFG_PREVIEW_SPLITTER_SIZES "PreviewSplitterSizes"
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 55d15804..ad8e4a1a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -27,10 +27,10 @@
 #include "GroupList.h"
 #include "JobRunner.h"
 #include <QtCore/QSet>
-#include <KDE/KCModule>
-#include <KDE/KUrl>
-#include <KDE/KConfig>
-#include <KDE/KIO/Job>
+#include <KCModule>
+#include <KUrl>
+#include <KConfig>
+#include <KIO/Job>
 
 class KPushButton;
 class KProgressDialog;
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
index 09a826b6..83afc16c 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
@@ -25,7 +25,7 @@
 #include <QtGui/QFrame>
 #include <QtGui/QLabel>
 #include <QtGui/QGridLayout>
-#include <KDE/KLocale>
+#include <KLocale>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h
index ea104c67..6266529a 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KDialog>
+#include <KDialog>
 #include <QtGui/QComboBox>
 
 namespace KFI
diff --git a/kcontrol/kfontinst/kio/FontInstInterface.cpp b/kcontrol/kfontinst/kio/FontInstInterface.cpp
index a75d5ab4..c8ae4e0a 100644
--- a/kcontrol/kfontinst/kio/FontInstInterface.cpp
+++ b/kcontrol/kfontinst/kio/FontInstInterface.cpp
@@ -24,7 +24,7 @@
 #include "FontInstInterface.h"
 #include "FontinstIface.h"
 #include "FontInst.h"
-#include <KDE/KDebug>
+#include <KDebug>
 #include <kio/global.h>
 #include <QtDBus/QDBusServiceWatcher>
 #include "config-fontinst.h"
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index e899455d..bf8d18f5 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -23,13 +23,13 @@
 
 #include <QtCore/QFile>
 #include <QtCore/QCoreApplication>
-#include <KDE/KComponentData>
-#include <KDE/KDebug>
-#include <KDE/KMimeType>
-#include <KDE/KStandardDirs>
-#include <KDE/KTemporaryFile>
-#include <KDE/KTempDir>
-#include <KDE/KZip>
+#include <KComponentData>
+#include <KDebug>
+#include <KMimeType>
+#include <KStandardDirs>
+#include <KTemporaryFile>
+#include <KTempDir>
+#include <KZip>
 #include <kde_file.h>
 #include <unistd.h>
 #include <pwd.h>
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index cf453672..1762f5db 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KIO/SlaveBase>
+#include <KIO/SlaveBase>
 #include <QtDBus/QtDBus>
 #include <sys/types.h>
 
diff --git a/kcontrol/kfontinst/lib/Family.cpp b/kcontrol/kfontinst/lib/Family.cpp
index 0a1d3dfc..91cc1bd3 100644
--- a/kcontrol/kfontinst/lib/Family.cpp
+++ b/kcontrol/kfontinst/lib/Family.cpp
@@ -23,7 +23,7 @@
 
 #include <QtCore/QTextStream>
 #include <QtXml/QDomElement>
-#include <KDE/KDebug>
+#include <KDebug>
 #include "Family.h"
 #include "Misc.h"
 #include "XmlStrings.h"
diff --git a/kcontrol/kfontinst/lib/Fc.h b/kcontrol/kfontinst/lib/Fc.h
index cf632bd6..edd6433c 100644
--- a/kcontrol/kfontinst/lib/Fc.h
+++ b/kcontrol/kfontinst/lib/Fc.h
@@ -24,7 +24,7 @@
 #ifndef __FC_H__
 #define __FC_H__
 
-#include <KDE/KUrl>
+#include <KUrl>
 #include <fontconfig/fontconfig.h>
 #include "kfontinst_export.h"
 #include "KfiConstants.h"
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 8b74fceb..decf6032 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -28,13 +28,13 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 #include <QtGui/QX11Info>
-#include <KDE/KUrl>
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KGlobalSettings>
-#include <KDE/KIO/NetAccess>
-#include <KDE/KGlobal>
-#include <KDE/KLocale>
+#include <KUrl>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KGlobalSettings>
+#include <KIO/NetAccess>
+#include <KGlobal>
+#include <KLocale>
 #include <math.h>
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
diff --git a/kcontrol/kfontinst/lib/KfiConstants.h b/kcontrol/kfontinst/lib/KfiConstants.h
index 2101dcb5..f3e43b06 100644
--- a/kcontrol/kfontinst/lib/KfiConstants.h
+++ b/kcontrol/kfontinst/lib/KfiConstants.h
@@ -25,7 +25,7 @@
  */
 
 #include <QtCore/QLatin1String>
-#include <KDE/KLocale>
+#include <KLocale>
 #include <kio/udsentry.h>
 
 #define KFI_NAME                     "kfontinst"
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index 32961e9c..4aa057ef 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -32,7 +32,7 @@
 #include <QtCore/QTextStream>
 #include <QtCore/QProcess>
 #include <QtCore/QTemporaryFile>
-#include <KDE/KStandardDirs>
+#include <KStandardDirs>
 #include <kde_file.h>
 #include <unistd.h>
 #include <ctype.h>
diff --git a/kcontrol/kfontinst/lib/Misc.h b/kcontrol/kfontinst/lib/Misc.h
index 76704043..be69af98 100644
--- a/kcontrol/kfontinst/lib/Misc.h
+++ b/kcontrol/kfontinst/lib/Misc.h
@@ -31,7 +31,7 @@
 
 #include <QtCore/QDataStream>
 #include <QtCore/QFile>
-#include <KDE/KUrl>
+#include <KUrl>
 #include "KfiConstants.h"
 
 class QTextStream;
diff --git a/kcontrol/kfontinst/lib/WritingSystems.cpp b/kcontrol/kfontinst/lib/WritingSystems.cpp
index 2e4c90f0..42ac22c0 100644
--- a/kcontrol/kfontinst/lib/WritingSystems.cpp
+++ b/kcontrol/kfontinst/lib/WritingSystems.cpp
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KGlobal>
+#include <KGlobal>
 #include <QtGui/QFontDatabase>
 #include <fontconfig/fontconfig.h>
 #include "WritingSystems.h"
diff --git a/kcontrol/kfontinst/strigi-analyzer/FontEngine.cpp b/kcontrol/kfontinst/strigi-analyzer/FontEngine.cpp
index 8e00bd55..a7a6e244 100644
--- a/kcontrol/kfontinst/strigi-analyzer/FontEngine.cpp
+++ b/kcontrol/kfontinst/strigi-analyzer/FontEngine.cpp
@@ -51,7 +51,7 @@
 #include "FontEngine.h"
 #include "Misc.h"
 #include "Fc.h"
-#include <KDE/KGlobal>
+#include <KGlobal>
 #include <kascii.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp b/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp
index ffa22a9a..7c2f46e4 100644
--- a/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp
+++ b/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp
@@ -34,7 +34,7 @@
 #include "FontEngine.h"
 #include <QtCore/QByteArray>
 #include <QtCore/QFile>
-#include <KDE/KIO/NetAccess>
+#include <KIO/NetAccess>
 #include <list>
 
 using namespace Strigi;
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
index 82365d6d..fbdfcba4 100644
--- a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
@@ -29,14 +29,14 @@
 #include <QtGui/QApplication>
 #include <QtGui/QPalette>
 #include <QtCore/QFile>
-#include <KDE/KGlobalSettings>
-#include <KDE/KLocale>
-#include <KDE/KUrl>
-#include <KDE/KZip>
-#include <KDE/KTempDir>
-#include <KDE/KMimeType>
-#include <KDE/KStandardDirs>
-#include <KDE/KDebug>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KUrl>
+#include <KZip>
+#include <KTempDir>
+#include <KMimeType>
+#include <KStandardDirs>
+#include <KDebug>
 
 #define KFI_DBUG kDebug(7115)
 
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.h b/kcontrol/kfontinst/thumbnail/FontThumbnail.h
index 434fb3b4..acdf0afc 100644
--- a/kcontrol/kfontinst/thumbnail/FontThumbnail.h
+++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.h
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/ThumbCreator>
+#include <ThumbCreator>
 
 #include "FcEngine.h"
 
diff --git a/kcontrol/kfontinst/viewpart/CharTip.cpp b/kcontrol/kfontinst/viewpart/CharTip.cpp
index 4a7e98ed..4de59108 100644
--- a/kcontrol/kfontinst/viewpart/CharTip.cpp
+++ b/kcontrol/kfontinst/viewpart/CharTip.cpp
@@ -32,9 +32,9 @@
 #include "CharTip.h"
 #include "FontPreview.h"
 #include "UnicodeCategories.h"
-#include <KDE/KLocale>
-#include <KDE/KApplication>
-#include <KDE/KGlobalSettings>
+#include <KLocale>
+#include <KApplication>
+#include <KGlobalSettings>
 #include <QtGui/QLabel>
 #include <QtGui/QToolTip>
 #include <QtGui/QPainter>
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index ab90d643..ca4616a9 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -24,8 +24,8 @@
 #include "FontPreview.h"
 #include "FcEngine.h"
 #include "CharTip.h"
-#include <KDE/KApplication>
-#include <KDE/KLocale>
+#include <KApplication>
+#include <KLocale>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QMouseEvent>
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index ce5355fc..c865431e 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -40,26 +40,26 @@
 #include <QtGui/QApplication>
 #include <QtGui/QGroupBox>
 #include <QtCore/QProcess>
-#include <KDE/KLocale>
-#include <KDE/KIO/NetAccess>
-#include <KDE/KIO/Job>
-#include <KDE/KIO/JobUiDelegate>
-#include <KDE/KGlobal>
-#include <KDE/KActionCollection>
-#include <KDE/KComponentData>
-#include <KDE/KMessageBox>
-#include <KDE/KIntNumInput>
-#include <KDE/KInputDialog>
-#include <KDE/KDialog>
-#include <KDE/KIcon>
-#include <KDE/KMimeType>
-//#include <KDE/KFileMetaInfo>
-#include <KDE/KZip>
-#include <KDE/KTempDir>
-#include <KDE/KStandardDirs>
-#include <KDE/KPluginFactory>
-#include <KDE/KPluginLoader>
-#include <KDE/KStandardAction>
+#include <KLocale>
+#include <KIO/NetAccess>
+#include <KIO/Job>
+#include <KIO/JobUiDelegate>
+#include <KGlobal>
+#include <KActionCollection>
+#include <KComponentData>
+#include <KMessageBox>
+#include <KIntNumInput>
+#include <KInputDialog>
+#include <KDialog>
+#include <KIcon>
+#include <KMimeType>
+//#include <KFileMetaInfo>
+#include <KZip>
+#include <KTempDir>
+#include <KStandardDirs>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KStandardAction>
 #include "config-fontinst.h"
 
 // Enable the following to allow printing of non-installed fonts. Does not seem to work :-(
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 6bfea3ac..4809e57a 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -24,9 +24,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KParts/ReadOnlyPart>
-#include <KDE/KParts/BrowserExtension>
-#include <KDE/KUrl>
+#include <KParts/ReadOnlyPart>
+#include <KParts/BrowserExtension>
+#include <KUrl>
 #include <QtGui/QFrame>
 #include <QtCore/QMap>
 #include "KfiConstants.h"
diff --git a/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp b/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp
index e9029cfd..20a7a2a5 100644
--- a/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp
+++ b/kcontrol/kfontinst/viewpart/PreviewSelectAction.cpp
@@ -24,7 +24,7 @@
 #include "PreviewSelectAction.h"
 #include "UnicodeBlocks.h"
 #include "UnicodeScripts.h"
-#include <KDE/KLocale>
+#include <KLocale>
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/viewpart/PreviewSelectAction.h b/kcontrol/kfontinst/viewpart/PreviewSelectAction.h
index adf75d0c..8f9383c7 100644
--- a/kcontrol/kfontinst/viewpart/PreviewSelectAction.h
+++ b/kcontrol/kfontinst/viewpart/PreviewSelectAction.h
@@ -24,7 +24,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <KDE/KSelectAction>
+#include <KSelectAction>
 #include "FcEngine.h"
 
 namespace KFI
diff --git a/kcontrol/kfontinst/viewpart/UnicodeBlocks.h b/kcontrol/kfontinst/viewpart/UnicodeBlocks.h
index 4d77ae9e..b3bdc573 100644
--- a/kcontrol/kfontinst/viewpart/UnicodeBlocks.h
+++ b/kcontrol/kfontinst/viewpart/UnicodeBlocks.h
@@ -7,7 +7,7 @@
 #define __UNICODE_BLOCKS_H__
 
 #include <QtCore/qglobal.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 struct TUnicodeBlock
 {
diff --git a/kcontrol/kfontinst/viewpart/UnicodeScripts.h b/kcontrol/kfontinst/viewpart/UnicodeScripts.h
index d3478016..e10eac9c 100644
--- a/kcontrol/kfontinst/viewpart/UnicodeScripts.h
+++ b/kcontrol/kfontinst/viewpart/UnicodeScripts.h
@@ -7,7 +7,7 @@
 #define __UNICODE_SCRIPTS_H__
 
 #include <QtCore/QtGlobal>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 static const char * const constUnicodeScriptList[] =
 {
diff --git a/kglobalaccel/component.cpp b/kglobalaccel/component.cpp
index 0c29bfe6..346b61b7 100644
--- a/kglobalaccel/component.cpp
+++ b/kglobalaccel/component.cpp
@@ -22,8 +22,8 @@
 #include "globalshortcutcontext.h"
 #include "globalshortcutsregistry.h"
 
-#include <KDE/KDebug>
-#include <KDE/KRun>
+#include <KDebug>
+#include <KRun>
 
 #include <QtCore/QStringList>
 #include <QKeySequence>
diff --git a/khotkeys/kcm_hotkeys/actions/command_url_action_widget.cpp b/khotkeys/kcm_hotkeys/actions/command_url_action_widget.cpp
index 6075ba34..73484d57 100644
--- a/khotkeys/kcm_hotkeys/actions/command_url_action_widget.cpp
+++ b/khotkeys/kcm_hotkeys/actions/command_url_action_widget.cpp
@@ -18,7 +18,7 @@
 
 #include "command_url_action_widget.h"
 
-#include <KDE/KLineEdit>
+#include <KLineEdit>
 
 
 CommandUrlActionWidget::CommandUrlActionWidget(
diff --git a/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp b/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp
index 4ecabcc1..5c72762c 100644
--- a/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp
+++ b/khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp
@@ -18,8 +18,8 @@
 
 #include "dbus_action_widget.h"
 
-#include <KDE/KMessageBox>
-#include <KDE/KRun>
+#include <KMessageBox>
+#include <KRun>
 
 DbusActionWidget::DbusActionWidget(
     KHotKeys::DBusAction *action,
diff --git a/khotkeys/kcm_hotkeys/actions/keyboard_input_action_widget.cpp b/khotkeys/kcm_hotkeys/actions/keyboard_input_action_widget.cpp
index 0740a801..5ca36fc1 100644
--- a/khotkeys/kcm_hotkeys/actions/keyboard_input_action_widget.cpp
+++ b/khotkeys/kcm_hotkeys/actions/keyboard_input_action_widget.cpp
@@ -18,7 +18,7 @@
 
 #include "keyboard_input_action_widget.h"
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 KeyboardInputActionWidget::KeyboardInputActionWidget(
         KHotKeys::KeyboardInputAction *action,
diff --git a/khotkeys/kcm_hotkeys/actions/menuentry_action_widget.cpp b/khotkeys/kcm_hotkeys/actions/menuentry_action_widget.cpp
index 41d98f18..b593c653 100644
--- a/khotkeys/kcm_hotkeys/actions/menuentry_action_widget.cpp
+++ b/khotkeys/kcm_hotkeys/actions/menuentry_action_widget.cpp
@@ -19,8 +19,8 @@
 
 #include "menuentry_action_widget.h"
 
-#include <KDE/KDebug>
-#include <KDE/KOpenWithDialog>
+#include <KDebug>
+#include <KOpenWithDialog>
 
 
 
diff --git a/khotkeys/kcm_hotkeys/conditions/condition_type_menu.cpp b/khotkeys/kcm_hotkeys/conditions/condition_type_menu.cpp
index cab5f5d5..1f8c513e 100644
--- a/khotkeys/kcm_hotkeys/conditions/condition_type_menu.cpp
+++ b/khotkeys/kcm_hotkeys/conditions/condition_type_menu.cpp
@@ -18,7 +18,7 @@
 
 #include "condition_type_menu.h"
 
-#include <KDE/KLocale>
+#include <KLocale>
 
 
 ConditionTypeMenu::ConditionTypeMenu(QWidget *parent)
diff --git a/khotkeys/kcm_hotkeys/conditions/conditions_widget.cpp b/khotkeys/kcm_hotkeys/conditions/conditions_widget.cpp
index 975b4279..4a242cbb 100644
--- a/khotkeys/kcm_hotkeys/conditions/conditions_widget.cpp
+++ b/khotkeys/kcm_hotkeys/conditions/conditions_widget.cpp
@@ -33,7 +33,7 @@
 
 #include <QtCore/QStack>
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 class BuildTree : public KHotKeys::ConditionsVisitor
     {
diff --git a/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.cpp b/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.cpp
index a8b789fa..3b07cac3 100644
--- a/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.cpp
+++ b/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.cpp
@@ -18,7 +18,7 @@
 
 #include "edit_gesture_dialog.h"
 
-#include <KDE/KLocale>
+#include <KLocale>
 
 #include <QtGui/QLabel>
 #include <QtGui/QLayout>
diff --git a/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.h b/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.h
index 571ba82e..41844bd2 100644
--- a/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.h
+++ b/khotkeys/kcm_hotkeys/helper_widgets/edit_gesture_dialog.h
@@ -22,7 +22,7 @@
 #include "triggers/gestures.h"
 
 
-#include <KDE/KDialog>
+#include <KDialog>
 
 /**
  * @author Michael Jansen <kde@michael-jansen.biz>
diff --git a/khotkeys/kcm_hotkeys/helper_widgets/window_definition_widget.h b/khotkeys/kcm_hotkeys/helper_widgets/window_definition_widget.h
index eacc4ffc..e95cdb69 100644
--- a/khotkeys/kcm_hotkeys/helper_widgets/window_definition_widget.h
+++ b/khotkeys/kcm_hotkeys/helper_widgets/window_definition_widget.h
@@ -22,7 +22,7 @@
 
 #include "qwindowdefs.h"
 #include <QtGui/QWidget>
-#include <KDE/KDialog>
+#include <KDialog>
 
 
 namespace Ui {
diff --git a/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp b/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp
index b06cedb5..38bbae71 100644
--- a/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp
+++ b/khotkeys/kcm_hotkeys/hotkeys_context_menu.cpp
@@ -27,10 +27,10 @@
 #include "action_data/action_data_group.h"
 #include "action_data/simple_action_data.h"
 
-#include <KDE/KDebug>
-#include <KDE/KFileDialog>
-#include <KDE/KLocale>
-#include <KDE/KUrl>
+#include <KDebug>
+#include <KFileDialog>
+#include <KLocale>
+#include <KUrl>
 
 #include <QtCore/QSignalMapper>
 #include <QtGui/QContextMenuEvent>
diff --git a/khotkeys/kcm_hotkeys/hotkeys_model.cpp b/khotkeys/kcm_hotkeys/hotkeys_model.cpp
index 04e5e617..07b4d618 100644
--- a/khotkeys/kcm_hotkeys/hotkeys_model.cpp
+++ b/khotkeys/kcm_hotkeys/hotkeys_model.cpp
@@ -27,9 +27,9 @@
 
 #include <QMimeData>
 
-#include <KDE/KDebug>
-#include <KDE/KLocale>
-#include <KDE/KIcon>
+#include <KDebug>
+#include <KLocale>
+#include <KIcon>
 
 
 static KHotKeys::ActionDataBase *findElement(
diff --git a/khotkeys/kcm_hotkeys/hotkeys_widget_base.cpp b/khotkeys/kcm_hotkeys/hotkeys_widget_base.cpp
index 887a5450..b1429fbb 100644
--- a/khotkeys/kcm_hotkeys/hotkeys_widget_base.cpp
+++ b/khotkeys/kcm_hotkeys/hotkeys_widget_base.cpp
@@ -21,7 +21,7 @@
 
 #include "action_data/action_data_group.h"
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 
 HotkeysWidgetBase::HotkeysWidgetBase( QWidget *parent )
diff --git a/khotkeys/kcm_hotkeys/kcm_hotkeys.cpp b/khotkeys/kcm_hotkeys/kcm_hotkeys.cpp
index 0f065029..38c133d1 100644
--- a/khotkeys/kcm_hotkeys/kcm_hotkeys.cpp
+++ b/khotkeys/kcm_hotkeys/kcm_hotkeys.cpp
@@ -42,11 +42,11 @@
 
 #include <QtDBus/QtDBus>
 
-#include <KDE/KAboutData>
-#include <KDE/KDebug>
-#include <KDE/KLocale>
-#include <KDE/KMessageBox>
-#include <KDE/KPluginLoader>
+#include <KAboutData>
+#include <KDebug>
+#include <KLocale>
+#include <KMessageBox>
+#include <KPluginLoader>
 #include <kdeversion.h>
 #include <config-workspace.h>
 
diff --git a/khotkeys/kcm_hotkeys/kcm_module_factory.cpp b/khotkeys/kcm_hotkeys/kcm_module_factory.cpp
index 7439d772..0dbb1550 100644
--- a/khotkeys/kcm_hotkeys/kcm_module_factory.cpp
+++ b/khotkeys/kcm_hotkeys/kcm_module_factory.cpp
@@ -25,8 +25,8 @@
 #include "daemon/daemon.h"
 
 // KDE
-#include <KDE/KDebug>
-#include <KDE/KToolInvocation>
+#include <KDebug>
+#include <KToolInvocation>
 
 K_PLUGIN_FACTORY_DEFINITION(
     KCMModuleFactory,
diff --git a/khotkeys/kcm_hotkeys/kcm_module_factory.h b/khotkeys/kcm_hotkeys/kcm_module_factory.h
index 47a4c723..25233744 100644
--- a/khotkeys/kcm_hotkeys/kcm_module_factory.h
+++ b/khotkeys/kcm_hotkeys/kcm_module_factory.h
@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <KDE/KPluginFactory>
+#include <KPluginFactory>
 
 #include "kcm_hotkeys.h"
 
diff --git a/khotkeys/kcm_hotkeys/simple_action_data_widget.cpp b/khotkeys/kcm_hotkeys/simple_action_data_widget.cpp
index 23a14e27..163336f5 100644
--- a/khotkeys/kcm_hotkeys/simple_action_data_widget.cpp
+++ b/khotkeys/kcm_hotkeys/simple_action_data_widget.cpp
@@ -27,7 +27,7 @@
 #include "triggers/window_trigger_widget.h"
 #include "triggers/gesture_trigger_widget.h"
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 
 SimpleActionDataWidget::SimpleActionDataWidget( QWidget *parent )
diff --git a/khotkeys/kcm_hotkeys/triggers/shortcut_trigger_widget.cpp b/khotkeys/kcm_hotkeys/triggers/shortcut_trigger_widget.cpp
index d93af385..c03ff4fc 100644
--- a/khotkeys/kcm_hotkeys/triggers/shortcut_trigger_widget.cpp
+++ b/khotkeys/kcm_hotkeys/triggers/shortcut_trigger_widget.cpp
@@ -24,7 +24,7 @@
 
 #include <QtGui/QKeySequence>
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 
 ShortcutTriggerWidget::ShortcutTriggerWidget( KHotKeys::ShortcutTrigger *trigger, QWidget *parent )
diff --git a/khotkeys/libkhotkeysprivate/action_data/action_data_visitor.cpp b/khotkeys/libkhotkeysprivate/action_data/action_data_visitor.cpp
index 3a373ea0..e5e585b5 100644
--- a/khotkeys/libkhotkeysprivate/action_data/action_data_visitor.cpp
+++ b/khotkeys/libkhotkeysprivate/action_data/action_data_visitor.cpp
@@ -21,7 +21,7 @@
 
 #include "action_data/action_data_base.h"
 
-#include <KDE/KDebug>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/action_data/simple_action_data.cpp b/khotkeys/libkhotkeysprivate/action_data/simple_action_data.cpp
index 2ab8b959..8b82ec10 100644
--- a/khotkeys/libkhotkeysprivate/action_data/simple_action_data.cpp
+++ b/khotkeys/libkhotkeysprivate/action_data/simple_action_data.cpp
@@ -23,7 +23,7 @@
 #include "conditions/conditions.h"
 #include "conditions/conditions_list.h"
 
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 
 
 namespace KHotKeys {
diff --git a/khotkeys/libkhotkeysprivate/actions/action.cpp b/khotkeys/libkhotkeysprivate/actions/action.cpp
index 43530536..b94229a6 100644
--- a/khotkeys/libkhotkeysprivate/actions/action.cpp
+++ b/khotkeys/libkhotkeysprivate/actions/action.cpp
@@ -19,8 +19,8 @@
 
 #include "actions.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/actions/activate_window_action.cpp b/khotkeys/libkhotkeysprivate/actions/activate_window_action.cpp
index 6beb5eb4..1c575fd9 100644
--- a/khotkeys/libkhotkeysprivate/actions/activate_window_action.cpp
+++ b/khotkeys/libkhotkeysprivate/actions/activate_window_action.cpp
@@ -20,8 +20,8 @@
 #include "windows_handler.h"
 #include "windows_helper/window_selection_list.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 #ifdef Q_WS_X11
 // Has to be behind all qt related stuff. Else the build fails miserably
diff --git a/khotkeys/libkhotkeysprivate/actions/command_url_action.cpp b/khotkeys/libkhotkeysprivate/actions/command_url_action.cpp
index c167afbf..d3de9d5c 100644
--- a/khotkeys/libkhotkeysprivate/actions/command_url_action.cpp
+++ b/khotkeys/libkhotkeysprivate/actions/command_url_action.cpp
@@ -20,11 +20,11 @@
 #include "actions/actions.h"
 #include "action_data/action_data.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
-#include <KDE/KRun>
-#include <KDE/KService>
-#include <KDE/KUriFilter>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KRun>
+#include <KService>
+#include <KUriFilter>
 #include <kworkspace/kworkspace.h>
 
 
diff --git a/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp b/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp
index c6e81462..bba5ec37 100644
--- a/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp
+++ b/khotkeys/libkhotkeysprivate/actions/dbus_action.cpp
@@ -19,9 +19,9 @@
 
 #include "actions.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
-#include <KDE/KProcess>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KProcess>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp b/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp
index b3b1ec36..bf979ba1 100644
--- a/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp
+++ b/khotkeys/libkhotkeysprivate/actions/keyboard_input_action.cpp
@@ -24,8 +24,8 @@
 #include "shortcuts_handler.h"
 #include "windows_helper/window_selection_list.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 // #include <X11/X.h>
 #include <X11/Xlib.h>
diff --git a/khotkeys/libkhotkeysprivate/actions/menuentry_action.cpp b/khotkeys/libkhotkeysprivate/actions/menuentry_action.cpp
index a78ac8a0..69894afa 100644
--- a/khotkeys/libkhotkeysprivate/actions/menuentry_action.cpp
+++ b/khotkeys/libkhotkeysprivate/actions/menuentry_action.cpp
@@ -20,11 +20,11 @@
 #include "actions.h"
 #include "action_data/action_data.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
-#include <KDE/KMessageBox>
-#include <KDE/KUrl>
-#include <KDE/KRun>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KMessageBox>
+#include <KUrl>
+#include <KRun>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/active_window_condition.cpp b/khotkeys/libkhotkeysprivate/conditions/active_window_condition.cpp
index 1e0f1c52..6c28efe0 100644
--- a/khotkeys/libkhotkeysprivate/conditions/active_window_condition.cpp
+++ b/khotkeys/libkhotkeysprivate/conditions/active_window_condition.cpp
@@ -23,9 +23,9 @@
 #include "windows_handler.h"
 #include "khotkeysglobal.h"
 
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/and_condition.cpp b/khotkeys/libkhotkeysprivate/conditions/and_condition.cpp
index e8c6604b..bbebe275 100644
--- a/khotkeys/libkhotkeysprivate/conditions/and_condition.cpp
+++ b/khotkeys/libkhotkeysprivate/conditions/and_condition.cpp
@@ -19,8 +19,8 @@
 
 #include "conditions.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/condition.cpp b/khotkeys/libkhotkeysprivate/conditions/condition.cpp
index a5e7f538..d653b412 100644
--- a/khotkeys/libkhotkeysprivate/conditions/condition.cpp
+++ b/khotkeys/libkhotkeysprivate/conditions/condition.cpp
@@ -23,8 +23,8 @@
 #include "conditions/existing_window_condition.h"
 #include "conditions/conditions_visitor.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/conditions_list.cpp b/khotkeys/libkhotkeysprivate/conditions/conditions_list.cpp
index 3feffb73..17bd1263 100644
--- a/khotkeys/libkhotkeysprivate/conditions/conditions_list.cpp
+++ b/khotkeys/libkhotkeysprivate/conditions/conditions_list.cpp
@@ -23,8 +23,8 @@
 #include "action_data/action_data.h"
 #include "khotkeysglobal.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/conditions_list_base.cpp b/khotkeys/libkhotkeysprivate/conditions/conditions_list_base.cpp
index 8c455909..b2eb44e8 100644
--- a/khotkeys/libkhotkeysprivate/conditions/conditions_list_base.cpp
+++ b/khotkeys/libkhotkeysprivate/conditions/conditions_list_base.cpp
@@ -20,8 +20,8 @@
 #include "conditions/conditions_list_base.h"
 #include "conditions/conditions_visitor.h"
 
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
+#include <KConfig>
+#include <KConfigGroup>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/existing_window_condition.h b/khotkeys/libkhotkeysprivate/conditions/existing_window_condition.h
index 3b192ec6..f5603900 100644
--- a/khotkeys/libkhotkeysprivate/conditions/existing_window_condition.h
+++ b/khotkeys/libkhotkeysprivate/conditions/existing_window_condition.h
@@ -24,8 +24,8 @@
 #include <QtCore/QString>
 #include <QtGui/qwindowdefs.h>
 
-#include <KDE/KConfig>      // Needed because of some Qt Status redefinitions
-#include <KDE/KConfigGroup>      // Needed because of some Qt Status redefinitions
+#include <KConfig>      // Needed because of some Qt Status redefinitions
+#include <KConfigGroup>      // Needed because of some Qt Status redefinitions
 
 #include <kdemacros.h>
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/not_condition.cpp b/khotkeys/libkhotkeysprivate/conditions/not_condition.cpp
index b6f64d48..62ddc63c 100644
--- a/khotkeys/libkhotkeysprivate/conditions/not_condition.cpp
+++ b/khotkeys/libkhotkeysprivate/conditions/not_condition.cpp
@@ -19,7 +19,7 @@
 
 #include "conditions.h"
 
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/conditions/or_condition.cpp b/khotkeys/libkhotkeysprivate/conditions/or_condition.cpp
index f3301403..c1b6a4dc 100644
--- a/khotkeys/libkhotkeysprivate/conditions/or_condition.cpp
+++ b/khotkeys/libkhotkeysprivate/conditions/or_condition.cpp
@@ -19,7 +19,7 @@
 
 #include "conditions.h"
 
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/daemon/daemon.cpp b/khotkeys/libkhotkeysprivate/daemon/daemon.cpp
index e1dc6a6a..d967ee45 100644
--- a/khotkeys/libkhotkeysprivate/daemon/daemon.cpp
+++ b/khotkeys/libkhotkeysprivate/daemon/daemon.cpp
@@ -24,8 +24,8 @@
 
 #include <QtDBus/QtDBus>
 
-#include <KDE/KConfigGroup>
-#include <KDE/KConfig>
+#include <KConfigGroup>
+#include <KConfig>
 #include "KDE/KDebug"
 #include "KDE/KLocale"
 
diff --git a/khotkeys/libkhotkeysprivate/settings.cpp b/khotkeys/libkhotkeysprivate/settings.cpp
index 2a765ca6..b777be4e 100644
--- a/khotkeys/libkhotkeysprivate/settings.cpp
+++ b/khotkeys/libkhotkeysprivate/settings.cpp
@@ -24,10 +24,10 @@
 #include "settings_writer.h"
 #include "windows_helper/window_selection_list.h"
 
-#include <KDE/KConfig>
-#include <KDE/KDebug>
-#include <KDE/KMessageBox>
-#include <KDE/KStandardDirs>
+#include <KConfig>
+#include <KDebug>
+#include <KMessageBox>
+#include <KStandardDirs>
 
 #include <QtGui/QApplication>
 
diff --git a/khotkeys/libkhotkeysprivate/settings_reader_v2.cpp b/khotkeys/libkhotkeysprivate/settings_reader_v2.cpp
index 1dbf138a..960fdc8c 100644
--- a/khotkeys/libkhotkeysprivate/settings_reader_v2.cpp
+++ b/khotkeys/libkhotkeysprivate/settings_reader_v2.cpp
@@ -33,10 +33,10 @@
 
 #include "settings.h"
 
-#include <KDE/KConfig>
-#include <KDE/KConfigBase>
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfig>
+#include <KConfigBase>
+#include <KConfigGroup>
+#include <KDebug>
 
 
 SettingsReaderV2::SettingsReaderV2(
diff --git a/khotkeys/libkhotkeysprivate/settings_writer.cpp b/khotkeys/libkhotkeysprivate/settings_writer.cpp
index a65cb8a6..3cf59457 100644
--- a/khotkeys/libkhotkeysprivate/settings_writer.cpp
+++ b/khotkeys/libkhotkeysprivate/settings_writer.cpp
@@ -32,9 +32,9 @@
 #include "windows_helper/window_selection_list.h"
 
 
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp b/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp
index e72c6499..5385a0c3 100644
--- a/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp
+++ b/khotkeys/libkhotkeysprivate/shortcuts_handler.cpp
@@ -30,8 +30,8 @@
 #include <QX11Info>
 #include <fixx11h.h>
 
-#include <KDE/KAction>
-#include <KDE/KDebug>
+#include <KAction>
+#include <KDebug>
 
 #include <QtCore/QUuid>
 #include <kkeyserver.h>
diff --git a/khotkeys/libkhotkeysprivate/shortcuts_handler.h b/khotkeys/libkhotkeysprivate/shortcuts_handler.h
index a0e7ea38..07bdd05f 100644
--- a/khotkeys/libkhotkeysprivate/shortcuts_handler.h
+++ b/khotkeys/libkhotkeysprivate/shortcuts_handler.h
@@ -20,7 +20,7 @@
 #define SHORTCUTACTIONS_H
 
 
-#include <KDE/KActionCollection>
+#include <KActionCollection>
 
 #include <X11/X.h>
 #include <fixx11h.h>
diff --git a/khotkeys/libkhotkeysprivate/triggers/gesture_trigger.cpp b/khotkeys/libkhotkeysprivate/triggers/gesture_trigger.cpp
index 535c2cee..21c5717f 100644
--- a/khotkeys/libkhotkeysprivate/triggers/gesture_trigger.cpp
+++ b/khotkeys/libkhotkeysprivate/triggers/gesture_trigger.cpp
@@ -44,8 +44,8 @@
 
 #include <QFile>
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 #include <kstandarddirs.h>
 
 namespace KHotKeys {
diff --git a/khotkeys/libkhotkeysprivate/triggers/shortcut_trigger.cpp b/khotkeys/libkhotkeysprivate/triggers/shortcut_trigger.cpp
index 687e4377..8163fed4 100644
--- a/khotkeys/libkhotkeysprivate/triggers/shortcut_trigger.cpp
+++ b/khotkeys/libkhotkeysprivate/triggers/shortcut_trigger.cpp
@@ -21,9 +21,9 @@
 #include "action_data/action_data.h"
 #include "windows_handler.h"
 
-#include <KDE/KAction>
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KAction>
+#include <KConfigGroup>
+#include <KDebug>
 
 #include "shortcuts_handler.h"
 
diff --git a/khotkeys/libkhotkeysprivate/triggers/trigger.cpp b/khotkeys/libkhotkeysprivate/triggers/trigger.cpp
index 593cd06a..3521434f 100644
--- a/khotkeys/libkhotkeysprivate/triggers/trigger.cpp
+++ b/khotkeys/libkhotkeysprivate/triggers/trigger.cpp
@@ -19,8 +19,8 @@
 
 #include "triggers.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys
     {
diff --git a/khotkeys/libkhotkeysprivate/triggers/trigger_list.cpp b/khotkeys/libkhotkeysprivate/triggers/trigger_list.cpp
index 64125a3c..2d01db80 100644
--- a/khotkeys/libkhotkeysprivate/triggers/trigger_list.cpp
+++ b/khotkeys/libkhotkeysprivate/triggers/trigger_list.cpp
@@ -19,7 +19,7 @@
 
 #include "triggers.h"
 
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/triggers/triggers.h b/khotkeys/libkhotkeysprivate/triggers/triggers.h
index 74194a84..12d1cc6b 100644
--- a/khotkeys/libkhotkeysprivate/triggers/triggers.h
+++ b/khotkeys/libkhotkeysprivate/triggers/triggers.h
@@ -24,7 +24,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QUuid>
 
-#include <KDE/KShortcut>
+#include <KShortcut>
 
 #include <kdemacros.h>
 #include "khotkeysglobal.h"
diff --git a/khotkeys/libkhotkeysprivate/triggers/voice_trigger.cpp b/khotkeys/libkhotkeysprivate/triggers/voice_trigger.cpp
index fb61abf7..366ab3d6 100644
--- a/khotkeys/libkhotkeysprivate/triggers/voice_trigger.cpp
+++ b/khotkeys/libkhotkeysprivate/triggers/voice_trigger.cpp
@@ -22,8 +22,8 @@
 #include "voices.h"
 #include "windows.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 namespace KHotKeys {
 
diff --git a/khotkeys/libkhotkeysprivate/triggers/window_trigger.cpp b/khotkeys/libkhotkeysprivate/triggers/window_trigger.cpp
index eddd83a8..0651c9a0 100644
--- a/khotkeys/libkhotkeysprivate/triggers/window_trigger.cpp
+++ b/khotkeys/libkhotkeysprivate/triggers/window_trigger.cpp
@@ -22,8 +22,8 @@
 #include "windows_handler.h"
 #include "windows_helper/window_selection_list.h"
 
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KDebug>
 
 #include <X11/X.h>
 
diff --git a/krunner/interfaces/default/resultscene.cpp b/krunner/interfaces/default/resultscene.cpp
index 1f91665d..9090e1d1 100644
--- a/krunner/interfaces/default/resultscene.cpp
+++ b/krunner/interfaces/default/resultscene.cpp
@@ -32,9 +32,9 @@
 #include <QtGui/QGraphicsProxyWidget>
 #include <QtCore/QCoreApplication>
 
-#include <KDE/KDebug>
-#include <KDE/KIconLoader>
-#include <KDE/KLineEdit>
+#include <KDebug>
+#include <KIconLoader>
+#include <KLineEdit>
 
 #include <Plasma/AbstractRunner>
 #include <Plasma/RunnerManager>
diff --git a/ksmserver/screenlocker/greeter/greeter.cpp b/ksmserver/screenlocker/greeter/greeter.cpp
index 74cf378a..aeba83d7 100644
--- a/ksmserver/screenlocker/greeter/greeter.cpp
+++ b/ksmserver/screenlocker/greeter/greeter.cpp
@@ -25,12 +25,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // workspace
 #include <kcheckpass-enums.h>
 // KDE
-#include <KDE/KDebug>
-#include <KDE/KLibrary>
-#include <KDE/KLocale>
-#include <KDE/KPluginFactory>
-#include <KDE/KPluginLoader>
-#include <KDE/KStandardDirs>
+#include <KDebug>
+#include <KLibrary>
+#include <KLocale>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KStandardDirs>
 
 // Qt
 #include <QtCore/QFile>
diff --git a/ksmserver/screenlocker/greeter/greeterapp.cpp b/ksmserver/screenlocker/greeter/greeterapp.cpp
index 9e89ff3c..9f263723 100644
--- a/ksmserver/screenlocker/greeter/greeterapp.cpp
+++ b/ksmserver/screenlocker/greeter/greeterapp.cpp
@@ -27,12 +27,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // workspace
 #include <kworkspace/kworkspace.h>
 // KDE
-#include <KDE/KAuthorized>
-#include <KDE/KCrash>
-#include <KDE/KDebug>
-#include <KDE/KStandardDirs>
-#include <KDE/KUser>
-#include <KDE/KWindowSystem>
+#include <KAuthorized>
+#include <KCrash>
+#include <KDebug>
+#include <KStandardDirs>
+#include <KUser>
+#include <KWindowSystem>
 #include <Solid/PowerManagement>
 #include <kdeclarative.h>
 //Plasma
diff --git a/ksmserver/screenlocker/greeter/greeterapp.h b/ksmserver/screenlocker/greeter/greeterapp.h
index 03374d39..2b276bbe 100644
--- a/ksmserver/screenlocker/greeter/greeterapp.h
+++ b/ksmserver/screenlocker/greeter/greeterapp.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef SCREENLOCKER_GREETERAPP_H
 #define SCREENLOCKER_GREETERAPP_H
 
-#include <KDE/KApplication>
+#include <KApplication>
 
 #include <Plasma/PackageStructure>
 
diff --git a/ksmserver/screenlocker/greeter/main.cpp b/ksmserver/screenlocker/greeter/main.cpp
index 0bcc6022..640fce4e 100644
--- a/ksmserver/screenlocker/greeter/main.cpp
+++ b/ksmserver/screenlocker/greeter/main.cpp
@@ -16,10 +16,10 @@ 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 <KDE/KAboutData>
-#include <KDE/KCmdLineArgs>
-#include <KDE/KLocale>
-#include <KDE/KGlobal>
+#include <KAboutData>
+#include <KCmdLineArgs>
+#include <KLocale>
+#include <KGlobal>
 #include <QDateTime>
 
 #include <iostream>
diff --git a/ksmserver/screenlocker/greeter/sessions.cpp b/ksmserver/screenlocker/greeter/sessions.cpp
index f8b485fb..24aab6b3 100644
--- a/ksmserver/screenlocker/greeter/sessions.cpp
+++ b/ksmserver/screenlocker/greeter/sessions.cpp
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // workspace
 #include <kdisplaymanager.h>
 // KDE
-#include <KDE/KAuthorized>
-#include <KDE/KLocalizedString>
+#include <KAuthorized>
+#include <KLocalizedString>
 
 namespace ScreenLocker
 {
diff --git a/ksmserver/screenlocker/interface.cpp b/ksmserver/screenlocker/interface.cpp
index 44246c28..99f37a43 100644
--- a/ksmserver/screenlocker/interface.cpp
+++ b/ksmserver/screenlocker/interface.cpp
@@ -24,10 +24,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kscreensaveradaptor.h"
 #include "powerdevilpolicyagent.h"
 // KDE
-#include <KDE/KDebug>
-#include <KDE/KIdleTime>
-#include <KDE/KProcess>
-#include <KDE/KRandom>
+#include <KDebug>
+#include <KIdleTime>
+#include <KProcess>
+#include <KRandom>
 // Qt
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusInterface>
diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
index 5bc1e221..b493e2af 100644
--- a/ksmserver/screenlocker/ksldapp.cpp
+++ b/ksmserver/screenlocker/ksldapp.cpp
@@ -27,16 +27,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // workspace
 #include <kdisplaymanager.h>
 // KDE
-#include <KDE/KAction>
-#include <KDE/KActionCollection>
-#include <KDE/KAuthorized>
-#include <KDE/KCrash>
-#include <KDE/KDebug>
-#include <KDE/KIdleTime>
-#include <KDE/KLocalizedString>
-#include <KDE/KNotification>
-#include <KDE/KProcess>
-#include <KDE/KStandardDirs>
+#include <KAction>
+#include <KActionCollection>
+#include <KAuthorized>
+#include <KCrash>
+#include <KDebug>
+#include <KIdleTime>
+#include <KLocalizedString>
+#include <KNotification>
+#include <KProcess>
+#include <KStandardDirs>
 // Qt
 #include <QtCore/QTimer>
 #include <QtGui/QApplication>
diff --git a/ksmserver/screenlocker/lockwindow.cpp b/ksmserver/screenlocker/lockwindow.cpp
index 96f4cc1d..cabbfab8 100644
--- a/ksmserver/screenlocker/lockwindow.cpp
+++ b/ksmserver/screenlocker/lockwindow.cpp
@@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "autologout.h"
 #include "ksldapp.h"
 // KDE
-#include <KDE/KApplication>
-#include <KDE/KDebug>
-#include <KDE/KXErrorHandler>
+#include <KApplication>
+#include <KDebug>
+#include <KXErrorHandler>
 // Qt
 #include <QtCore/QTimer>
 #include <QtCore/QPointer>
diff --git a/kurifilter-plugins/fixhost/fixhosturifilter.cpp b/kurifilter-plugins/fixhost/fixhosturifilter.cpp
index a27a639d..60ccdcd5 100644
--- a/kurifilter-plugins/fixhost/fixhosturifilter.cpp
+++ b/kurifilter-plugins/fixhost/fixhosturifilter.cpp
@@ -23,9 +23,9 @@
 
 #include <QtNetwork/QHostInfo>
 
-#include <KDE/KUrl>
-#include <KDE/KDebug>
-#include <KDE/KPluginFactory>
+#include <KUrl>
+#include <KDebug>
+#include <KPluginFactory>
 
 #define QL1S(x)   QLatin1String(x)
 #define QL1C(x)   QLatin1Char(x)
diff --git a/kurifilter-plugins/fixhost/fixhosturifilter.h b/kurifilter-plugins/fixhost/fixhosturifilter.h
index 6b89f348..ce071667 100644
--- a/kurifilter-plugins/fixhost/fixhosturifilter.h
+++ b/kurifilter-plugins/fixhost/fixhosturifilter.h
@@ -21,7 +21,7 @@
 #ifndef FIXHOSTURIFILTER_H
 #define FIXHOSTURIFILTER_H
 
-#include <KDE/KUriFilter>
+#include <KUriFilter>
 
 class QHostInfo;
 class QEventLoop;
diff --git a/kurifilter-plugins/ikws/ikwsopts.cpp b/kurifilter-plugins/ikws/ikwsopts.cpp
index 549c904f..0bacb547 100644
--- a/kurifilter-plugins/ikws/ikwsopts.cpp
+++ b/kurifilter-plugins/ikws/ikwsopts.cpp
@@ -25,10 +25,10 @@
 #include "searchprovider.h"
 #include "searchproviderdlg.h"
 
-#include <KDE/KDebug>
-#include <KDE/KStandardDirs>
-#include <KDE/KServiceTypeTrader>
-#include <KDE/KBuildSycocaProgressDialog>
+#include <KDebug>
+#include <KStandardDirs>
+#include <KServiceTypeTrader>
+#include <KBuildSycocaProgressDialog>
 
 #include <QtCore/QFile>
 #include <QtDBus/QtDBus>
diff --git a/kurifilter-plugins/ikws/kuriikwsfilter.cpp b/kurifilter-plugins/ikws/kuriikwsfilter.cpp
index 628e2c84..de684641 100644
--- a/kurifilter-plugins/ikws/kuriikwsfilter.cpp
+++ b/kurifilter-plugins/ikws/kuriikwsfilter.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kglobal.h>
-#include <KDE/KPluginFactory>
+#include <KPluginFactory>
 
 #include <QtDBus/QtDBus>
 
diff --git a/kurifilter-plugins/ikws/searchprovider.h b/kurifilter-plugins/ikws/searchprovider.h
index 0b6ddc73..87b88f43 100644
--- a/kurifilter-plugins/ikws/searchprovider.h
+++ b/kurifilter-plugins/ikws/searchprovider.h
@@ -21,7 +21,7 @@
 #define SEARCHPROVIDER_H
 
 #include <kservice.h>
-#include <KDE/KUriFilter>
+#include <KUriFilter>
 
 class SearchProvider : public KUriFilterSearchProvider
 {
diff --git a/kurifilter-plugins/localdomain/localdomainurifilter.cpp b/kurifilter-plugins/localdomain/localdomainurifilter.cpp
index 4833494e..09be15a4 100644
--- a/kurifilter-plugins/localdomain/localdomainurifilter.cpp
+++ b/kurifilter-plugins/localdomain/localdomainurifilter.cpp
@@ -21,9 +21,9 @@
 
 #include "localdomainurifilter.h"
 
-#include <KDE/KProtocolInfo>
-#include <KDE/KDebug>
-#include <KDE/KPluginFactory>
+#include <KProtocolInfo>
+#include <KDebug>
+#include <KPluginFactory>
 
 #include <QtCore/QStringBuilder>
 #include <QtNetwork/QHostInfo>
diff --git a/kurifilter-plugins/localdomain/localdomainurifilter.h b/kurifilter-plugins/localdomain/localdomainurifilter.h
index 50b6ee2c..1b13c307 100644
--- a/kurifilter-plugins/localdomain/localdomainurifilter.h
+++ b/kurifilter-plugins/localdomain/localdomainurifilter.h
@@ -21,7 +21,7 @@
 #ifndef LOCALDOMAINURIFILTER_H
 #define LOCALDOMAINURIFILTER_H
 
-#include <KDE/KUriFilter>
+#include <KUriFilter>
 
 #include <QtCore/QRegExp>
 
diff --git a/kwin/activation.cpp b/kwin/activation.cpp
index ce85ffbc..c22110a6 100644
--- a/kwin/activation.cpp
+++ b/kwin/activation.cpp
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kxerrorhandler.h>
 #include <kstartupinfo.h>
 #include <kstringhandler.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #include "atoms.h"
 #include "group.h"
diff --git a/kwin/client.cpp b/kwin/client.cpp
index c016a0b0..7b11004f 100644
--- a/kwin/client.cpp
+++ b/kwin/client.cpp
@@ -40,9 +40,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #include "workspace.h"
 // KDE
-#include <KDE/KIconLoader>
-#include <KDE/KStandardDirs>
-#include <KDE/KWindowSystem>
+#include <KIconLoader>
+#include <KStandardDirs>
+#include <KWindowSystem>
 // Qt
 #include <QApplication>
 #include <QProcess>
diff --git a/kwin/client.h b/kwin/client.h
index 60d11be8..d40a8c5d 100644
--- a/kwin/client.h
+++ b/kwin/client.h
@@ -29,8 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "toplevel.h"
 #include "xcbutils.h"
 // KDE
-#include <KDE/KShortcut>
-#include <KDE/NETWinInfo>
+#include <KShortcut>
+#include <NETWinInfo>
 // Qt
 #include <QPixmap>
 // X
diff --git a/kwin/client_machine.cpp b/kwin/client_machine.cpp
index 6c12a2b8..0a2514b5 100644
--- a/kwin/client_machine.cpp
+++ b/kwin/client_machine.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KWin
 #include "utils.h"
 // KDE
-#include <KDE/KDebug>
+#include <KDebug>
 // Qt
 #include <QtConcurrentRun>
 #include <QFutureWatcher>
diff --git a/kwin/clients/aurorae/src/colorhelper.cpp b/kwin/clients/aurorae/src/colorhelper.cpp
index 4cc9f974..81e206fc 100644
--- a/kwin/clients/aurorae/src/colorhelper.cpp
+++ b/kwin/clients/aurorae/src/colorhelper.cpp
@@ -16,8 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "colorhelper.h"
 
-#include <KDE/KGlobalSettings>
-#include <KDE/KColorScheme>
+#include <KGlobalSettings>
+#include <KColorScheme>
 
 ColorHelper::ColorHelper(QObject *parent)
     : QObject(parent)
diff --git a/kwin/clients/aurorae/src/lib/auroraetheme.cpp b/kwin/clients/aurorae/src/lib/auroraetheme.cpp
index 6f746d98..94f16ffc 100644
--- a/kwin/clients/aurorae/src/lib/auroraetheme.cpp
+++ b/kwin/clients/aurorae/src/lib/auroraetheme.cpp
@@ -23,11 +23,11 @@
 // Qt
 #include <QHash>
 // KDE
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
-#include <KDE/KStandardDirs>
-#include <KDE/KGlobal>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KStandardDirs>
+#include <KGlobal>
 
 namespace Aurorae {
 
diff --git a/kwin/clients/aurorae/themes/plastik/code/plastikbutton.cpp b/kwin/clients/aurorae/themes/plastik/code/plastikbutton.cpp
index 1e3976bb..fae1a05d 100644
--- a/kwin/clients/aurorae/themes/plastik/code/plastikbutton.cpp
+++ b/kwin/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/kwin/composite.cpp b/kwin/composite.cpp
index be00eedb..325cc9d0 100644
--- a/kwin/composite.cpp
+++ b/kwin/composite.cpp
@@ -48,10 +48,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDBusConnection>
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <KDE/KGlobal>
-#include <KDE/KLocalizedString>
-#include <KDE/KNotification>
-#include <KDE/KSelectionWatcher>
+#include <KGlobal>
+#include <KLocalizedString>
+#include <KNotification>
+#include <KSelectionWatcher>
 
 #include <xcb/composite.h>
 #include <xcb/damage.h>
diff --git a/kwin/composite.h b/kwin/composite.h
index b4158faf..b01afcf3 100644
--- a/kwin/composite.h
+++ b/kwin/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/kwin/compositingprefs.cpp b/kwin/compositingprefs.cpp
index f46dac45..fdc7d372 100644
--- a/kwin/compositingprefs.cpp
+++ b/kwin/compositingprefs.cpp
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfiggroup.h>
 #include <kdebug.h>
 #include <kxerrorhandler.h>
-#include <KDE/KGlobal>
-#include <KDE/KLocalizedString>
+#include <KGlobal>
+#include <KLocalizedString>
 #include <kdeversion.h>
 #include <ksharedconfig.h>
 #include <kstandarddirs.h>
diff --git a/kwin/decorations.cpp b/kwin/decorations.cpp
index 19560a58..c2fa5087 100644
--- a/kwin/decorations.cpp
+++ b/kwin/decorations.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdecorationfactory.h>
 
 #include <kglobal.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <stdlib.h>
 #include <QPixmap>
 
diff --git a/kwin/effects.cpp b/kwin/effects.cpp
index 3936d301..46190221 100644
--- a/kwin/effects.cpp
+++ b/kwin/effects.cpp
@@ -48,15 +48,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDBusServiceWatcher>
 #include <QDBusPendingCallWatcher>
 
-#include <KDE/KDebug>
-#include <KDE/KLibrary>
-#include <KDE/KDesktopFile>
-#include <KDE/KConfigGroup>
-#include <KDE/KGlobal>
-#include <KDE/KStandardDirs>
-#include <KDE/KService>
-#include <KDE/KServiceTypeTrader>
-#include <KDE/KPluginInfo>
+#include <KDebug>
+#include <KLibrary>
+#include <KDesktopFile>
+#include <KConfigGroup>
+#include <KGlobal>
+#include <KStandardDirs>
+#include <KService>
+#include <KServiceTypeTrader>
+#include <KPluginInfo>
 #include <Plasma/Theme>
 
 #include <assert.h>
diff --git a/kwin/effects/dashboard/dashboard.cpp b/kwin/effects/dashboard/dashboard.cpp
index b41d2426..c85a7351 100644
--- a/kwin/effects/dashboard/dashboard.cpp
+++ b/kwin/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/kwin/effects/desktopgrid/desktopgrid.cpp b/kwin/effects/desktopgrid/desktopgrid.cpp
index 1e09357d..f5998da9 100644
--- a/kwin/effects/desktopgrid/desktopgrid.cpp
+++ b/kwin/effects/desktopgrid/desktopgrid.cpp
@@ -31,9 +31,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kdebug.h>
-#include <KDE/KGlobal>
-#include <KDE/KLocalizedString>
-#include <KDE/KStandardDirs>
+#include <KGlobal>
+#include <KLocalizedString>
+#include <KStandardDirs>
 #include <kdeclarative.h>
 #include <netwm_def.h>
 #include <QApplication>
diff --git a/kwin/effects/diminactive/diminactive_config.cpp b/kwin/effects/diminactive/diminactive_config.cpp
index fff557e0..e606b5cc 100644
--- a/kwin/effects/diminactive/diminactive_config.cpp
+++ b/kwin/effects/diminactive/diminactive_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <kaction.h>
diff --git a/kwin/effects/invert/invert.cpp b/kwin/effects/invert/invert.cpp
index 403031ff..dc0bb776 100644
--- a/kwin/effects/invert/invert.cpp
+++ b/kwin/effects/invert/invert.cpp
@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglplatform.h>
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <KDE/KGlobal>
-#include <KDE/KLocalizedString>
+#include <KGlobal>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <KStandardDirs>
 
diff --git a/kwin/effects/invert/invert_config.cpp b/kwin/effects/invert/invert_config.cpp
index 525b8292..7074dadf 100644
--- a/kwin/effects/invert/invert_config.cpp
+++ b/kwin/effects/invert/invert_config.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>
diff --git a/kwin/effects/logout/logout.cpp b/kwin/effects/logout/logout.cpp
index 6a53e4d9..126dccbd 100644
--- a/kwin/effects/logout/logout.cpp
+++ b/kwin/effects/logout/logout.cpp
@@ -29,8 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <math.h>
 #include <kdebug.h>
-#include <KDE/KGlobal>
-#include <KDE/KStandardDirs>
+#include <KGlobal>
+#include <KStandardDirs>
 
 #include <QtGui/QMatrix4x4>
 #include <QtGui/QVector2D>
diff --git a/kwin/effects/lookingglass/lookingglass.cpp b/kwin/effects/lookingglass/lookingglass.cpp
index dddb9350..040cd182 100644
--- a/kwin/effects/lookingglass/lookingglass.cpp
+++ b/kwin/effects/lookingglass/lookingglass.cpp
@@ -29,10 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
-#include <KDE/KGlobal>
-#include <KDE/KStandardDirs>
+#include <KGlobal>
+#include <KStandardDirs>
 #include <QVector2D>
 
 #include <kmessagebox.h>
diff --git a/kwin/effects/lookingglass/lookingglass_config.cpp b/kwin/effects/lookingglass/lookingglass_config.cpp
index 383c06b5..c7e402e4 100644
--- a/kwin/effects/lookingglass/lookingglass_config.cpp
+++ b/kwin/effects/lookingglass/lookingglass_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>
diff --git a/kwin/effects/magnifier/magnifier_config.cpp b/kwin/effects/magnifier/magnifier_config.cpp
index df6b1298..a7d4621d 100644
--- a/kwin/effects/magnifier/magnifier_config.cpp
+++ b/kwin/effects/magnifier/magnifier_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>
diff --git a/kwin/effects/mouseclick/mouseclick.cpp b/kwin/effects/mouseclick/mouseclick.cpp
index bbaf5a5c..c85dabb5 100644
--- a/kwin/effects/mouseclick/mouseclick.cpp
+++ b/kwin/effects/mouseclick/mouseclick.cpp
@@ -30,9 +30,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <xcb/render.h>
 #endif
 
-#include <KDE/KAction>
-#include <KDE/KActionCollection>
-#include <KDE/KConfigGroup>
+#include <KAction>
+#include <KActionCollection>
+#include <KConfigGroup>
 
 #include <math.h>
 
diff --git a/kwin/effects/mouseclick/mouseclick_config.cpp b/kwin/effects/mouseclick/mouseclick_config.cpp
index a7186acf..01153c1c 100644
--- a/kwin/effects/mouseclick/mouseclick_config.cpp
+++ b/kwin/effects/mouseclick/mouseclick_config.cpp
@@ -24,9 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KActionCollection>
-#include <KDE/KAction>
-#include <KDE/KShortcutsEditor>
+#include <KActionCollection>
+#include <KAction>
+#include <KShortcutsEditor>
 
 #include <QWidget>
 
diff --git a/kwin/effects/mousemark/mousemark.cpp b/kwin/effects/mousemark/mousemark.cpp
index 44ad1377..27c0b8f3 100644
--- a/kwin/effects/mousemark/mousemark.cpp
+++ b/kwin/effects/mousemark/mousemark.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #include <math.h>
 
diff --git a/kwin/effects/mousemark/mousemark_config.cpp b/kwin/effects/mousemark/mousemark_config.cpp
index c791debe..acb9d3ae 100644
--- a/kwin/effects/mousemark/mousemark_config.cpp
+++ b/kwin/effects/mousemark/mousemark_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>
diff --git a/kwin/effects/presentwindows/presentwindows.cpp b/kwin/effects/presentwindows/presentwindows.cpp
index e3261197..ccf00361 100755
--- a/kwin/effects/presentwindows/presentwindows.cpp
+++ b/kwin/effects/presentwindows/presentwindows.cpp
@@ -24,10 +24,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "presentwindowsconfig.h"
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <KDE/KGlobal>
-#include <KDE/KIcon>
-#include <KDE/KLocalizedString>
-#include <KDE/KStandardDirs>
+#include <KGlobal>
+#include <KIcon>
+#include <KLocalizedString>
+#include <KStandardDirs>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kdeclarative.h>
diff --git a/kwin/effects/showfps/showfps.cpp b/kwin/effects/showfps/showfps.cpp
index 01bce31c..a4588fe6 100644
--- a/kwin/effects/showfps/showfps.cpp
+++ b/kwin/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/kwin/effects/showfps/showfps_config.cpp b/kwin/effects/showfps/showfps_config.cpp
index f293aece..3c7b52c3 100644
--- a/kwin/effects/showfps/showfps_config.cpp
+++ b/kwin/effects/showfps/showfps_config.cpp
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 
 namespace KWin
diff --git a/kwin/effects/slidingpopups/slidingpopups.cpp b/kwin/effects/slidingpopups/slidingpopups.cpp
index 22889c57..0e7da519 100644
--- a/kwin/effects/slidingpopups/slidingpopups.cpp
+++ b/kwin/effects/slidingpopups/slidingpopups.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "slidingpopups.h"
 
 #include <kdebug.h>
-#include <KDE/KConfigGroup>
+#include <KConfigGroup>
 #include <QTimeLine>
 
 namespace KWin
diff --git a/kwin/effects/startupfeedback/startupfeedback.cpp b/kwin/effects/startupfeedback/startupfeedback.cpp
index 063d9879..4f0347d4 100644
--- a/kwin/effects/startupfeedback/startupfeedback.cpp
+++ b/kwin/effects/startupfeedback/startupfeedback.cpp
@@ -22,13 +22,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QSize>
 #include <QtGui/QPainter>
 // KDE
-#include <KDE/KConfigGroup>
-#include <KDE/KDebug>
-#include <KDE/KGlobal>
-#include <KDE/KIconLoader>
-#include <KDE/KStandardDirs>
-#include <KDE/KStartupInfo>
-#include <KDE/KSelectionOwner>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KGlobal>
+#include <KIconLoader>
+#include <KStandardDirs>
+#include <KStartupInfo>
+#include <KSelectionOwner>
 // KWin
 #include <kwinglutils.h>
 // X11
diff --git a/kwin/effects/startupfeedback/startupfeedback.h b/kwin/effects/startupfeedback/startupfeedback.h
index e2b16c69..878f7853 100644
--- a/kwin/effects/startupfeedback/startupfeedback.h
+++ b/kwin/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/kwin/effects/thumbnailaside/thumbnailaside.cpp b/kwin/effects/thumbnailaside/thumbnailaside.cpp
index 10d28d16..99612cad 100644
--- a/kwin/effects/thumbnailaside/thumbnailaside.cpp
+++ b/kwin/effects/thumbnailaside/thumbnailaside.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 namespace KWin
 {
diff --git a/kwin/effects/thumbnailaside/thumbnailaside_config.cpp b/kwin/effects/thumbnailaside/thumbnailaside_config.cpp
index a480c5d2..0f605f93 100644
--- a/kwin/effects/thumbnailaside/thumbnailaside_config.cpp
+++ b/kwin/effects/thumbnailaside/thumbnailaside_config.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>
diff --git a/kwin/effects/trackmouse/trackmouse.cpp b/kwin/effects/trackmouse/trackmouse.cpp
index b841b721..5c52b734 100644
--- a/kwin/effects/trackmouse/trackmouse.cpp
+++ b/kwin/effects/trackmouse/trackmouse.cpp
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #include <math.h>
 
diff --git a/kwin/effects/trackmouse/trackmouse_config.cpp b/kwin/effects/trackmouse/trackmouse_config.cpp
index edfa2282..798b8a07 100644
--- a/kwin/effects/trackmouse/trackmouse_config.cpp
+++ b/kwin/effects/trackmouse/trackmouse_config.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kaction.h>
 #include <KActionCollection>
diff --git a/kwin/effects/windowgeometry/windowgeometry.cpp b/kwin/effects/windowgeometry/windowgeometry.cpp
index 5f3176f1..5e848b2f 100644
--- a/kwin/effects/windowgeometry/windowgeometry.cpp
+++ b/kwin/effects/windowgeometry/windowgeometry.cpp
@@ -28,9 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwindowsystem.h>
 #include <KActionCollection>
 #include <kaction.h>
-#include <KDE/KLocale>
-#include <KDE/KLocalizedString>
-#include <KDE/KGlobal>
+#include <KLocale>
+#include <KLocalizedString>
+#include <KGlobal>
 
 using namespace KWin;
 
diff --git a/kwin/effects/windowgeometry/windowgeometry_config.cpp b/kwin/effects/windowgeometry/windowgeometry_config.cpp
index 3c5d330d..7128c0bb 100644
--- a/kwin/effects/windowgeometry/windowgeometry_config.cpp
+++ b/kwin/effects/windowgeometry/windowgeometry_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 #include <KActionCollection>
 #include <kaction.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfiggroup.h>
 
 namespace KWin
diff --git a/kwin/effects/wobblywindows/wobblywindows_config.cpp b/kwin/effects/wobblywindows/wobblywindows_config.cpp
index c66b992f..781e3da5 100644
--- a/kwin/effects/wobblywindows/wobblywindows_config.cpp
+++ b/kwin/effects/wobblywindows/wobblywindows_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kconfiggroup.h>
diff --git a/kwin/effects/zoom/zoom.cpp b/kwin/effects/zoom/zoom.cpp
index fe183e43..30a81e4b 100644
--- a/kwin/effects/zoom/zoom.cpp
+++ b/kwin/effects/zoom/zoom.cpp
@@ -30,9 +30,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
-#include <KDE/KConfigGroup>
-#include <KDE/KLocalizedString>
-#include <KDE/KDebug>
+#include <KConfigGroup>
+#include <KLocalizedString>
+#include <KDebug>
 
 #include <kwinglutils.h>
 #ifdef KWIN_HAVE_XRENDER_COMPOSITING
diff --git a/kwin/effects/zoom/zoom_config.cpp b/kwin/effects/zoom/zoom_config.cpp
index 1ac18b35..a3c90374 100644
--- a/kwin/effects/zoom/zoom_config.cpp
+++ b/kwin/effects/zoom/zoom_config.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>
diff --git a/kwin/eglonxbackend.cpp b/kwin/eglonxbackend.cpp
index f2c6467c..7674f729 100644
--- a/kwin/eglonxbackend.cpp
+++ b/kwin/eglonxbackend.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // kwin libs
 #include <kwinglplatform.h>
 // KDE
-#include <KDE/KDebug>
+#include <KDebug>
 // system
 #include <unistd.h>
 
diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp
index b02e1340..8ebea421 100644
--- a/kwin/geometry.cpp
+++ b/kwin/geometry.cpp
@@ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QVarLengthArray>
 #include <QX11Info>
 
-#include <KDE/KGlobalSettings>
+#include <KGlobalSettings>
 #include "outline.h"
 
 namespace KWin
diff --git a/kwin/glxbackend.cpp b/kwin/glxbackend.cpp
index 172b32aa..cfefd301 100644
--- a/kwin/glxbackend.cpp
+++ b/kwin/glxbackend.cpp
@@ -33,8 +33,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // kwin libs
 #include <kwinglplatform.h>
 // KDE
-#include <KDE/KDebug>
-#include <KDE/KXErrorHandler>
+#include <KDebug>
+#include <KXErrorHandler>
 // system
 #include <unistd.h>
 
diff --git a/kwin/kcmkwin/kwincompositing/ktimerdialog.cpp b/kwin/kcmkwin/kwincompositing/ktimerdialog.cpp
index 599081c6..4cd21e61 100644
--- a/kwin/kcmkwin/kwincompositing/ktimerdialog.cpp
+++ b/kwin/kcmkwin/kwincompositing/ktimerdialog.cpp
@@ -31,7 +31,7 @@
 #include <kwindowsystem.h>
 #include <kiconloader.h>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kvbox.h>
 
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp
index 41fbd843..dd89c8a4 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttons.cpp
@@ -40,7 +40,7 @@
 #include <QMimeData>
 #include <QScrollBar>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kglobalsettings.h>
 
 #ifdef KWIN_BUILD_KAPPMENU
diff --git a/kwin/kcmkwin/kwindecoration/buttonsconfigdialog.cpp b/kwin/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
index 7ecf0cc3..6ee3337c 100644
--- a/kwin/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttonsconfigdialog.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QVBoxLayout>
 
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdecoration.h>
 
 namespace KWin
diff --git a/kwin/kcmkwin/kwindecoration/decorationmodel.cpp b/kwin/kcmkwin/kwindecoration/decorationmodel.cpp
index 822258fe..c98250b5 100644
--- a/kwin/kcmkwin/kwindecoration/decorationmodel.cpp
+++ b/kwin/kcmkwin/kwindecoration/decorationmodel.cpp
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDesktopFile>
 #include <KGlobalSettings>
 #include <KIcon>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KStandardDirs>
 #include <KPluginInfo>
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
index c6d1ce8c..3459e2a7 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -47,10 +47,10 @@
 // KDE
 #include <KAboutData>
 #include <KDialog>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <KMessageBox>
-#include <KDE/KStandardDirs>
-#include <KDE/KConfigDialogManager>
+#include <KStandardDirs>
+#include <KConfigDialogManager>
 #include <KPluginFactory>
 #include <Plasma/ConfigLoader>
 #include <qdeclarative.h>
diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp
index 568cb652..625587d2 100644
--- a/kwin/kcmkwin/kwindecoration/preview.cpp
+++ b/kwin/kcmkwin/kwindecoration/preview.cpp
@@ -20,7 +20,7 @@
 #include "preview.h"
 
 #include <kapplication.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <QLabel>
diff --git a/kwin/kcmkwin/kwindesktop/desktopnameswidget.cpp b/kwin/kcmkwin/kwindesktop/desktopnameswidget.cpp
index ceb4fd1e..6e4e2748 100644
--- a/kwin/kcmkwin/kwindesktop/desktopnameswidget.cpp
+++ b/kwin/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/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp
index 0a9b6ede..06aa3297 100644
--- a/kwin/kcmkwin/kwinoptions/main.cpp
+++ b/kwin/kcmkwin/kwinoptions/main.cpp
@@ -27,7 +27,7 @@
 
 #include <kapplication.h>
 #include <kglobal.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kaboutdata.h>
 #include <kdialog.h>
diff --git a/kwin/kcmkwin/kwinoptions/mouse.h b/kwin/kcmkwin/kwinoptions/mouse.h
index ec86289b..7c0a5c6f 100644
--- a/kwin/kcmkwin/kwinoptions/mouse.h
+++ b/kwin/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/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp
index 14a0da32..6195b43a 100644
--- a/kwin/kcmkwin/kwinoptions/windows.cpp
+++ b/kwin/kcmkwin/kwinoptions/windows.cpp
@@ -34,7 +34,7 @@
 #include <QtDBus/QtDBus>
 
 #include <KButtonGroup>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <knuminput.h>
 #include <kdialog.h>
 
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp
index 0744081b..a01cface 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp
@@ -20,7 +20,7 @@
 #include "detectwidget.h"
 
 #include <kapplication.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kdebug.h>
 #include <kwindowsystem.h>
 #include <QLabel>
diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp
index 4269c8b4..4019bedb 100644
--- a/kwin/kcmkwin/kwinrules/kcm.cpp
+++ b/kwin/kcmkwin/kwinrules/kcm.cpp
@@ -22,7 +22,7 @@
 #include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <QtDBus/QtDBus>
diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp
index 5b6646ea..66e7ee05 100644
--- a/kwin/kcmkwin/kwinrules/main.cpp
+++ b/kwin/kcmkwin/kwinrules/main.cpp
@@ -19,7 +19,7 @@
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <kconfig.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kwindowsystem.h>
 #include <QtDBus/QtDBus>
 #include <X11/Xlib.h>
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
index 30e19bdd..181da0ee 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
@@ -25,7 +25,7 @@
 #include <kpushbutton.h>
 #include <QLabel>
 #include <kwindowsystem.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <QRegExp>
 
 
diff --git a/kwin/kcmkwin/kwinrules/yesnobox.h b/kwin/kcmkwin/kwinrules/yesnobox.h
index b10e7c62..10ca3173 100644
--- a/kwin/kcmkwin/kwinrules/yesnobox.h
+++ b/kwin/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/kwin/kcmkwin/kwintabbox/layoutpreview.cpp b/kwin/kcmkwin/kwintabbox/layoutpreview.cpp
index 9f01f95e..8564b4d8 100644
--- a/kwin/kcmkwin/kwintabbox/layoutpreview.cpp
+++ b/kwin/kcmkwin/kwintabbox/layoutpreview.cpp
@@ -25,14 +25,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QGraphicsObject>
 #include <kdeclarative.h>
-#include <KDE/KConfigGroup>
-#include <KDE/KDesktopFile>
-#include <KDE/KGlobal>
-#include <KDE/KIcon>
-#include <KDE/KIconEffect>
-#include <KDE/KIconLoader>
-#include <KDE/KService>
-#include <KDE/KStandardDirs>
+#include <KConfigGroup>
+#include <KDesktopFile>
+#include <KGlobal>
+#include <KIcon>
+#include <KIconEffect>
+#include <KIconLoader>
+#include <KService>
+#include <KStandardDirs>
 
 namespace KWin
 {
diff --git a/kwin/kcmkwin/kwintabbox/thumbnailitem.cpp b/kwin/kcmkwin/kwintabbox/thumbnailitem.cpp
index 9dc54268..78dd91ce 100644
--- a/kwin/kcmkwin/kwintabbox/thumbnailitem.cpp
+++ b/kwin/kcmkwin/kwintabbox/thumbnailitem.cpp
@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeView>
 // KDE
-#include <KDE/KDebug>
-#include <KDE/KStandardDirs>
+#include <KDebug>
+#include <KStandardDirs>
 
 namespace KWin
 {
diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp
index 56f9ae4a..db8b0f33 100644
--- a/kwin/killer/killer.cpp
+++ b/kwin/killer/killer.cpp
@@ -25,8 +25,8 @@ DEALINGS IN THE SOFTWARE.
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <KDE/KIcon>
-#include <KDE/KLocalizedString>
+#include <KIcon>
+#include <KLocalizedString>
 #include <kauth.h>
 #include <kdebug.h>
 #include <unistd.h>
diff --git a/kwin/lanczosfilter.cpp b/kwin/lanczosfilter.cpp
index 4fa09e7d..c5fae4a9 100644
--- a/kwin/lanczosfilter.cpp
+++ b/kwin/lanczosfilter.cpp
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglplatform.h>
 
 #include <kwineffects.h>
-#include <KDE/KGlobalSettings>
+#include <KGlobalSettings>
 
 #include <qmath.h>
 #include <cmath>
diff --git a/kwin/libkdecorations/kcommondecoration.cpp b/kwin/libkdecorations/kcommondecoration.cpp
index f43aaaa9..168dcba3 100644
--- a/kwin/libkdecorations/kcommondecoration.cpp
+++ b/kwin/libkdecorations/kcommondecoration.cpp
@@ -37,7 +37,7 @@
 
 #include <kapplication.h>
 #include "kdecorationfactory.h"
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 
 #include "moc_kcommondecoration.cpp"
 
diff --git a/kwin/libkdecorations/kdecoration_plugins_p.cpp b/kwin/libkdecorations/kdecoration_plugins_p.cpp
index 952baa3e..405619c7 100644
--- a/kwin/libkdecorations/kdecoration_plugins_p.cpp
+++ b/kwin/libkdecorations/kdecoration_plugins_p.cpp
@@ -31,8 +31,8 @@ DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <klibrary.h>
 #include <kconfiggroup.h>
-#include <KDE/KLocalizedString>
-#include <KDE/KGlobal>
+#include <KLocalizedString>
+#include <KGlobal>
 #include <assert.h>
 
 #include <QDir>
diff --git a/kwin/libkwineffects/kwineffects.h b/kwin/libkwineffects/kwineffects.h
index bf46cd46..e57835ec 100644
--- a/kwin/libkwineffects/kwineffects.h
+++ b/kwin/libkwineffects/kwineffects.h
@@ -38,8 +38,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QHash>
 #include <QStack>
 
-#include <KDE/KPluginFactory>
-#include <KDE/KShortcutsEditor>
+#include <KPluginFactory>
+#include <KShortcutsEditor>
 
 #include <assert.h>
 #include <limits.h>
diff --git a/kwin/libkwineffects/kwinglutils.cpp b/kwin/libkwineffects/kwinglutils.cpp
index a6cd8c33..0130d7dd 100644
--- a/kwin/libkwineffects/kwinglutils.cpp
+++ b/kwin/libkwineffects/kwinglutils.cpp
@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "kdebug.h"
 #include <kstandarddirs.h>
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
+#include <KConfig>
+#include <KConfigGroup>
 
 #include <QPixmap>
 #include <QImage>
diff --git a/kwin/libkwineffects/kwinxrenderutils.h b/kwin/libkwineffects/kwinxrenderutils.h
index 697c82d6..34d3e246 100644
--- a/kwin/libkwineffects/kwinxrenderutils.h
+++ b/kwin/libkwineffects/kwinxrenderutils.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KWin
 #include <kwinglobals.h>
 // KDE
-#include <KDE/KSharedPtr>
+#include <KSharedPtr>
 // Qt
 #include <QRegion>
 #include <QVector>
diff --git a/kwin/main.h b/kwin/main.h
index c865deaf..9494d12b 100644
--- a/kwin/main.h
+++ b/kwin/main.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MAIN_H
 
 #include <kapplication.h>
-#include <KDE/KSelectionWatcher>
+#include <KSelectionWatcher>
 
 namespace KWin
 {
diff --git a/kwin/netinfo.h b/kwin/netinfo.h
index c992eeb1..925d5cd3 100644
--- a/kwin/netinfo.h
+++ b/kwin/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/kwin/rules.cpp b/kwin/rules.cpp
index 4892ab01..a78de7f7 100644
--- a/kwin/rules.cpp
+++ b/kwin/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 <ktemporaryfile.h>
 #include <QFile>
diff --git a/kwin/scene_opengl.cpp b/kwin/scene_opengl.cpp
index f91a1342..b1911943 100644
--- a/kwin/scene_opengl.cpp
+++ b/kwin/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/kwin/screenedge.h b/kwin/screenedge.h
index a81d29c7..2f8ab0e9 100644
--- a/kwin/screenedge.h
+++ b/kwin/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/kwin/screens.h b/kwin/screens.h
index 0ba11d1a..796f13ce 100644
--- a/kwin/screens.h
+++ b/kwin/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/kwin/tabbox/declarative.cpp b/kwin/tabbox/declarative.cpp
index 97a89c38..a405fd95 100644
--- a/kwin/tabbox/declarative.cpp
+++ b/kwin/tabbox/declarative.cpp
@@ -31,15 +31,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QX11Info>
 
 // include KDE
-#include <KDE/KDebug>
-#include <KDE/KGlobal>
-#include <KDE/KIconEffect>
-#include <KDE/KIconLoader>
-#include <KDE/KServiceTypeTrader>
-#include <KDE/KStandardDirs>
-#include <KDE/Plasma/FrameSvg>
-#include <KDE/Plasma/Theme>
-#include <KDE/Plasma/WindowEffects>
+#include <KDebug>
+#include <KGlobal>
+#include <KIconEffect>
+#include <KIconLoader>
+#include <KServiceTypeTrader>
+#include <KStandardDirs>
+#include <Plasma/FrameSvg>
+#include <Plasma/Theme>
+#include <Plasma/WindowEffects>
 #include <kdeclarative.h>
 // KWin
 #include "thumbnailitem.h"
diff --git a/kwin/tabbox/declarative.h b/kwin/tabbox/declarative.h
index 3ebb5284..00e19989 100644
--- a/kwin/tabbox/declarative.h
+++ b/kwin/tabbox/declarative.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // includes
 #include <QtDeclarative/QDeclarativeImageProvider>
 #include <QtDeclarative/QDeclarativeView>
-#include <KDE/KService>
+#include <KService>
 #include "tabboxconfig.h"
 
 // forward declaration
diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp
index af3361e0..757b89ef 100644
--- a/kwin/tabbox/tabbox.cpp
+++ b/kwin/tabbox/tabbox.cpp
@@ -47,10 +47,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KActionCollection>
 #include <KConfig>
 #include <KConfigGroup>
-#include <KDE/KAction>
+#include <KAction>
 #include <KDebug>
-#include <KDE/KIcon>
-#include <KDE/KGlobal>
+#include <KIcon>
+#include <KGlobal>
 #include <KLocalizedString>
 #include <kkeyserver.h>
 // X11
diff --git a/kwin/tabbox/tabbox.h b/kwin/tabbox/tabbox.h
index db41296b..b0d3c780 100644
--- a/kwin/tabbox/tabbox.h
+++ b/kwin/tabbox/tabbox.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QTimer>
 #include <QModelIndex>
-#include <KDE/KShortcut>
+#include <KShortcut>
 #include "utils.h"
 #include "tabbox/tabboxhandler.h"
 
diff --git a/kwin/tests/test_update_kwin_49.cpp b/kwin/tests/test_update_kwin_49.cpp
index 79a0522b..4042259d 100644
--- a/kwin/tests/test_update_kwin_49.cpp
+++ b/kwin/tests/test_update_kwin_49.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../data/update_kwin_49.h"
 #include "../tabbox/tabboxconfig.h"
 
-#include <KDE/KConfig>
+#include <KConfig>
 
 #include <QtTest/QtTest>
 
diff --git a/kwin/tests/test_virtual_desktops.cpp b/kwin/tests/test_virtual_desktops.cpp
index 854f6f14..500bf77f 100644
--- a/kwin/tests/test_virtual_desktops.cpp
+++ b/kwin/tests/test_virtual_desktops.cpp
@@ -19,9 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../virtualdesktops.h"
 // KDE
-#include <KDE/KAction>
-#include <KDE/KActionCollection>
-#include <KDE/KConfigGroup>
+#include <KAction>
+#include <KActionCollection>
+#include <KConfigGroup>
 
 #include <QtTest/QtTest>
 
diff --git a/kwin/thumbnailitem.cpp b/kwin/thumbnailitem.cpp
index 9ec604b0..2dbfc624 100644
--- a/kwin/thumbnailitem.cpp
+++ b/kwin/thumbnailitem.cpp
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeView>
 // KDE
-#include <KDE/KDebug>
+#include <KDebug>
 
 namespace KWin
 {
diff --git a/kwin/toplevel.h b/kwin/toplevel.h
index d962a82d..46999e34 100644
--- a/kwin/toplevel.h
+++ b/kwin/toplevel.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils.h"
 #include "virtualdesktops.h"
 // KDE
-#include <KDE/NETWinInfo>
+#include <NETWinInfo>
 // Qt
 #include <QObject>
 // xcb
diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp
index 1a75268d..e46e6ccb 100755
--- a/kwin/useractions.cpp
+++ b/kwin/useractions.cpp
@@ -42,9 +42,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
-#include <KDE/KKeySequenceWidget>
-#include <KDE/KProcess>
-#include <KDE/KToolInvocation>
+#include <KKeySequenceWidget>
+#include <KProcess>
+#include <KToolInvocation>
 
 #include <X11/extensions/Xrandr.h>
 #ifndef KWIN_NO_XF86VM
@@ -56,12 +56,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QPushButton>
 
 #include <kglobalsettings.h>
-#include <KDE/KIcon>
+#include <KIcon>
 #include <kiconloader.h>
-#include <KDE/KLocalizedString>
+#include <KLocalizedString>
 #include <kconfig.h>
-#include <KDE/KGlobal>
-#include <KDE/KPushButton>
+#include <KGlobal>
+#include <KPushButton>
 #include <kglobalaccel.h>
 #include <kapplication.h>
 #include <QRegExp>
diff --git a/kwin/useractions.h b/kwin/useractions.h
index 12244549..ef7b242e 100644
--- a/kwin/useractions.h
+++ b/kwin/useractions.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_USERACTIONS_H
 
 // KDE
-#include <KDE/KDialog>
+#include <KDialog>
 // Qt
 #include <QObject>
 #include <QWeakPointer>
diff --git a/kwin/utils.h b/kwin/utils.h
index de921e82..756d3820 100644
--- a/kwin/utils.h
+++ b/kwin/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/kwin/virtualdesktops.cpp b/kwin/virtualdesktops.cpp
index f4bdb33e..b61c07a3 100644
--- a/kwin/virtualdesktops.cpp
+++ b/kwin/virtualdesktops.cpp
@@ -20,11 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "virtualdesktops.h"
 // KDE
-#include <KDE/KAction>
-#include <KDE/KActionCollection>
-#include <KDE/KConfigGroup>
-#include <KDE/KLocalizedString>
-#include <KDE/NETRootInfo>
+#include <KAction>
+#include <KActionCollection>
+#include <KConfigGroup>
+#include <KLocalizedString>
+#include <NETRootInfo>
 
 namespace KWin {
 
diff --git a/kwin/virtualdesktops.h b/kwin/virtualdesktops.h
index 14f13e25..a1c4f3da 100644
--- a/kwin/virtualdesktops.h
+++ b/kwin/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 KActionCollection;
 class KLocalizedString;
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index 8f538200..dc2f767c 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -55,15 +55,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "xcbutils.h"
 // KDE
 #include <kdeversion.h>
-#include <KDE/KActionCollection>
-#include <KDE/KCmdLineArgs>
-#include <KDE/KConfig>
-#include <KDE/KConfigGroup>
-#include <KDE/KGlobal>
-#include <KDE/KGlobalSettings>
-#include <KDE/KStartupInfo>
-#include <KDE/KWindowInfo>
-#include <KDE/KWindowSystem>
+#include <KActionCollection>
+#include <KCmdLineArgs>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KGlobal>
+#include <KGlobalSettings>
+#include <KStartupInfo>
+#include <KWindowInfo>
+#include <KWindowSystem>
 // Qt
 #include <QtConcurrentRun>
 
diff --git a/kwin/xcbutils.cpp b/kwin/xcbutils.cpp
index 54a09e33..661418c0 100644
--- a/kwin/xcbutils.cpp
+++ b/kwin/xcbutils.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "xcbutils.h"
 #include "utils.h"
 // KDE
-#include <KDE/KDebug>
+#include <KDebug>
 // xcb
 #include <xcb/composite.h>
 #include <xcb/damage.h>
diff --git a/libs/plasmaclock/clockapplet.h b/libs/plasmaclock/clockapplet.h
index 6b5aef10..55ca1194 100644
--- a/libs/plasmaclock/clockapplet.h
+++ b/libs/plasmaclock/clockapplet.h
@@ -25,10 +25,10 @@
 #include <QtCore/QTime>
 #include <QtCore/QDate>
 
-#include <KDE/Plasma/DataEngine>
-#include <KDE/Plasma/Dialog>
-#include <KDE/Plasma/PopupApplet>
-#include <KDE/Plasma/ToolTipManager>
+#include <Plasma/DataEngine>
+#include <Plasma/Dialog>
+#include <Plasma/PopupApplet>
+#include <Plasma/ToolTipManager>
 
 #include "plasmaclock_export.h"
 
diff --git a/libs/plasmagenericshell/widgetsexplorer/widgetexplorer.h b/libs/plasmagenericshell/widgetsexplorer/widgetexplorer.h
index a8cf911d..c752223b 100644
--- a/libs/plasmagenericshell/widgetsexplorer/widgetexplorer.h
+++ b/libs/plasmagenericshell/widgetsexplorer/widgetexplorer.h
@@ -24,7 +24,7 @@
 
 #include <QtGui>
 
-#include <KDE/KDialog>
+#include <KDialog>
 
 #include <plasma/framesvg.h>
 
diff --git a/libs/taskmanager/abstractgroupableitem.h b/libs/taskmanager/abstractgroupableitem.h
index fc77d6d3..f73a5b9e 100644
--- a/libs/taskmanager/abstractgroupableitem.h
+++ b/libs/taskmanager/abstractgroupableitem.h
@@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QtCore/QObject>
 #include <QtGui/QIcon>
 
-#include <KDE/KWindowSystem>
-#include <KDE/KUrl>
+#include <KWindowSystem>
+#include <KUrl>
 
 #include "taskmanager.h"
 #include "taskmanager_export.h"
diff --git a/libs/taskmanager/groupmanager.h b/libs/taskmanager/groupmanager.h
index 4076a806..9e6bb213 100644
--- a/libs/taskmanager/groupmanager.h
+++ b/libs/taskmanager/groupmanager.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <taskmanager/task.h>
 #include <taskmanager/taskitem.h>
 #include <taskmanager/taskmanager_export.h>
-#include <KDE/KUrl>
+#include <KUrl>
 #include "launcheritem.h"
 
 class KConfigDialog;
diff --git a/libs/taskmanager/launcherconfig.cpp b/libs/taskmanager/launcherconfig.cpp
index 61ad9e47..0f774c04 100644
--- a/libs/taskmanager/launcherconfig.cpp
+++ b/libs/taskmanager/launcherconfig.cpp
@@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "launcherconfig.h"
 #include "launcherproperties.h"
-#include <KDE/KDebug>
-#include <KDE/KConfig>
-#include <KDE/KConfigDialog>
-#include <KDE/KConfigGroup>
-#include <KDE/KLocale>
-#include <KDE/KMessageBox>
+#include <KDebug>
+#include <KConfig>
+#include <KConfigDialog>
+#include <KConfigGroup>
+#include <KLocale>
+#include <KMessageBox>
 #include <QtGui/QWhatsThis>
 
 namespace TaskManager
diff --git a/libs/taskmanager/launcheritem.h b/libs/taskmanager/launcheritem.h
index 604f046b..874475e6 100644
--- a/libs/taskmanager/launcheritem.h
+++ b/libs/taskmanager/launcheritem.h
@@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "taskmanager_export.h"
 
 // KDE
-#include <KDE/KIcon>
-#include <KDE/KUrl>
+#include <KIcon>
+#include <KUrl>
 
 
 namespace TaskManager
diff --git a/libs/taskmanager/launcherproperties.cpp b/libs/taskmanager/launcherproperties.cpp
index d4926707..475dfe6d 100644
--- a/libs/taskmanager/launcherproperties.cpp
+++ b/libs/taskmanager/launcherproperties.cpp
@@ -22,12 +22,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include "launcherproperties.h"
-#include <KDE/KOpenWithDialog>
-#include <KDE/KDebug>
-#include <KDE/KDesktopFile>
-#include <KDE/KLocale>
-#include <KDE/KWindowInfo>
-#include <KDE/KWindowSystem>
+#include <KOpenWithDialog>
+#include <KDebug>
+#include <KDesktopFile>
+#include <KLocale>
+#include <KWindowInfo>
+#include <KWindowSystem>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QX11Info>
 #include <X11/Xlib.h>
diff --git a/libs/taskmanager/launcherproperties.h b/libs/taskmanager/launcherproperties.h
index 50eac5b1..d13f1b4f 100644
--- a/libs/taskmanager/launcherproperties.h
+++ b/libs/taskmanager/launcherproperties.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef LAUNCHER_PROPERTIES_H
 #define LAUNCHER_PROPERTIES_H
 
-#include <KDE/KDialog>
+#include <KDialog>
 #include "ui_launcherproperties.h"
 
 namespace TaskManager
diff --git a/libs/taskmanager/startup.h b/libs/taskmanager/startup.h
index ebd732e2..8f641c2b 100644
--- a/libs/taskmanager/startup.h
+++ b/libs/taskmanager/startup.h
@@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QtGui/QIcon>
 
 // KDE
-#include <KDE/KSharedPtr>
-#include <KDE/KStartupInfo>
+#include <KSharedPtr>
+#include <KStartupInfo>
 
 #include <taskmanager/taskmanager.h>
 #include <taskmanager/taskmanager_export.h>
diff --git a/libs/taskmanager/task.h b/libs/taskmanager/task.h
index 947f9592..cebe7cfb 100644
--- a/libs/taskmanager/task.h
+++ b/libs/taskmanager/task.h
@@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QtGui/QIcon>
 
 // KDE
-#include <KDE/KSharedPtr>
-#include <KDE/KWindowSystem>
+#include <KSharedPtr>
+#include <KWindowSystem>
 
 #include <taskmanager/taskmanager.h>
 #include <taskmanager/taskmanager_export.h>
diff --git a/libs/taskmanager/taskgroup.cpp b/libs/taskmanager/taskgroup.cpp
index 29c84233..3bc3f586 100644
--- a/libs/taskmanager/taskgroup.cpp
+++ b/libs/taskmanager/taskgroup.cpp
@@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QtCore/QTimer>
 
 // KDE
-#include <KDE/KDebug>
-#include <KDE/KIcon>
+#include <KDebug>
+#include <KIcon>
 #include <ksharedptr.h>
 
 
diff --git a/phonon/kcm/backendselection.cpp b/phonon/kcm/backendselection.cpp
index 70d60928..9712128f 100644
--- a/phonon/kcm/backendselection.cpp
+++ b/phonon/kcm/backendselection.cpp
@@ -24,14 +24,14 @@
 #include <QtCore/QStringList>
 #include <QListWidget>
 
-#include <KDE/KApplication>
-#include <KDE/KCModuleProxy>
-#include <KDE/KConfig>
-#include <KDE/KIcon>
-#include <KDE/KIconLoader>
-#include <KDE/KRun>
-#include <KDE/KServiceTypeProfile>
-#include <KDE/KServiceTypeTrader>
+#include <KApplication>
+#include <KCModuleProxy>
+#include <KConfig>
+#include <KIcon>
+#include <KIconLoader>
+#include <KRun>
+#include <KServiceTypeProfile>
+#include <KServiceTypeTrader>
 
 BackendSelection::BackendSelection(QWidget *parent)
     : QWidget(parent)
diff --git a/phonon/kcm/main.cpp b/phonon/kcm/main.cpp
index 9a30e92b..e85d411b 100644
--- a/phonon/kcm/main.cpp
+++ b/phonon/kcm/main.cpp
@@ -23,10 +23,10 @@
 
 #include <QBoxLayout>
 
-#include <KDE/KAboutData>
-#include <KDE/KDialog>
-#include <KDE/KPluginFactory>
-#include <KDE/KTabWidget>
+#include <KAboutData>
+#include <KDialog>
+#include <KPluginFactory>
+#include <KTabWidget>
 #include <kdeversion.h>
 
 #include "devicepreference.h"
diff --git a/plasma/desktop/applets/tasks/support/tooltip.cpp b/plasma/desktop/applets/tasks/support/tooltip.cpp
index 54c3ee9b..5ac13973 100644
--- a/plasma/desktop/applets/tasks/support/tooltip.cpp
+++ b/plasma/desktop/applets/tasks/support/tooltip.cpp
@@ -28,11 +28,11 @@
 #include <QDebug>
 #include <QTimer>
 
-#include <KDE/KIcon>
-#include <KDE/KIconLoader>
-#include <KDE/KWindowSystem>
-#include <KDE/Plasma/ToolTipContent>
-#include <KDE/Plasma/ToolTipManager>
+#include <KIcon>
+#include <KIconLoader>
+#include <KWindowSystem>
+#include <Plasma/ToolTipContent>
+#include <Plasma/ToolTipManager>
 
 ToolTipProxy::ToolTipProxy(QObject *parent)
     : QObject(parent), m_mainText(""), m_subText(""), m_highlightWindows(false)
diff --git a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp b/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp
index ee11afb4..498e644f 100644
--- a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp
+++ b/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp
@@ -27,14 +27,14 @@
 #include <QtGui/QMenu>
 #include <QtGui/QIcon>
 
-#include <KDE/KJob>
-#include <KDE/KIcon>
-#include <KDE/KIconLoader>
-#include <KDE/KStandardDirs>
-#include <KDE/Plasma/ServiceJob>
-#include <KDE/Plasma/ToolTipManager>
-#include <KDE/Plasma/Applet>
-#include <KDE/KDebug>
+#include <KJob>
+#include <KIcon>
+#include <KIconLoader>
+#include <KStandardDirs>
+#include <Plasma/ServiceJob>
+#include <Plasma/ToolTipManager>
+#include <Plasma/Applet>
+#include <KDebug>
 
 namespace SystemTray
 {
diff --git a/plasma/generic/applets/systemtray/ui/applet.cpp b/plasma/generic/applets/systemtray/ui/applet.cpp
index 42b332fa..08182349 100644
--- a/plasma/generic/applets/systemtray/ui/applet.cpp
+++ b/plasma/generic/applets/systemtray/ui/applet.cpp
@@ -36,9 +36,9 @@
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeComponent>
 
-#include <KDE/KStandardDirs>
-#include <KDE/KAction>
-#include <KDE/KWindowSystem>
+#include <KStandardDirs>
+#include <KAction>
+#include <KWindowSystem>
 #include <KConfigDialog>
 #include <KComboBox>
 #include <KCategorizedSortFilterProxyModel>
@@ -48,7 +48,7 @@
 #include <plasma/dataenginemanager.h>
 #include <Plasma/Corona>
 #include <Plasma/IconWidget>
-#include <KDE/Plasma/DeclarativeWidget>
+#include <Plasma/DeclarativeWidget>
 
 #include <inttypes.h>
 
diff --git a/plasma/generic/applets/systemtray/ui/applet.h b/plasma/generic/applets/systemtray/ui/applet.h
index 0b4a8697..65e6a90f 100644
--- a/plasma/generic/applets/systemtray/ui/applet.h
+++ b/plasma/generic/applets/systemtray/ui/applet.h
@@ -24,7 +24,7 @@
 #ifndef APPLET_H
 #define APPLET_H
 
-#include <KDE/Plasma/Applet>
+#include <Plasma/Applet>
 
 #include "ui_autohide.h"
 #include "ui_visibleitems.h"
diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
index 753ece9a..9806c506 100644
--- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
+++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
@@ -33,7 +33,7 @@
 #include <QtGui/QGraphicsSceneHoverEvent>
 #include <QtGui/QGraphicsScene>
 
-#include <KDE/Plasma/Containment>
+#include <Plasma/Containment>
 
 
 namespace SystemTray
diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
index 15d114af..f2b5f430 100644
--- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
+++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
@@ -29,7 +29,7 @@
 //Includes
 #include <QtDeclarative/QDeclarativeItem>
 
-#include <KDE/Plasma/Applet>
+#include <Plasma/Applet>
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plasma/generic/applets/systemtray/ui/widgetitem.cpp b/plasma/generic/applets/systemtray/ui/widgetitem.cpp
index 0756be96..ec4db662 100644
--- a/plasma/generic/applets/systemtray/ui/widgetitem.cpp
+++ b/plasma/generic/applets/systemtray/ui/widgetitem.cpp
@@ -31,7 +31,7 @@
 #include <QtCore/QWeakPointer>
 #include <QtGui/QGraphicsWidget>
 
-#include <KDE/Plasma/Containment>
+#include <Plasma/Containment>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace SystemTray
diff --git a/plasma/generic/applets/systemtray/ui/widgetitem.h b/plasma/generic/applets/systemtray/ui/widgetitem.h
index 112b9b32..47480717 100644
--- a/plasma/generic/applets/systemtray/ui/widgetitem.h
+++ b/plasma/generic/applets/systemtray/ui/widgetitem.h
@@ -31,7 +31,7 @@
 
 #include <QtDeclarative/QDeclarativeItem>
 
-#include <KDE/Plasma/Applet>
+#include <Plasma/Applet>
 
 namespace SystemTray
 {
diff --git a/plasma/generic/dataengines/geolocation/geolocationprovider.h b/plasma/generic/dataengines/geolocation/geolocationprovider.h
index c8024d6c..e776baf0 100644
--- a/plasma/generic/dataengines/geolocation/geolocationprovider.h
+++ b/plasma/generic/dataengines/geolocation/geolocationprovider.h
@@ -22,7 +22,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QTimer>
 
-#include <KDE/Plasma/DataEngine>
+#include <Plasma/DataEngine>
 
 #include "geolocation_export.h"
 
diff --git a/plasma/generic/dataengines/share/shareprovider.cpp b/plasma/generic/dataengines/share/shareprovider.cpp
index da994597..c80ae68a 100644
--- a/plasma/generic/dataengines/share/shareprovider.cpp
+++ b/plasma/generic/dataengines/share/shareprovider.cpp
@@ -22,8 +22,8 @@
 
 #include <krandom.h>
 #include <KDebug>
-#include <KDE/KIO/MimetypeJob>
-#include <KDE/KIO/FileJob>
+#include <KIO/MimetypeJob>
+#include <KIO/FileJob>
 
 #include "shareprovider.h"
 #include "share_package.h"
diff --git a/plasma/generic/dataengines/share/shareprovider.h b/plasma/generic/dataengines/share/shareprovider.h
index 319716c8..56079517 100644
--- a/plasma/generic/dataengines/share/shareprovider.h
+++ b/plasma/generic/dataengines/share/shareprovider.h
@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include <kio/global.h>
-#include <KDE/KIO/Job>
+#include <KIO/Job>
 
 #include <Plasma/PackageStructure>
 
diff --git a/plasma/generic/dataengines/tasks/virtualdesktopssource.cpp b/plasma/generic/dataengines/tasks/virtualdesktopssource.cpp
index 163718fe..865a00e5 100644
--- a/plasma/generic/dataengines/tasks/virtualdesktopssource.cpp
+++ b/plasma/generic/dataengines/tasks/virtualdesktopssource.cpp
@@ -18,7 +18,7 @@
 
 #include "virtualdesktopssource.h"
 
-#include <KDE/KWindowSystem>
+#include <KWindowSystem>
 
 VirtualDesktopsSource::VirtualDesktopsSource() : Plasma::DataContainer()
 {
diff --git a/plasma/generic/declarativeimports/core/tooltip.cpp b/plasma/generic/declarativeimports/core/tooltip.cpp
index 7bad60b9..67518427 100644
--- a/plasma/generic/declarativeimports/core/tooltip.cpp
+++ b/plasma/generic/declarativeimports/core/tooltip.cpp
@@ -28,10 +28,10 @@
 #include <QDebug>
 #include <QTimer>
 
-#include <KDE/KIcon>
-#include <KDE/KIconLoader>
-#include <KDE/Plasma/ToolTipContent>
-#include <KDE/Plasma/ToolTipManager>
+#include <KIcon>
+#include <KIconLoader>
+#include <Plasma/ToolTipContent>
+#include <Plasma/ToolTipManager>
 
 
 ToolTipProxy::ToolTipProxy(QObject *parent)
diff --git a/plasma/generic/kpart/plasmakpart.h b/plasma/generic/kpart/plasmakpart.h
index 92de3852..bc67dbb7 100644
--- a/plasma/generic/kpart/plasmakpart.h
+++ b/plasma/generic/kpart/plasmakpart.h
@@ -34,7 +34,7 @@ namespace Plasma
     class PluginLoader;
 }
 
-#include <KDE/KParts/Part>
+#include <KParts/Part>
 
 #include <QtCore/QHash>
 class QVariant;
diff --git a/plasma/generic/runners/shell/shellrunner.cpp b/plasma/generic/runners/shell/shellrunner.cpp
index 68dd278b..4ca24ced 100644
--- a/plasma/generic/runners/shell/shellrunner.cpp
+++ b/plasma/generic/runners/shell/shellrunner.cpp
@@ -23,7 +23,7 @@
 
 #include <KDebug>
 #ifdef Q_OS_UNIX
-#include <KDE/SuProcess>
+#include <SuProcess>
 #endif
 #include <KIcon>
 #include <KLocale>
diff --git a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
index 4f67cc55..ff4aaa62 100644
--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
@@ -18,15 +18,15 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <KDE/KStandardDirs>
-#include <KDE/KGlobal>
-#include <KDE/KComponentData>
-#include <KDE/KGlobalSettings>
-#include <KDE/KStyle>
-#include <KDE/KConfigGroup>
-#include <KDE/KIcon>
-#include <KDE/KFileDialog>
-#include <KDE/KColorDialog>
+#include <KStandardDirs>
+#include <KGlobal>
+#include <KComponentData>
+#include <KGlobalSettings>
+#include <KStyle>
+#include <KConfigGroup>
+#include <KIcon>
+#include <KFileDialog>
+#include <KColorDialog>
 #include <QtCore/QHash>
 #include <QtCore/QTimer>
 #include <QtGui/QFileDialog>
diff --git a/systemsettings/core/BaseMode.h b/systemsettings/core/BaseMode.h
index 9e087441..5b01a6bb 100644
--- a/systemsettings/core/BaseMode.h
+++ b/systemsettings/core/BaseMode.h
@@ -23,7 +23,7 @@
 #include <QtCore/QObject>
 #include "systemsettingsview_export.h"
 
-#include <KDE/KService>
+#include <KService>
 
 class QAction;
 class MenuItem;
diff --git a/systemsettings/core/MenuItem.h b/systemsettings/core/MenuItem.h
index d62b7779..01e70382 100644
--- a/systemsettings/core/MenuItem.h
+++ b/systemsettings/core/MenuItem.h
@@ -24,7 +24,7 @@
 
 #include "systemsettingsview_export.h"
 
-#include <KDE/KService>
+#include <KService>
 
 class QString;
 class KCModuleInfo;
diff --git a/systemsettings/core/MenuProxyModel.h b/systemsettings/core/MenuProxyModel.h
index 71d2afbc..96777f9b 100644
--- a/systemsettings/core/MenuProxyModel.h
+++ b/systemsettings/core/MenuProxyModel.h
@@ -21,7 +21,7 @@
 #ifndef MENUPROXYMODEL_H
 #define MENUPROXYMODEL_H
 
-#include <KDE/KCategorizedSortFilterProxyModel>
+#include <KCategorizedSortFilterProxyModel>
 #include "systemsettingsview_export.h"
 
 /**