generic: remove KDE prefix from header inclusions

2025-02-23 10:22:49 +00:00 · 2015-05-20 13:39:58 +00:00 · 2015-05-20 13:39:58 +00:00 · 1a547a0d05
commit 1a547a0d05
parent 762802adcf
238 changed files with 610 additions and 610 deletions
--- 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>();
--- 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
--- 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>

--- 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>
--- 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>
--- 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"

--- 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;
--- 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)
--- 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>
--- 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
 {
--- 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;

--- 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"
--- 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>
--- 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"
--- 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>
--- 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"
--- 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>
--- 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>
--- 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"

--- 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>
--- 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>

--- 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>
--- 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>
--- 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"
--- 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
 {
--- 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>
--- 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>
--- 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>
--- 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;
--- 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"
--- 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;
--- 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
 {
--- 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
--- 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"
--- 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>
--- 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>

--- 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"
--- 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"
--- 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>
--- 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"
--- 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>
--- 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;
--- 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"
--- 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>
--- 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;
--- 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)

--- 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"

--- 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>
--- 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>
--- 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 :-(
--- 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"
--- 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
 {
--- 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
--- 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
 {
--- 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[] =
 {
--- 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>
--- 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(
--- 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,
--- 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,
--- 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>



--- 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)
--- 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
    {
--- 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>
--- 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>
--- 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 {
--- 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>
--- 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(
--- 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 )
--- 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>

--- 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,
--- 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"

--- 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 )
--- 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 )
--- 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 {

--- 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 {
--- 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 {

--- 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
--- 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>


--- 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 {

--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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 {

--- 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>

--- 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 {

--- 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 {

--- 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"

--- 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>

--- 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(
--- 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 {

--- 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>
--- 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>
--- 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 {
--- 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"

--- 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
    {
--- 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 {

--- 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"
--- a/Show more
+++ b/Show more