Use capitalized KDE includes

41 files changed, 146 insertions, 148 deletions

diff --git a/src/views/additionalinfoaccessor.cpp b/src/views/additionalinfoaccessor.cpp
index cafc4fa23..426d7a2c4 100644
--- a/src/views/additionalinfoaccessor.cpp
+++ b/src/views/additionalinfoaccessor.cpp
@@ -20,8 +20,8 @@
 #include "additionalinfoaccessor.h"
 
 #include "dolphinmodel.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <KGlobal>
+#include <KLocale>
 
 class AdditionalInfoAccessorSingleton
 {
diff --git a/src/views/additionalinfoaccessor.h b/src/views/additionalinfoaccessor.h
index b3d564088..dbec097fd 100644
--- a/src/views/additionalinfoaccessor.h
+++ b/src/views/additionalinfoaccessor.h
@@ -21,7 +21,7 @@
 #define ADDITIONALINFOACCESSOR_H
 
 #include <libdolphin_export.h>
-#include <kfileitemdelegate.h>
+#include <KFileItemDelegate>
 #include <views/dolphinview.h>
 
 #include <QList>
diff --git a/src/views/dolphincategorydrawer.cpp b/src/views/dolphincategorydrawer.cpp
index d71184637..1f39133ab 100644
--- a/src/views/dolphincategorydrawer.cpp
+++ b/src/views/dolphincategorydrawer.cpp
@@ -29,14 +29,14 @@
 #include <QStyleOption>
 
 #ifdef HAVE_NEPOMUK
-#include <nepomuk/kratingpainter.h>
+#include <Nepomuk/KRatingPainter>
 #endif
 
-#include <kiconloader.h>
-#include <kiconeffect.h>
-#include <kcategorizedsortfilterproxymodel.h>
-#include <kuser.h>
-#include <kcategorizedview.h>
+#include <KIconLoader>
+#include <KIconEffect>
+#include <KCategorizedSortFilterProxyModel>
+#include <KUser>
+#include <KCategorizedView>
 
 #include "dolphinview.h"
 #include "dolphinmodel.h"
diff --git a/src/views/dolphincolumnview.cpp b/src/views/dolphincolumnview.cpp
index 52d86f121..464e0a068 100644
--- a/src/views/dolphincolumnview.cpp
+++ b/src/views/dolphincolumnview.cpp
@@ -36,14 +36,14 @@
 #include "viewmodecontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kcolorscheme.h>
-#include <kdirlister.h>
-#include <kfileitem.h>
-#include <kio/previewjob.h>
-#include <kicon.h>
-#include <kiconeffect.h>
-#include <kjob.h>
-#include <klocale.h>
+#include <KColorScheme>
+#include <KDirLister>
+#include <KFileItem>
+#include <KIO/PreviewJob>
+#include <KIcon>
+#include <KIconEffect>
+#include <KJob>
+#include <KLocale>
 #include <konqmimedata.h>
 
 #include <QApplication>
diff --git a/src/views/dolphincolumnview.h b/src/views/dolphincolumnview.h
index 72130c8f4..231ba59ab 100644
--- a/src/views/dolphincolumnview.h
+++ b/src/views/dolphincolumnview.h
@@ -27,7 +27,7 @@
 #include <QSize>
 #include <QStyleOption>
 
-#include <kurl.h>
+#include <KUrl>
 
 class DolphinColumnViewContainer;
 class DolphinModel;
diff --git a/src/views/dolphincolumnviewcontainer.h b/src/views/dolphincolumnviewcontainer.h
index 20ae81b38..c27caff62 100644
--- a/src/views/dolphincolumnviewcontainer.h
+++ b/src/views/dolphincolumnviewcontainer.h
@@ -22,7 +22,7 @@
 
 #include "dolphinview.h"
 
-#include <kurl.h>
+#include <KUrl>
 
 #include <QList>
 #include <QScrollArea>
diff --git a/src/views/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp
index d434a4b3d..482925aaa 100644
--- a/src/views/dolphindetailsview.cpp
+++ b/src/views/dolphindetailsview.cpp
@@ -36,10 +36,10 @@
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 
-#include <kdirmodel.h>
-#include <kdirlister.h>
-#include <klocale.h>
-#include <kmenu.h>
+#include <KDirModel>
+#include <KDirLister>
+#include <KLocale>
+#include <KMenu>
 
 #include <QApplication>
 #include <QHeaderView>
diff --git a/src/views/dolphindetailsviewexpander.cpp b/src/views/dolphindetailsviewexpander.cpp
index 0f3d3fde1..c2734ed3a 100644
--- a/src/views/dolphindetailsviewexpander.cpp
+++ b/src/views/dolphindetailsviewexpander.cpp
@@ -23,8 +23,8 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 
-#include <kdirlister.h>
-#include <kdirmodel.h>
+#include <KDirLister>
+#include <KDirModel>
 
 DolphinDetailsViewExpander::DolphinDetailsViewExpander(DolphinDetailsView* parent,
                                                        const QSet<KUrl>& urlsToExpand) :
diff --git a/src/views/dolphindirlister.cpp b/src/views/dolphindirlister.cpp
index 2eac5522d..81ad20b26 100644
--- a/src/views/dolphindirlister.cpp
+++ b/src/views/dolphindirlister.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include "dolphindirlister.h"
-#include "klocale.h"
+#include <KLocale>
 #include <kio/jobclasses.h>
 
 DolphinDirLister::DolphinDirLister() :
diff --git a/src/views/dolphindirlister.h b/src/views/dolphindirlister.h
index 0549c3c8f..a9e043992 100644
--- a/src/views/dolphindirlister.h
+++ b/src/views/dolphindirlister.h
@@ -21,7 +21,7 @@
 #define DOLPHINDIRLISTER_H
 
 #include <libdolphin_export.h>
-#include <kdirlister.h>
+#include <KDirLister>
 
 /**
  * @brief Extends the class KDirLister by emitting a signal when an
diff --git a/src/views/dolphinfileitemdelegate.cpp b/src/views/dolphinfileitemdelegate.cpp
index 0372ce674..a3046ebba 100644
--- a/src/views/dolphinfileitemdelegate.cpp
+++ b/src/views/dolphinfileitemdelegate.cpp
@@ -20,11 +20,11 @@
 #include "dolphinfileitemdelegate.h"
 
 #include "dolphinmodel.h"
-#include <kcolorscheme.h>
-#include <kfileitem.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kstringhandler.h>
+#include <KColorScheme>
+#include <KFileItem>
+#include <KIcon>
+#include <KIconLoader>
+#include <KStringHandler>
 
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
diff --git a/src/views/dolphinfileitemdelegate.h b/src/views/dolphinfileitemdelegate.h
index afe88997e..252b261e0 100644
--- a/src/views/dolphinfileitemdelegate.h
+++ b/src/views/dolphinfileitemdelegate.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINFILEITEMDELEGATE_H
 #define DOLPHINFILEITEMDELEGATE_H
 
-#include <kfileitemdelegate.h>
+#include <KFileItemDelegate>
 #include <views/dolphinmodel.h>
 
 class QAbstractProxyModel;
diff --git a/src/views/dolphiniconsview.cpp b/src/views/dolphiniconsview.cpp
index f04769762..301748e15 100644
--- a/src/views/dolphiniconsview.cpp
+++ b/src/views/dolphiniconsview.cpp
@@ -31,9 +31,9 @@
 #include "viewmodecontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kcategorizedsortfilterproxymodel.h>
-#include <kdialog.h>
-#include <kfileitemdelegate.h>
+#include <KCategorizedSortFilterProxyModel>
+#include <KDialog>
+#include <KFileItemDelegate>
 
 #include <QAbstractProxyModel>
 #include <QApplication>
diff --git a/src/views/dolphiniconsview.h b/src/views/dolphiniconsview.h
index 0f6f716c3..8f77fc9b2 100644
--- a/src/views/dolphiniconsview.h
+++ b/src/views/dolphiniconsview.h
@@ -20,10 +20,10 @@
 #ifndef DOLPHINICONSVIEW_H
 #define DOLPHINICONSVIEW_H
 
-#include <kcategorizedview.h>
+#include <KCategorizedView>
 
-#include <kfileitem.h>
-#include <kfileitemdelegate.h>
+#include <KFileItem>
+#include <KFileItemDelegate>
 
 #include <QFont>
 #include <QSize>
diff --git a/src/views/dolphinmodel.cpp b/src/views/dolphinmodel.cpp
index 6474a4f3c..c999dfacd 100644
--- a/src/views/dolphinmodel.cpp
+++ b/src/views/dolphinmodel.cpp
@@ -22,17 +22,16 @@
 
 #include "dolphinsortfilterproxymodel.h"
 
-#include "kcategorizedview.h"
-
-#include <kdatetime.h>
-#include <kdirmodel.h>
-#include <kfileitem.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kurl.h>
-#include <kuser.h>
-#include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <KCategorizedView>
+#include <KDateTime>
+#include <KDirModel>
+#include <KFileItem>
+#include <KIconLoader>
+#include <KLocale>
+#include <KUrl>
+#include <KUser>
+#include <KMimeType>
+#include <KStandardDirs>
 
 #include <QList>
 #include <QSortFilterProxyModel>
diff --git a/src/views/dolphinmodel.h b/src/views/dolphinmodel.h
index 930b4e85e..2f6d1f02d 100644
--- a/src/views/dolphinmodel.h
+++ b/src/views/dolphinmodel.h
@@ -21,7 +21,7 @@
 #ifndef DOLPHINMODEL_H
 #define DOLPHINMODEL_H
 
-#include <kdirmodel.h>
+#include <KDirModel>
 #include <kversioncontrolplugin.h>
 #include <libdolphin_export.h>
 
diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 50a755b9a..baddc16e3 100644
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinnewfilemenuobserver.h"
 
-#include <kglobal.h>
+#include <KGlobal>
 #include <knewmenu.h>
 
 class DolphinNewFileMenuObserverSingleton
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 397eaccc0..f3bd15772 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -26,21 +26,21 @@
 #include "dolphinremoteencoding.h"
 #include "dolphinviewactionhandler.h"
 
-#include <kdebug.h>
-#include <kactionmenu.h>
-#include <kactioncollection.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmimetype.h>
-#include <kconfig.h>
-#include <kcharsets.h>
-#include <kmenu.h>
-#include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
-#include <kio/slaveconfig.h>
-#include <kio/scheduler.h>
-#include <kconfiggroup.h>
+#include <KDebug>
+#include <KActionMenu>
+#include <KActionCollection>
+#include <KIcon>
+#include <KLocale>
+#include <KGlobal>
+#include <KMimeType>
+#include <KConfig>
+#include <KCharsets>
+#include <KMenu>
+#include <KProtocolInfo>
+#include <KProtocolManager>
+#include <KIO/SlaveConfig>
+#include <KIO/Scheduler>
+#include <KConfigGroup>
 
 #define DATA_KEY        QLatin1String("Charset")
 
diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
index 54499f78b..559bc66ad 100644
--- a/src/views/dolphinremoteencoding.h
+++ b/src/views/dolphinremoteencoding.h
@@ -21,8 +21,8 @@
 #define DOLPHINREMOTEENCODING_H
 
 #include <QStringList>
-#include <QtGui/QAction>
-#include <kurl.h>
+#include <QAction>
+#include <KUrl>
 #include "libdolphin_export.h"
 
 
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index ae124c735..a4e97bf6e 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -29,24 +29,24 @@
 #include <QTimer>
 #include <QScrollBar>
 
-#include <kactioncollection.h>
-#include <kcolorscheme.h>
-#include <kdirlister.h>
-#include <kiconeffect.h>
-#include <kfileitem.h>
-#include <kfileitemlistproperties.h>
-#include <klocale.h>
-#include <kio/deletejob.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kjob.h>
-#include <kmenu.h>
-#include <kmessagebox.h>
+#include <KActionCollection>
+#include <KColorScheme>
+#include <KDirLister>
+#include <KIconEffect>
+#include <KFileItem>
+#include <KFileItemListProperties>
+#include <KLocale>
+#include <KIO/DeleteJob>
+#include <KIO/NetAccess>
+#include <KIO/PreviewJob>
+#include <KJob>
+#include <KMenu>
+#include <KMessageBox>
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
-#include <ktoggleaction.h>
-#include <kurl.h>
+#include <KToggleAction>
+#include <KUrl>
 
 #include "additionalinfoaccessor.h"
 #include "dolphindirlister.h"
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 04b821e71..bd242833b 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -27,10 +27,10 @@
 #include "libdolphin_export.h"
 
 #include <kparts/part.h>
-#include <kfileitem.h>
-#include <kfileitemdelegate.h>
+#include <KFileItem>
+#include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
-#include <kio/job.h>
+#include <KIO/Job>
 
 #include <QBoxLayout>
 #include <QKeyEvent>
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 9c0d33f9e..a8b044a41 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -25,17 +25,16 @@
 #include "views/zoomlevelinfo.h"
 #include <konq_operations.h>
 
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kactionmenu.h>
-#include <kfileitemdelegate.h>
-#include <klocale.h>
+#include <KAction>
+#include <KActionCollection>
+#include <KActionMenu>
+#include <KFileItemDelegate>
+#include <KLocale>
 #include <knewmenu.h>
-#include <kselectaction.h>
-#include <ktoggleaction.h>
-#include <krun.h>
-#include <kpropertiesdialog.h>
-
+#include <KSelectAction>
+#include <KToggleAction>
+#include <KRun>
+#include <KPropertiesDialog>
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
     : QObject(parent),
diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index 05339ce37..72e768375 100644
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -22,10 +22,10 @@
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #include "libdolphin_export.h"
-#include <kactionmenu.h>
-#include <kselectaction.h>
+#include <KActionMenu>
+#include <KSelectAction>
 #include "views/dolphinview.h"
-#include <QtCore/QObject>
+#include <QObject>
 
 class KToggleAction;
 class QAction;
diff --git a/src/views/dolphinviewcontroller.cpp b/src/views/dolphinviewcontroller.cpp
index 6749eaa41..98d548da5 100644
--- a/src/views/dolphinviewcontroller.cpp
+++ b/src/views/dolphinviewcontroller.cpp
@@ -20,8 +20,8 @@
 #include "dolphinviewcontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kdirmodel.h>
-#include <kfileitemactions.h>
+#include <KDirModel>
+#include <KFileItemActions>
 #include <QAbstractProxyModel>
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/views/dolphinviewcontroller.h b/src/views/dolphinviewcontroller.h
index 07bc56936..1ad8fab33 100644
--- a/src/views/dolphinviewcontroller.h
+++ b/src/views/dolphinviewcontroller.h
@@ -21,8 +21,8 @@
 #define DOLPHINVIEWCONTROLLER_H
 
 #include <views/dolphinview.h>
-#include <kurl.h>
-#include <QtCore/QObject>
+#include <KUrl>
+#include <QObject>
 #include <libdolphin_export.h>
 
 class QAbstractItemView;
diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 9708415f0..749c82888 100644
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -20,10 +20,10 @@
 
 #include "draganddrophelper.h"
 
-#include <kdirmodel.h>
-#include <kfileitem.h>
-#include <kicon.h>
-#include <klocale.h>
+#include <KDirModel>
+#include <KFileItem>
+#include <KIcon>
+#include <KLocale>
 #include <konq_operations.h>
 
 #include "views/dolphiniconsview.h"
diff --git a/src/views/folderexpander.cpp b/src/views/folderexpander.cpp
index a2dfb137b..4e22fdb0a 100644
--- a/src/views/folderexpander.cpp
+++ b/src/views/folderexpander.cpp
@@ -19,17 +19,17 @@
 
 #include "folderexpander.h"
 
-#include <QtCore/QTimer>
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QTreeView>
-#include <QtGui/QScrollBar>
+#include <QTimer>
+#include <QAbstractItemView>
+#include <QTreeView>
+#include <QScrollBar>
 
-#include <QtCore/QEvent>
-#include <QtGui/QDragMoveEvent>
+#include <QEvent>
+#include <QDragMoveEvent>
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
-#include <kdirmodel.h>
+#include <KDirModel>
 
 FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *proxyModel) :
     QObject(view),
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 2b56d928b..864cfe270 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -19,10 +19,10 @@
 
 #include "renamedialog.h"
 
-#include <klineedit.h>
-#include <klocale.h>
+#include <KLineEdit>
+#include <KLocale>
 #include <konq_operations.h>
-#include <kstringhandler.h>
+#include <KStringHandler>
 
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index 73414093c..8d8b73da5 100644
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -22,8 +22,8 @@
 
 #include "libdolphin_export.h"
 
-#include <kdialog.h>
-#include <kfileitem.h>
+#include <KDialog>
+#include <KFileItem>
 
 class KLineEdit;
 
diff --git a/src/views/selectionmanager.cpp b/src/views/selectionmanager.cpp
index 34203216e..731bcfc85 100644
--- a/src/views/selectionmanager.cpp
+++ b/src/views/selectionmanager.cpp
@@ -23,9 +23,9 @@
 #include "dolphin_generalsettings.h"
 #include "selectiontoggle.h"
 #include "settings/dolphinsettings.h"
-#include <kdirmodel.h>
-#include <kglobalsettings.h>
-#include <kiconeffect.h>
+#include <KDirModel>
+#include <KGlobalSettings>
+#include <KIconEffect>
 
 #include <QAbstractButton>
 #include <QAbstractItemView>
diff --git a/src/views/selectionmanager.h b/src/views/selectionmanager.h
index 9cab4f3a9..060b6dc04 100644
--- a/src/views/selectionmanager.h
+++ b/src/views/selectionmanager.h
@@ -20,7 +20,7 @@
 #ifndef SELECTIONMANAGER_H
 #define SELECTIONMANAGER_H
 
-#include <kfileitem.h>
+#include <KFileItem>
 
 #include <QObject>
 
diff --git a/src/views/selectiontoggle.cpp b/src/views/selectiontoggle.cpp
index c1272fa0f..40e0cfc10 100644
--- a/src/views/selectiontoggle.cpp
+++ b/src/views/selectiontoggle.cpp
@@ -19,11 +19,11 @@
 
 #include "selectiontoggle.h"
 
-#include <kglobalsettings.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kiconeffect.h>
-#include <klocale.h>
+#include <KGlobalSettings>
+#include <KIcon>
+#include <KIconLoader>
+#include <KIconEffect>
+#include <KLocale>
 
 #include <QApplication>
 #include <QPainter>
@@ -32,7 +32,7 @@
 #include <QTimer>
 #include <QTimeLine>
 
-#include <kdebug.h>
+#include <KDebug>
 
 SelectionToggle::SelectionToggle(QWidget* parent) :
     QAbstractButton(parent),
diff --git a/src/views/selectiontoggle.h b/src/views/selectiontoggle.h
index 210f1a3aa..43a0ff3d0 100644
--- a/src/views/selectiontoggle.h
+++ b/src/views/selectiontoggle.h
@@ -20,7 +20,7 @@
 #ifndef SELECTIONTOGGLE_H
 #define SELECTIONTOGGLE_H
 
-#include <kurl.h>
+#include <KUrl>
 
 #include <QAbstractButton>
 #include <QPixmap>
diff --git a/src/views/versioncontrol/pendingthreadsmaintainer.cpp b/src/views/versioncontrol/pendingthreadsmaintainer.cpp
index f61c79975..1e0953108 100644
--- a/src/views/versioncontrol/pendingthreadsmaintainer.cpp
+++ b/src/views/versioncontrol/pendingthreadsmaintainer.cpp
@@ -19,7 +19,7 @@
 
 #include "pendingthreadsmaintainer.h"
 
-#include <kglobal.h>
+#include <KGlobal>
 #include <QThread>
 #include <QTimer>
 
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 9c3939632..76f175451 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -21,10 +21,10 @@
 
 #include "dolphin_versioncontrolsettings.h"
 
-#include <kdirlister.h>
-#include <klocale.h>
-#include <kservice.h>
-#include <kservicetypetrader.h>
+#include <KDirLister>
+#include <KLocale>
+#include <KService>
+#include <KServiceTypeTrader>
 #include <kversioncontrolplugin.h>
 
 #include "pendingthreadsmaintainer.h"
diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index eb1e74580..ecf78d05f 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -22,7 +22,7 @@
 
 #include <libdolphin_export.h>
 
-#include <kfileitem.h>
+#include <KFileItem>
 #include <kversioncontrolplugin.h>
 #include <QList>
 #include <QMutex>
diff --git a/src/views/viewextensionsfactory.cpp b/src/views/viewextensionsfactory.cpp
index 7b51af248..f89a0cb85 100644
--- a/src/views/viewextensionsfactory.cpp
+++ b/src/views/viewextensionsfactory.cpp
@@ -33,9 +33,9 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kdirlister.h>
-#include <kdirmodel.h>
-#include <kfilepreviewgenerator.h>
+#include <KDirLister>
+#include <KDirModel>
+#include <KFilePreviewGenerator>
 #include <QAbstractItemView>
 #include <QApplication>
 
diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h
index 9435a21e6..59ea3e6b1 100644
--- a/src/views/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -20,7 +20,7 @@
 #ifndef VIEWMODECONTROLLER_H
 #define VIEWMODECONTROLLER_H
 
-#include <kurl.h>
+#include <KUrl>
 #include <QObject>
 #include <libdolphin_export.h>
 #include <views/dolphinview.h>
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 0e50dcec7..f6465e17d 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -24,10 +24,10 @@
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
 
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
+#include <KComponentData>
+#include <KLocale>
+#include <KStandardDirs>
+#include <KUrl>
 
 #include <QDate>
 #include <QFile>
diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h
index 787122d35..03e423e93 100644
--- a/src/views/viewproperties.h
+++ b/src/views/viewproperties.h
@@ -22,7 +22,7 @@
 #define VIEWPROPERTIES_H
 
 #include <views/dolphinview.h>
-#include <kurl.h>
+#include <KUrl>
 #include <libdolphin_export.h>
 
 class ViewPropertySettings;
diff --git a/src/views/zoomlevelinfo.cpp b/src/views/zoomlevelinfo.cpp
index 08e95e3ca..5c55ce7c6 100644
--- a/src/views/zoomlevelinfo.cpp
+++ b/src/views/zoomlevelinfo.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include "zoomlevelinfo.h"
-#include <kiconloader.h>
+#include <KIconLoader>
 #include <QSize>
 
 int ZoomLevelInfo::minimumLevel()