From 48b58f830a585b773435c9af5ee2fe8f0c7c641d Mon Sep 17 00:00:00 2001
From: Roman Inflianskas <infroma@gmail.com>
Date: Sun, 4 Mar 2018 16:38:16 +0300
Subject: [PATCH] Remove unused #include

Summary: I used CLion inspection to hunt all unused #include

Reviewers: #dolphin, elvisangelaccio, markg

Reviewed By: #dolphin, elvisangelaccio, markg

Subscribers: bcooksley, markg, elvisangelaccio, #dolphin

Differential Revision: https://phabricator.kde.org/D10985
---
 src/dbusinterface.cpp                         |  6 +-
 src/dolphincontextmenu.cpp                    | 23 +++---
 src/dolphincontextmenu.h                      |  8 +--
 src/dolphinmainwindow.cpp                     | 39 +++++------
 src/dolphinmainwindow.h                       |  5 +-
 src/dolphinnewfilemenu.h                      |  4 +-
 src/dolphinpart.cpp                           | 41 ++++++-----
 src/dolphinpart.h                             |  2 +-
 src/dolphinpart_ext.cpp                       |  5 --
 src/dolphinpart_ext.h                         |  1 +
 src/dolphinrecenttabsmenu.cpp                 |  3 +-
 src/dolphinrecenttabsmenu.h                   |  1 +
 src/dolphinremoveaction.cpp                   |  3 -
 src/dolphinremoveaction.h                     |  4 +-
 src/dolphintabbar.cpp                         |  7 +-
 src/dolphintabpage.cpp                        |  2 +-
 src/dolphintabpage.h                          |  2 +-
 src/dolphintabwidget.cpp                      |  7 +-
 src/dolphinviewcontainer.cpp                  | 45 ++++++------
 src/dolphinviewcontainer.h                    | 11 ++-
 src/filterbar/filterbar.cpp                   |  9 +--
 src/global.cpp                                |  3 +-
 src/kitemviews/kfileitemlistview.cpp          |  6 +-
 src/kitemviews/kfileitemlistview.h            |  3 +-
 src/kitemviews/kfileitemlistwidget.cpp        |  3 +-
 src/kitemviews/kfileitemlistwidget.h          |  3 +-
 src/kitemviews/kfileitemmodel.cpp             |  8 +--
 src/kitemviews/kfileitemmodel.h               |  7 +-
 src/kitemviews/kfileitemmodelrolesupdater.cpp | 23 +++---
 src/kitemviews/kfileitemmodelrolesupdater.h   |  7 +-
 src/kitemviews/kitemlistcontainer.cpp         |  1 -
 src/kitemviews/kitemlistcontroller.cpp        | 10 ++-
 src/kitemviews/kitemlistcontroller.h          |  2 +-
 src/kitemviews/kitemlistgroupheader.h         |  3 +-
 src/kitemviews/kitemlistheader.cpp            |  1 -
 src/kitemviews/kitemlistheader.h              |  1 +
 src/kitemviews/kitemlistselectionmanager.h    |  5 +-
 src/kitemviews/kitemlistview.cpp              |  4 +-
 src/kitemviews/kitemlistview.h                | 10 +--
 src/kitemviews/kitemlistviewaccessible.cpp    |  4 +-
 src/kitemviews/kitemlistwidget.cpp            |  2 -
 src/kitemviews/kitemlistwidget.h              |  3 +-
 src/kitemviews/kitemmodelbase.h               |  7 +-
 src/kitemviews/kitemset.h                     |  3 +-
 src/kitemviews/kstandarditemlistgroupheader.h |  3 +-
 src/kitemviews/kstandarditemlistview.cpp      |  3 +-
 src/kitemviews/kstandarditemlistview.h        |  3 +-
 src/kitemviews/kstandarditemlistwidget.cpp    | 11 ++-
 src/kitemviews/kstandarditemlistwidget.h      |  3 +-
 src/kitemviews/kstandarditemmodel.h           |  3 +-
 .../private/kbaloorolesprovider.cpp           |  7 +-
 src/kitemviews/private/kbaloorolesprovider.h  |  1 +
 .../private/kdirectorycontentscounter.cpp     |  4 +-
 .../private/kdirectorycontentscounter.h       |  2 +-
 src/kitemviews/private/kfileitemclipboard.cpp |  3 +-
 src/kitemviews/private/kfileitemclipboard.h   | 10 +--
 .../private/kfileitemmodeldirlister.cpp       |  1 +
 .../private/kfileitemmodeldirlister.h         |  2 +
 src/kitemviews/private/kfileitemmodelfilter.h |  1 +
 .../private/kitemlistheaderwidget.cpp         |  3 +-
 .../private/kitemlistheaderwidget.h           |  1 +
 .../private/kitemlistkeyboardsearchmanager.h  |  2 +-
 src/kitemviews/private/kitemlistrubberband.h  |  1 +
 .../private/kitemlistselectiontoggle.cpp      |  1 +
 .../private/kitemlistsizehintresolver.cpp     |  3 +-
 .../private/kitemlistsizehintresolver.h       |  2 +-
 .../private/kitemlistsmoothscroller.cpp       |  2 +-
 .../private/kitemlistviewanimation.cpp        |  3 +-
 .../private/kitemlistviewlayouter.cpp         |  8 +--
 src/kitemviews/private/kpixmapmodifier.cpp    |  2 +-
 src/main.cpp                                  | 15 ++--
 src/panels/folders/foldersitemlistwidget.h    |  2 +-
 src/panels/folders/folderspanel.cpp           | 21 +++---
 src/panels/folders/folderspanel.h             |  3 +-
 src/panels/folders/treeviewcontextmenu.cpp    | 26 +++----
 src/panels/folders/treeviewcontextmenu.h      |  3 +-
 .../filemetadataconfigurationdialog.cpp       |  9 +--
 .../filemetadataconfigurationdialog.h         |  5 +-
 src/panels/information/informationpanel.cpp   |  2 +
 src/panels/information/informationpanel.h     |  4 +-
 .../information/informationpanelcontent.cpp   |  7 +-
 .../information/informationpanelcontent.h     |  5 +-
 src/panels/information/phononwidget.cpp       |  9 +--
 src/panels/information/phononwidget.h         |  8 +--
 src/panels/information/pixmapviewer.h         |  2 +-
 src/panels/panel.h                            |  2 +-
 src/panels/places/placesitem.cpp              |  3 +-
 src/panels/places/placesitem.h                | 11 +--
 src/panels/places/placesitemeditdialog.cpp    |  8 ++-
 src/panels/places/placesitemlistgroupheader.h |  2 +-
 src/panels/places/placesitemlistwidget.h      |  2 +-
 src/panels/places/placesitemmodel.cpp         | 21 +++---
 src/panels/places/placesitemmodel.h           | 11 +--
 src/panels/places/placespanel.cpp             | 41 +++++------
 src/panels/places/placespanel.h               |  5 +-
 src/panels/places/placesview.h                |  2 +-
 src/panels/terminal/terminalpanel.cpp         | 14 ++--
 src/panels/terminal/terminalpanel.h           |  2 +-
 src/search/dolphinfacetswidget.cpp            |  3 +-
 src/search/dolphinsearchbox.cpp               | 22 +++---
 src/settings/additionalinfodialog.cpp         | 16 ++---
 src/settings/additionalinfodialog.h           |  1 -
 src/settings/applyviewpropsjob.cpp            |  3 +-
 src/settings/applyviewpropsjob.h              |  1 +
 src/settings/dolphinsettingsdialog.cpp        |  6 +-
 src/settings/general/behaviorsettingspage.cpp |  4 +-
 src/settings/general/behaviorsettingspage.h   |  5 +-
 .../general/configurepreviewplugindialog.cpp  | 14 ++--
 .../general/confirmationssettingspage.cpp     |  2 +-
 .../general/confirmationssettingspage.h       |  2 +-
 src/settings/general/generalsettingspage.h    |  3 +-
 src/settings/general/previewssettingspage.cpp |  9 ++-
 src/settings/general/previewssettingspage.h   |  2 +-
 .../general/statusbarsettingspage.cpp         |  2 +-
 src/settings/general/statusbarsettingspage.h  |  2 +-
 src/settings/kcm/kcmdolphingeneral.cpp        | 10 +--
 src/settings/kcm/kcmdolphingeneral.h          |  1 +
 src/settings/kcm/kcmdolphinnavigation.cpp     |  4 +-
 src/settings/kcm/kcmdolphinservices.cpp       |  4 +-
 src/settings/kcm/kcmdolphinviewmodes.cpp      |  8 +--
 .../navigation/navigationsettingspage.h       |  2 +-
 src/settings/serviceitemdelegate.cpp          |  3 +-
 .../services/servicessettingspage.cpp         |  8 +--
 src/settings/services/servicessettingspage.h  |  2 +-
 src/settings/startup/startupsettingspage.cpp  | 11 ++-
 src/settings/startup/startupsettingspage.h    |  3 +-
 src/settings/trash/trashsettingspage.h        |  1 +
 .../viewmodes/dolphinfontrequester.cpp        |  6 +-
 src/settings/viewmodes/viewmodesettings.cpp   |  4 +-
 src/settings/viewmodes/viewsettingspage.cpp   |  8 +--
 src/settings/viewmodes/viewsettingspage.h     |  2 +-
 src/settings/viewmodes/viewsettingstab.cpp    |  9 ++-
 src/settings/viewmodes/viewsettingstab.h      |  3 +-
 src/settings/viewpropertiesdialog.cpp         |  6 +-
 src/settings/viewpropsprogressinfo.cpp        | 16 ++---
 src/settings/viewpropsprogressinfo.h          |  3 +-
 src/statusbar/dolphinstatusbar.cpp            | 18 +++--
 src/statusbar/mountpointobserver.cpp          |  1 +
 src/statusbar/spaceinfoobserver.h             |  4 +-
 src/statusbar/statusbarspaceinfo.cpp          |  4 +-
 src/statusbar/statusbarspaceinfo.h            |  5 +-
 src/views/dolphinfileitemlistwidget.cpp       |  4 +-
 src/views/dolphinfileitemlistwidget.h         |  3 +-
 src/views/dolphinitemlistview.cpp             | 15 ++--
 src/views/dolphinitemlistview.h               |  5 +-
 src/views/dolphinnewfilemenuobserver.h        |  4 +-
 src/views/dolphinremoteencoding.cpp           | 16 +++--
 src/views/dolphinremoteencoding.h             |  6 +-
 src/views/dolphinview.cpp                     | 70 +++++++++----------
 src/views/dolphinview.h                       | 10 +--
 src/views/dolphinviewactionhandler.cpp        | 16 ++---
 src/views/dolphinviewactionhandler.h          |  1 +
 src/views/draganddrophelper.cpp               |  8 +--
 src/views/draganddrophelper.h                 |  2 +-
 src/views/renamedialog.cpp                    | 14 ++--
 src/views/renamedialog.h                      |  3 +-
 .../tooltips/dolphinfilemetadatawidget.cpp    | 15 ++--
 .../tooltips/dolphinfilemetadatawidget.h      |  3 +-
 src/views/tooltips/tooltipmanager.cpp         |  3 +-
 src/views/tooltips/tooltipmanager.h           |  4 +-
 .../versioncontrol/kversioncontrolplugin.h    |  3 +-
 .../versioncontrol/updateitemstatesthread.h   |  2 +-
 .../versioncontrol/versioncontrolobserver.cpp |  7 +-
 .../versioncontrol/versioncontrolobserver.h   |  2 +-
 src/views/viewmodecontroller.h                |  7 +-
 src/views/viewproperties.cpp                  |  1 -
 src/views/viewproperties.h                    |  5 +-
 src/views/zoomlevelinfo.cpp                   |  2 +
 168 files changed, 565 insertions(+), 586 deletions(-)

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index 37270b7872..e5192f2077 100644
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -20,11 +20,9 @@
 #include "dbusinterface.h"
 #include "global.h"
 
-#include <QDBusConnection>
-#include <QList>
-#include <QUrl>
 #include <KPropertiesDialog>
-#include <KRun>
+
+#include <QDBusConnection>
 
 DBusInterface::DBusInterface() :
     QObject()
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 1f4e8f0100..c35f442cba 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -20,43 +20,40 @@
 
 #include "dolphincontextmenu.h"
 
+#include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"
-#include "dolphinviewcontainer.h"
-#include "dolphin_generalsettings.h"
 #include "dolphinremoveaction.h"
+#include "dolphinviewcontainer.h"
+#include "panels/places/placesitem.h"
+#include "panels/places/placesitemmodel.h"
+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"
 
-#include <KActionCollection>
 #include <KAbstractFileItemActionPlugin>
+#include <KActionCollection>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
-#include <KIO/RestoreJob>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
+#include <KIO/RestoreJob>
 #include <KJobWidgets>
+#include <KLocalizedString>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>
 #include <KPluginMetaData>
 #include <KService>
-#include <KLocalizedString>
 #include <KStandardAction>
 #include <KToolBar>
 
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>
-#include <QMenuBar>
 #include <QMenu>
+#include <QMenuBar>
 #include <QMimeDatabase>
 
-#include <panels/places/placesitem.h>
-#include <panels/places/placesitemmodel.h>
-
-
-#include "views/dolphinview.h"
-#include "views/viewmodecontroller.h"
-
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const QPoint& pos,
                                        const KFileItem& fileInfo,
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 558115fb04..9ebdb1a566 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,13 +20,11 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <KFileItem>
-#include <QUrl>
 #include <KFileCopyToMenu>
+#include <KFileItem>
+
 #include <QMenu>
-
-
-
+#include <QUrl>
 
 class QAction;
 class DolphinMainWindow;
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index abde14cdd9..462675c09a 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -41,44 +41,43 @@
 #include "views/draganddrophelper.h"
 #include "views/viewproperties.h"
 #include "views/dolphinnewfilemenuobserver.h"
-
 #include "dolphin_generalsettings.h"
 
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KAuthorized>
 #include <KConfig>
-#include <kdualaction.h>
-#include <KHelpMenu>
-#include <KJobWidgets>
-#include <QLineEdit>
-#include <KToolBar>
-#include <KIO/JobUiDelegate>
-#include <KLocalizedString>
-#include <KProtocolManager>
-#include <KProtocolInfo>
-#include <QMenu>
-#include <KMessageBox>
-#include <KFilePlacesModel>
 #include <KFileItemListProperties>
+#include <KFilePlacesModel>
+#include <KHelpMenu>
+#include <KIO/JobUiDelegate>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KProtocolInfo>
+#include <KProtocolManager>
 #include <KRun>
 #include <KShell>
 #include <KStandardAction>
 #include <KToggleAction>
-#include <KUrlNavigator>
+#include <KToolBar>
 #include <KToolInvocation>
 #include <KUrlComboBox>
+#include <KUrlNavigator>
 
 #include <QApplication>
-#include <QMenuBar>
 #include <QClipboard>
-#include <QToolButton>
-#include <QTimer>
-#include <QStandardPaths>
-#include <QPushButton>
 #include <QCloseEvent>
-#include <QShowEvent>
 #include <QDialog>
+#include <QLineEdit>
+#include <QMenu>
+#include <QMenuBar>
+#include <QPushButton>
+#include <QShowEvent>
+#include <QStandardPaths>
+#include <QTimer>
+#include <QToolButton>
+#include <kdualaction.h>
 
 namespace {
     // Used for GeneralSettings::version() to determine whether
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 5e900e930d..25233096ab 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -23,15 +23,14 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include <config-baloo.h>
-
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
-#include <QIcon>
-#include <QUrl>
 
+#include <QIcon>
 #include <QList>
 #include <QPointer>
+#include <QUrl>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index 3505017e13..b741df1c7a 100644
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -21,10 +21,10 @@
 #ifndef DOLPHINNEWFILEMENU_H
 #define DOLPHINNEWFILEMENU_H
 
-#include <KNewFileMenu>
-
 #include "dolphin_export.h"
 
+#include <KNewFileMenu>
+
 class KJob;
 
 /**
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 11ea91428c..e0f06bc5f8 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,43 +18,42 @@
 */
 
 #include "dolphinpart.h"
-#include "dolphinremoveaction.h"
 
-#include <KFileItemListProperties>
+#include "dolphindebug.h"
+#include "dolphinnewfilemenu.h"
+#include "dolphinpart_ext.h"
+#include "dolphinremoveaction.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/private/kfileitemmodeldirlister.h"
+#include "views/dolphinnewfilemenuobserver.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/dolphinview.h"
+#include "views/dolphinviewactionhandler.h"
 
 #include <KAboutData>
 #include <KActionCollection>
-#include "dolphindebug.h"
+#include <KAuthorized>
+#include <KConfigGroup>
+#include <KFileItemListProperties>
 #include <KIconLoader>
+#include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>
+#include <KMimeTypeEditor>
 #include <KPluginFactory>
 #include <KRun>
-#include <KToolInvocation>
-#include <KAuthorized>
-#include <QMenu>
 #include <KSharedConfig>
-#include <KConfigGroup>
-#include <KMimeTypeEditor>
-#include <KJobWidgets>
+#include <KToolInvocation>
 
-#include "dolphinpart_ext.h"
-#include "dolphinnewfilemenu.h"
-#include "views/dolphinview.h"
-#include "views/dolphinviewactionhandler.h"
-#include "views/dolphinnewfilemenuobserver.h"
-#include "views/dolphinremoteencoding.h"
-#include "kitemviews/kfileitemmodel.h"
-#include "kitemviews/private/kfileitemmodeldirlister.h"
-
-#include <QStandardPaths>
 #include <QActionGroup>
-#include <QTextDocument>
 #include <QApplication>
 #include <QClipboard>
 #include <QDir>
-#include <QKeyEvent>
 #include <QInputDialog>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QStandardPaths>
+#include <QTextDocument>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 
diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 845d843651..864c08344e 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -21,8 +21,8 @@
 #define DOLPHINPART_H
 
 #include <KParts/ReadOnlyPart>
-#include <QUrl>
 
+#include <QUrl>
 
 class DolphinNewFileMenu;
 class DolphinViewActionHandler;
diff --git a/src/dolphinpart_ext.cpp b/src/dolphinpart_ext.cpp
index a9cefb0619..8c6e9641ad 100644
--- a/src/dolphinpart_ext.cpp
+++ b/src/dolphinpart_ext.cpp
@@ -22,11 +22,6 @@
 #include "dolphinpart.h"
 #include "views/dolphinview.h"
 
-#include <QVariant>
-
-#include <KFileItem>
-
-
 DolphinPartBrowserExtension::DolphinPartBrowserExtension(DolphinPart* part)
     :KParts::BrowserExtension( part )
     ,m_part(part)
diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h
index 2011bcd0c3..f2e96d3d18 100644
--- a/src/dolphinpart_ext.h
+++ b/src/dolphinpart_ext.h
@@ -24,6 +24,7 @@
 #include <kparts/fileinfoextension.h>
 #include <kparts/listingfilterextension.h>
 #include <kparts/listingnotificationextension.h>
+
 #include <QUrl>
 
 class DolphinPart;
diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index f425df2180..e85cedbf97 100644
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -19,9 +19,10 @@
 
 #include "dolphinrecenttabsmenu.h"
 
-#include <KLocalizedString>
 #include <KAcceleratorManager>
+#include <KLocalizedString>
 #include <kio/global.h>
+
 #include <QMenu>
 
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
diff --git a/src/dolphinrecenttabsmenu.h b/src/dolphinrecenttabsmenu.h
index fe92a516d1..1d052b9b0b 100644
--- a/src/dolphinrecenttabsmenu.h
+++ b/src/dolphinrecenttabsmenu.h
@@ -21,6 +21,7 @@
 #define DOLPHIN_RECENT_TABS_MENU_H
 
 #include <KActionMenu>
+
 #include <QUrl>
 
 class QAction;
diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index ea7efe6c86..078aa3dd42 100644
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -22,9 +22,6 @@
 
 #include <QApplication>
 
-#include <KLocalizedString>
-
-
 DolphinRemoveAction::DolphinRemoveAction(QObject* parent, KActionCollection* collection) :
     QAction(parent),
     m_collection(collection)
diff --git a/src/dolphinremoveaction.h b/src/dolphinremoveaction.h
index 6ba25923af..9ea3406e8c 100644
--- a/src/dolphinremoveaction.h
+++ b/src/dolphinremoveaction.h
@@ -23,11 +23,11 @@
 
 #include "dolphin_export.h"
 
+#include <KActionCollection>
+
 #include <QAction>
 #include <QPointer>
 
-#include <KActionCollection>
-
 /**
  * A QAction that manages the delete based on the current state of
  * the Shift key or the parameter passed to update.
diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp
index 484a9f3a07..fc52afff69 100644
--- a/src/dolphintabbar.cpp
+++ b/src/dolphintabbar.cpp
@@ -19,13 +19,12 @@
 
 #include "dolphintabbar.h"
 
-#include <QTimer>
-#include <QDragEnterEvent>
 #include <KLocalizedString>
+
+#include <QDragEnterEvent>
 #include <QMenu>
-#include <QIcon>
-#include <QUrl>
 #include <QMimeData>
+#include <QTimer>
 
 DolphinTabBar::DolphinTabBar(QWidget* parent) :
     QTabBar(parent),
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index 1d3a6f08c9..342d6f6dee 100644
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -19,8 +19,8 @@
 
 #include "dolphintabpage.h"
 
-#include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
+#include "dolphinviewcontainer.h"
 
 #include <QSplitter>
 #include <QVBoxLayout>
diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index ba4c144d91..6c70a60621 100644
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -20,9 +20,9 @@
 #ifndef DOLPHIN_TAB_PAGE_H
 #define DOLPHIN_TAB_PAGE_H
 
-#include <QWidget>
 #include <QPointer>
 #include <QUrl>
+#include <QWidget>
 
 class QSplitter;
 class DolphinViewContainer;
diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index da1ced4b31..8b13cebe62 100644
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -23,12 +23,13 @@
 #include "dolphintabpage.h"
 #include "dolphinviewcontainer.h"
 
-#include <QApplication>
-#include <QDropEvent>
 #include <KConfigGroup>
+#include <KRun>
 #include <KShell>
 #include <kio/global.h>
-#include <KRun>
+
+#include <QApplication>
+#include <QDropEvent>
 
 DolphinTabWidget::DolphinTabWidget(QWidget* parent) :
     QTabWidget(parent),
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 83b9f43437..1620f3c368 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,38 +18,35 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
-#include <KProtocolManager>
 
-#include <QDropEvent>
-#include <QTimer>
-#include <QMimeData>
-#include <QVBoxLayout>
-#include <QLoggingCategory>
-
-#include <KFileItemActions>
-#include <KFilePlacesModel>
-#include <KLocalizedString>
-#include <KIO/PreviewJob>
-#include <kio_version.h>
-#include <KMessageWidget>
-#include <KShell>
-#include <QUrl>
-#include <KUrlComboBox>
-#include <KUrlNavigator>
-#include <KRun>
-
-#ifdef KActivities_FOUND
-#endif
-
-#include "global.h"
-#include "dolphindebug.h"
 #include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
 #include "filterbar/filterbar.h"
+#include "global.h"
 #include "search/dolphinsearchbox.h"
 #include "statusbar/dolphinstatusbar.h"
 #include "views/viewmodecontroller.h"
 #include "views/viewproperties.h"
 
+#include <KFileItemActions>
+#include <KFilePlacesModel>
+#include <KIO/PreviewJob>
+#include <KLocalizedString>
+#include <KMessageWidget>
+#include <KProtocolManager>
+#include <KRun>
+#include <KShell>
+#include <KUrlComboBox>
+#include <KUrlNavigator>
+#include <kio_version.h>
+
+#include <QDropEvent>
+#include <QLoggingCategory>
+#include <QMimeData>
+#include <QTimer>
+#include <QUrl>
+#include <QVBoxLayout>
+
 DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_topLayout(nullptr),
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 837b168d70..993584b7ad 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,18 +20,17 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include <KFileItem>
-#include <KCompletion>
-#include <KIO/Job>
+#include "config-dolphin.h"
+#include "views/dolphinview.h"
 
+#include <KCompletion>
+#include <KFileItem>
+#include <KIO/Job>
 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
 #include <QWidget>
 
-#include <views/dolphinview.h>
-#include <config-dolphin.h>
-
 #ifdef KF5Activities_FOUND
 namespace KActivities {
     class ResourceInstance;
diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 97f76cff47..813a50838b 100644
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -18,15 +18,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
+
 #include "filterbar.h"
 
+#include <KLocalizedString>
+
+#include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QToolButton>
-#include <QHBoxLayout>
-
-#include <KLocalizedString>
 #include <QLineEdit>
+#include <QToolButton>
 
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
diff --git a/src/global.cpp b/src/global.cpp
index d0e477bc8d..aaeb581206 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -18,8 +18,9 @@
  */
 
 #include "global.h"
-#include "dolphindebug.h"
+
 #include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
 
 #include <KRun>
 
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index dd8167d79a..3c1ef1b98d 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -19,17 +19,17 @@
 
 #include "kfileitemlistview.h"
 
-#include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
+#include "kfileitemmodelrolesupdater.h"
 #include "private/kpixmapmodifier.h"
 
 #include <KIconLoader>
 
-#include <QPainter>
-#include <QTimer>
 #include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QPainter>
+#include <QTimer>
 
 // #define KFILEITEMLISTVIEW_DEBUG
 
diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h
index c7fdf972db..c13ea5ef2d 100644
--- a/src/kitemviews/kfileitemlistview.h
+++ b/src/kitemviews/kfileitemlistview.h
@@ -21,8 +21,7 @@
 #define KFILEITEMLISTVIEW_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kstandarditemlistview.h>
+#include "kitemviews/kstandarditemlistview.h"
 
 class KFileItemModelRolesUpdater;
 class QTimer;
diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 92b84b1455..4298101de0 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -21,8 +21,9 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
-#include <KLocalizedString>
 #include <KFormat>
+#include <KLocalizedString>
+
 #include <QMimeDatabase>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
diff --git a/src/kitemviews/kfileitemlistwidget.h b/src/kitemviews/kfileitemlistwidget.h
index fbb0300f81..7ce415dbee 100644
--- a/src/kitemviews/kfileitemlistwidget.h
+++ b/src/kitemviews/kfileitemlistwidget.h
@@ -21,8 +21,7 @@
 #define KFILEITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kstandarditemlistwidget.h>
+#include "kitemviews/kstandarditemlistwidget.h"
 
 class DOLPHIN_EXPORT KFileItemListWidgetInformant : public KStandardItemListWidgetInformant
 {
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index ae0ad30b63..b6a0016428 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -22,15 +22,13 @@
 #include "kfileitemmodel.h"
 
 #include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
+#include "private/kfileitemmodeldirlister.h"
+#include "private/kfileitemmodelsortalgorithm.h"
 
 #include <KLocalizedString>
 #include <KUrlMimeData>
 
-#include "dolphindebug.h"
-
-#include "private/kfileitemmodelsortalgorithm.h"
-#include "private/kfileitemmodeldirlister.h"
-
 #include <QElapsedTimer>
 #include <QMimeData>
 #include <QTimer>
diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 4589b54224..75953f0b7e 100644
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -21,14 +21,15 @@
 #define KFILEITEMMODEL_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/private/kfileitemmodelfilter.h"
+
 #include <KFileItem>
-#include <QUrl>
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/private/kfileitemmodelfilter.h>
 
 #include <QCollator>
 #include <QHash>
 #include <QSet>
+#include <QUrl>
 
 #include <functional>
 
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index ddbed16a8f..6c96a08d16 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -20,31 +20,30 @@
 #include "kfileitemmodelrolesupdater.h"
 
 #include "kfileitemmodel.h"
+#include "private/kdirectorycontentscounter.h"
+#include "private/kpixmapmodifier.h"
 
 #include <KConfig>
 #include <KConfigGroup>
-#include <KSharedConfig>
-#include <KIconLoader>
-#include <KJobWidgets>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
-#include <KPluginLoader>
+#include <KIconLoader>
+#include <KJobWidgets>
 #include <KOverlayIconPlugin>
+#include <KPluginLoader>
+#include <KSharedConfig>
 
-#include "private/kpixmapmodifier.h"
-#include "private/kdirectorycontentscounter.h"
+#ifdef HAVE_BALOO
+#include "private/kbaloorolesprovider.h"
+#include <Baloo/File>
+#include <Baloo/FileMonitor>
+#endif
 
 #include <QApplication>
 #include <QPainter>
 #include <QElapsedTimer>
 #include <QTimer>
 
-#ifdef HAVE_BALOO
-    #include "private/kbaloorolesprovider.h"
-    #include <Baloo/File>
-    #include <Baloo/FileMonitor>
-#endif
-
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
 
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h
index d971a7c171..0eef7fcd4f 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -20,12 +20,11 @@
 #ifndef KFILEITEMMODELROLESUPDATER_H
 #define KFILEITEMMODELROLESUPDATER_H
 
-#include <config-baloo.h>
+#include "dolphin_export.h"
+#include "kitemviews/kitemmodelbase.h"
 
 #include <KFileItem>
-#include <kitemviews/kitemmodelbase.h>
-
-#include "dolphin_export.h"
+#include <config-baloo.h>
 
 #include <QObject>
 #include <QSet>
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index cdc7baa357..f308667b38 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -24,7 +24,6 @@
 
 #include "kitemlistcontroller.h"
 #include "kitemlistview.h"
-
 #include "private/kitemlistsmoothscroller.h"
 
 #include <QApplication>
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index cef58b643f..36d8e4671b 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -23,13 +23,13 @@
 
 #include "kitemlistcontroller.h"
 
-
-#include "kitemlistview.h"
 #include "kitemlistselectionmanager.h"
-
-#include "private/kitemlistrubberband.h"
+#include "kitemlistview.h"
 #include "private/kitemlistkeyboardsearchmanager.h"
+#include "private/kitemlistrubberband.h"
+#include "views/draganddrophelper.h"
 
+#include <QAccessible>
 #include <QApplication>
 #include <QDrag>
 #include <QGraphicsScene>
@@ -37,8 +37,6 @@
 #include <QGraphicsView>
 #include <QMimeData>
 #include <QTimer>
-#include <QAccessible>
-#include <views/draganddrophelper.h>
 
 KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
     QObject(parent),
diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index 3de5edece9..2f84a6c2c3 100644
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -24,11 +24,11 @@
 #define KITEMLISTCONTROLLER_H
 
 #include "dolphin_export.h"
-
 #include "kitemset.h"
 
 #include <QObject>
 #include <QPointF>
+
 class QTimer;
 class KItemModelBase;
 class KItemListKeyboardSearchManager;
diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h
index ec5fb145eb..0e5c61f744 100644
--- a/src/kitemviews/kitemlistgroupheader.h
+++ b/src/kitemviews/kitemlistgroupheader.h
@@ -21,8 +21,7 @@
 #define KITEMLISTGROUPHEADER_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemliststyleoption.h>
+#include "kitemviews/kitemliststyleoption.h"
 
 #include <QByteArray>
 #include <QGraphicsWidget>
diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
index 935961a8bc..cfc2c2b729 100644
--- a/src/kitemviews/kitemlistheader.cpp
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -19,7 +19,6 @@
 
 #include "kitemlistheader.h"
 #include "kitemlistview.h"
-
 #include "private/kitemlistheaderwidget.h"
 
 KItemListHeader::~KItemListHeader()
diff --git a/src/kitemviews/kitemlistheader.h b/src/kitemviews/kitemlistheader.h
index ef1dd0f859..95258a592e 100644
--- a/src/kitemviews/kitemlistheader.h
+++ b/src/kitemviews/kitemlistheader.h
@@ -21,6 +21,7 @@
 #define KITEMLISTHEADER_H
 
 #include "dolphin_export.h"
+
 #include <QHash>
 #include <QObject>
 
diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h
index e4fe0c2304..4bb503a802 100644
--- a/src/kitemviews/kitemlistselectionmanager.h
+++ b/src/kitemviews/kitemlistselectionmanager.h
@@ -24,9 +24,8 @@
 #define KITEMLISTSELECTIONMANAGER_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/kitemset.h>
+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/kitemset.h"
 
 #include <QObject>
 
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index f457b00ac0..489c6f9b69 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -27,6 +27,7 @@
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
 #include "kitemlistselectionmanager.h"
+#include "kitemlistviewaccessible.h"
 #include "kstandarditemlistwidget.h"
 
 #include "private/kitemlistheaderwidget.h"
@@ -34,13 +35,12 @@
 #include "private/kitemlistsizehintresolver.h"
 #include "private/kitemlistviewlayouter.h"
 
+#include <QElapsedTimer>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QStyleOptionRubberBand>
 #include <QTimer>
-#include <QElapsedTimer>
 
-#include "kitemlistviewaccessible.h"
 
 namespace {
     // Time in ms until reaching the autoscroll margin triggers
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 7af3d3283a..8320883f1f 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -24,12 +24,12 @@
 #define KITEMLISTVIEW_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemliststyleoption.h"
+#include "kitemviews/kitemlistwidget.h"
+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/kstandarditemlistgroupheader.h"
+#include "kitemviews/private/kitemlistviewanimation.h"
 
-#include <kitemviews/kstandarditemlistgroupheader.h>
-#include <kitemviews/kitemliststyleoption.h>
-#include <kitemviews/kitemlistwidget.h>
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/private/kitemlistviewanimation.h>
 #include <QGraphicsWidget>
 #include <QSet>
 
diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index ce45ed81d0..69c126f6d6 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -27,8 +27,8 @@
 #include "kitemlistview.h"
 #include "private/kitemlistviewlayouter.h"
 
-#include <qgraphicsscene.h>
-#include <qgraphicsview.h>
+#include <QGraphicsScene>
+#include <QGraphicsView>
 
 KItemListView* KItemListViewAccessible::view() const
 {
diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index f92309254f..61dd7256eb 100644
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -23,10 +23,8 @@
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"
-
 #include "private/kitemlistselectiontoggle.h"
 
-
 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>
diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index 06fea0e391..433048aa02 100644
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -24,8 +24,7 @@
 #define KITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemliststyleoption.h>
+#include "kitemviews/kitemliststyleoption.h"
 
 #include <QBitArray>
 #include <QGraphicsWidget>
diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h
index 7db387ec2e..257872f9ca 100644
--- a/src/kitemviews/kitemmodelbase.h
+++ b/src/kitemviews/kitemmodelbase.h
@@ -24,13 +24,12 @@
 #define KITEMMODELBASE_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemrange.h"
+#include "kitemviews/kitemset.h"
 
-#include <kitemviews/kitemrange.h>
-#include <kitemviews/kitemset.h>
-
-#include <QUrl>
 #include <QHash>
 #include <QObject>
+#include <QUrl>
 #include <QVariant>
 
 class QMimeData;
diff --git a/src/kitemviews/kitemset.h b/src/kitemviews/kitemset.h
index b831953c66..14aa665a14 100644
--- a/src/kitemviews/kitemset.h
+++ b/src/kitemviews/kitemset.h
@@ -21,8 +21,7 @@
 #define KITEMSET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemrange.h>
+#include "kitemviews/kitemrange.h"
 
 /**
  * @brief Stores a set of integer numbers in a space-efficient way.
diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h
index 136bb866fa..c420a58b1e 100644
--- a/src/kitemviews/kstandarditemlistgroupheader.h
+++ b/src/kitemviews/kstandarditemlistgroupheader.h
@@ -21,8 +21,7 @@
 #define KSTANDARDITEMLISTGROUPHEADER_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemlistgroupheader.h>
+#include "kitemviews/kitemlistgroupheader.h"
 
 #include <QPixmap>
 #include <QStaticText>
diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index 00f111053c..ee1c061036 100644
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -19,9 +19,10 @@
 
 #include "kstandarditemlistview.h"
 
-#include <KIconLoader>
 #include "kstandarditemlistwidget.h"
 
+#include <KIconLoader>
+
 KStandardItemListView::KStandardItemListView(QGraphicsWidget* parent) :
     KItemListView(parent),
     m_itemLayout(DetailsLayout)
diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h
index f6125621ff..cf5ce5fc1c 100644
--- a/src/kitemviews/kstandarditemlistview.h
+++ b/src/kitemviews/kstandarditemlistview.h
@@ -21,8 +21,7 @@
 #define KSTANDARDITEMLISTVIEW_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"
 
 /**
  * @brief Provides layouts for icons-, compact- and details-view.
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 0841ad4017..d396e58f8d 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -21,22 +21,21 @@
 
 #include "kfileitemlistview.h"
 #include "kfileitemmodel.h"
+#include "private/kfileitemclipboard.h"
+#include "private/kitemlistroleeditor.h"
+#include "private/kpixmapmodifier.h"
 
 #include <KIconEffect>
 #include <KIconLoader>
 #include <KRatingPainter>
 #include <KStringHandler>
 
-#include "private/kfileitemclipboard.h"
-#include "private/kitemlistroleeditor.h"
-#include "private/kpixmapmodifier.h"
-
 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
-#include <QStyleOption>
-#include <QPixmapCache>
 #include <QGuiApplication>
+#include <QPixmapCache>
+#include <QStyleOption>
 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG
 
diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index b13c303bc1..220c0ebc33 100644
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -21,8 +21,7 @@
 #define KSTANDARDITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemlistwidget.h>
+#include "kitemviews/kitemlistwidget.h"
 
 #include <QPixmap>
 #include <QPointF>
diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h
index 288b5b84f7..6685a2038f 100644
--- a/src/kitemviews/kstandarditemmodel.h
+++ b/src/kitemviews/kstandarditemmodel.h
@@ -21,7 +21,8 @@
 #define KSTANDARDITEMMODEL_H
 
 #include "dolphin_export.h"
-#include <kitemviews/kitemmodelbase.h>
+#include "kitemviews/kitemmodelbase.h"
+
 #include <QHash>
 #include <QList>
 
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 182428db5f..bbd0927f21 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -20,16 +20,15 @@
 
 #include "kbaloorolesprovider.h"
 
-#include <QDebug>
-#include <KLocalizedString>
-
 #include <Baloo/File>
 #include <KFileMetaData/PropertyInfo>
 #include <KFileMetaData/UserMetaData>
 #include <KFormat>
+#include <KLocalizedString>
 
-#include <QTime>
 #include <QCollator>
+#include <QDebug>
+#include <QTime>
 
 struct KBalooRolesProviderSingleton
 {
diff --git a/src/kitemviews/private/kbaloorolesprovider.h b/src/kitemviews/private/kbaloorolesprovider.h
index 6fef98edee..64b1a5c827 100644
--- a/src/kitemviews/private/kbaloorolesprovider.h
+++ b/src/kitemviews/private/kbaloorolesprovider.h
@@ -26,6 +26,7 @@
 #include <QHash>
 #include <QSet>
 #include <QVariant>
+
 namespace Baloo {
     class File;
 }
diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp
index 2c33edd411..977a83d5dd 100644
--- a/src/kitemviews/private/kdirectorycontentscounter.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounter.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 
 #include "kdirectorycontentscounter.h"
-
-#include <kitemviews/kfileitemmodel.h>
+#include "kitemviews/kfileitemmodel.h"
 
 #include <KDirWatch>
+
 #include <QThread>
 
 KDirectoryContentsCounter::KDirectoryContentsCounter(KFileItemModel* model, QObject* parent) :
diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h
index 977765ab72..349860757a 100644
--- a/src/kitemviews/private/kdirectorycontentscounter.h
+++ b/src/kitemviews/private/kdirectorycontentscounter.h
@@ -23,8 +23,8 @@
 
 #include "kdirectorycontentscounterworker.h"
 
-#include <QSet>
 #include <QQueue>
+#include <QSet>
 
 class KDirWatch;
 class KFileItemModel;
diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index 31e6c61986..2bc96a0fac 100644
--- a/src/kitemviews/private/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -19,10 +19,11 @@
 
 #include "kfileitemclipboard.h"
 
+#include <KUrlMimeData>
+
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
-#include <KUrlMimeData>
 
 class KFileItemClipboardSingleton
 {
diff --git a/src/kitemviews/private/kfileitemclipboard.h b/src/kitemviews/private/kfileitemclipboard.h
index 5b5ab1eec6..9a727ab9fa 100644
--- a/src/kitemviews/private/kfileitemclipboard.h
+++ b/src/kitemviews/private/kfileitemclipboard.h
@@ -20,13 +20,13 @@
 #ifndef KFILEITEMCLIPBOARD_H
 #define KFILEITEMCLIPBOARD_H
 
-#include <QUrl>
-#include <QList>
-#include <QSet>
-#include <QObject>
-
 #include "dolphin_export.h"
 
+#include <QList>
+#include <QObject>
+#include <QSet>
+#include <QUrl>
+
 /**
  * @brief Wrapper for QClipboard to provide fast access for checking
  *        whether a KFileItem has been clipped.
diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp
index eeeba11b26..c690e9fdf3 100644
--- a/src/kitemviews/private/kfileitemmodeldirlister.cpp
+++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "kfileitemmodeldirlister.h"
+
 #include <KLocalizedString>
 #include <KIO/Job>
 
diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h
index b3f85c8da3..72466d508c 100644
--- a/src/kitemviews/private/kfileitemmodeldirlister.h
+++ b/src/kitemviews/private/kfileitemmodeldirlister.h
@@ -21,7 +21,9 @@
 #define KFILEITEMMODELDIRLISTER_H
 
 #include "dolphin_export.h"
+
 #include <KDirLister>
+
 #include <QUrl>
 
 /**
diff --git a/src/kitemviews/private/kfileitemmodelfilter.h b/src/kitemviews/private/kfileitemmodelfilter.h
index 67c1c280cd..f9f588aba2 100644
--- a/src/kitemviews/private/kfileitemmodelfilter.h
+++ b/src/kitemviews/private/kfileitemmodelfilter.h
@@ -22,6 +22,7 @@
 #define KFILEITEMMODELFILTER_H
 
 #include "dolphin_export.h"
+
 #include <QStringList>
 
 class KFileItem;
diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index 4092ec523e..a994f69c83 100644
--- a/src/kitemviews/private/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistheaderwidget.h"
-
-#include <kitemviews/kitemmodelbase.h>
+#include "kitemviews/kitemmodelbase.h"
 
 #include <QApplication>
 #include <QGraphicsSceneHoverEvent>
diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h
index 193f2b34ed..350588f005 100644
--- a/src/kitemviews/private/kitemlistheaderwidget.h
+++ b/src/kitemviews/private/kitemlistheaderwidget.h
@@ -21,6 +21,7 @@
 #define KITEMLISTHEADERWIDGET_H
 
 #include "dolphin_export.h"
+
 #include <QGraphicsWidget>
 #include <QHash>
 #include <QList>
diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
index f9d77d0b1a..016907da67 100644
--- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
+++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
@@ -25,9 +25,9 @@
 
 #include "dolphin_export.h"
 
+#include <QElapsedTimer>
 #include <QObject>
 #include <QString>
-#include <QElapsedTimer>
 
 /**
  * @brief Controls the keyboard searching ability for a KItemListController.
diff --git a/src/kitemviews/private/kitemlistrubberband.h b/src/kitemviews/private/kitemlistrubberband.h
index eaef591733..7d24857a92 100644
--- a/src/kitemviews/private/kitemlistrubberband.h
+++ b/src/kitemviews/private/kitemlistrubberband.h
@@ -21,6 +21,7 @@
 #define KITEMLISTRUBBERBAND_H
 
 #include "dolphin_export.h"
+
 #include <QObject>
 #include <QPointF>
 
diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index 25f97ee020..d6e434244c 100644
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -20,6 +20,7 @@
 #include "kitemlistselectiontoggle.h"
 
 #include <KIconLoader>
+
 #include <QPainter>
 
 
diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index 5c121c6670..4dee673966 100644
--- a/src/kitemviews/private/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistsizehintresolver.h"
-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"
 
 KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
     m_itemListView(itemListView),
diff --git a/src/kitemviews/private/kitemlistsizehintresolver.h b/src/kitemviews/private/kitemlistsizehintresolver.h
index b62c87a69b..96a9dd1bc7 100644
--- a/src/kitemviews/private/kitemlistsizehintresolver.h
+++ b/src/kitemviews/private/kitemlistsizehintresolver.h
@@ -21,8 +21,8 @@
 #define KITEMLISTSIZEHINTRESOLVER_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemmodelbase.h"
 
-#include <kitemviews/kitemmodelbase.h>
 #include <QSizeF>
 #include <QVector>
 
diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index f1f6145c45..4f6fd3015c 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -22,8 +22,8 @@
 #include <QApplication>
 #include <QPropertyAnimation>
 #include <QScrollBar>
-#include <QWheelEvent>
 #include <QStyle>
+#include <QWheelEvent>
 
 KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
                                                  QObject* parent) :
diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
index 7c6782b7a2..ccc387529b 100644
--- a/src/kitemviews/private/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistviewanimation.h"
-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"
 
 #include <QPropertyAnimation>
 
diff --git a/src/kitemviews/private/kitemlistviewlayouter.cpp b/src/kitemviews/private/kitemlistviewlayouter.cpp
index ca39426446..c765cdcfe9 100644
--- a/src/kitemviews/private/kitemlistviewlayouter.cpp
+++ b/src/kitemviews/private/kitemlistviewlayouter.cpp
@@ -17,12 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistviewlayouter.h"
-
-#include <kitemviews/kitemmodelbase.h>
-#include "kitemlistsizehintresolver.h"
-
 #include "dolphindebug.h"
+#include "kitemlistsizehintresolver.h"
+#include "kitemlistviewlayouter.h"
+#include "kitemviews/kitemmodelbase.h"
 
 // #define KITEMLISTVIEWLAYOUTER_DEBUG
 
diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 3bf11483b8..402fccfdec 100644
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -34,9 +34,9 @@
 
 #include "kpixmapmodifier.h"
 
+#include <QGuiApplication>
 #include <QImage>
 #include <QPainter>
-#include <QGuiApplication>
 
 static const quint32 stackBlur8Mul[255] =
 {
diff --git a/src/main.cpp b/src/main.cpp
index e05c67d96a..db52e11be8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,21 +19,22 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "dolphin_version.h"
-#include "dolphinmainwindow.h"
-#include "dolphin_generalsettings.h"
 #include "dbusinterface.h"
-#include "global.h"
+#include "dolphin_generalsettings.h"
+#include "dolphin_version.h"
 #include "dolphindebug.h"
+#include "dolphinmainwindow.h"
+#include "global.h"
 
-#include <KDBusService>
 #include <KAboutData>
 #include <KCrash>
-#include <QCommandLineParser>
-#include <QApplication>
+#include <KDBusService>
 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 
+#include <QApplication>
+#include <QCommandLineParser>
+
 #ifndef Q_OS_WIN
 #include <unistd.h>
 #endif
diff --git a/src/panels/folders/foldersitemlistwidget.h b/src/panels/folders/foldersitemlistwidget.h
index 5a4595c4a9..ef4cf7242f 100644
--- a/src/panels/folders/foldersitemlistwidget.h
+++ b/src/panels/folders/foldersitemlistwidget.h
@@ -20,7 +20,7 @@
 #ifndef FOLDERSITEMLISTWIDGET_H
 #define FOLDERSITEMLISTWIDGET_H
 
-#include <kitemviews/kfileitemlistwidget.h>
+#include "kitemviews/kfileitemlistwidget.h"
 
 /**
  * @brief Extends KFileItemListWidget to use the right text color.
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index e455780e02..61417dc5ee 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -21,15 +21,16 @@
 
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
-#include "treeviewcontextmenu.h"
 #include "foldersitemlistwidget.h"
-
-#include <views/renamedialog.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kfileitemmodel.h>
+#include "global.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistselectionmanager.h"
+#include "treeviewcontextmenu.h"
+#include "views/draganddrophelper.h"
+#include "views/renamedialog.h"
 
 #include <KJobWidgets>
 #include <KJobUiDelegate>
@@ -44,10 +45,6 @@
 #include <QPropertyAnimation>
 #include <QTimer>
 
-#include <views/draganddrophelper.h>
-
-#include "global.h"
-
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
     m_updateCurrentItem(false),
diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index f67c19cbba..5b9dc3b15f 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -20,8 +20,9 @@
 #ifndef FOLDERSPANEL_H
 #define FOLDERSPANEL_H
 
+#include "panels/panel.h"
+
 #include <QUrl>
-#include <panels/panel.h>
 
 class KFileItemModel;
 class KItemListController;
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 99802ed18c..bf97c6d8fc 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -20,28 +20,28 @@
 
 #include "treeviewcontextmenu.h"
 
+#include "folderspanel.h"
+#include "global.h"
+
+#include <KConfigGroup>
+#include <KFileItemListProperties>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
-#include <KIO/JobUiDelegate>
-#include <QMenu>
-#include <KJobWidgets>
-#include <KSharedConfig>
-#include <KConfigGroup>
-#include <KUrlMimeData>
-#include <KFileItemListProperties>
-#include <KLocalizedString>
-#include <KIO/PasteJob>
-#include <KIO/Paste>
 #include <KIO/FileUndoManager>
+#include <KIO/JobUiDelegate>
+#include <KIO/Paste>
+#include <KIO/PasteJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
 #include <KPropertiesDialog>
-
-#include "folderspanel.h"
+#include <KSharedConfig>
+#include <KUrlMimeData>
 
 #include <QApplication>
 #include <QClipboard>
+#include <QMenu>
 #include <QMimeData>
 #include <QPointer>
-#include "global.h"
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index 3e61c49412..a9491fb5c5 100644
--- a/src/panels/folders/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
@@ -20,9 +20,10 @@
 #ifndef TREEVIEWCONTEXTMENU_H
 #define TREEVIEWCONTEXTMENU_H
 
-#include <QObject>
 #include <KFileItem>
 
+#include <QObject>
+
 class QMimeData;
 class FoldersPanel;
 
diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index f33ad7a025..3b3789175b 100644
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -24,14 +24,15 @@
 #else
 #include <Baloo/FileMetaDataConfigWidget>
 #endif
-#include <KSharedConfig>
-#include <KLocalizedString>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <KConfigGroup>
+#include <KLocalizedString>
+#include <KSharedConfig>
 #include <KWindowConfig>
+
 #include <QDialogButtonBox>
+#include <QLabel>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) :
     QDialog(parent),
diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h
index 912fadadc0..cf3e952cb9 100644
--- a/src/panels/information/filemetadataconfigurationdialog.h
+++ b/src/panels/information/filemetadataconfigurationdialog.h
@@ -20,13 +20,14 @@
 #ifndef FILEMETADATACONFIGURATIONDIALOG_H
 #define FILEMETADATACONFIGURATIONDIALOG_H
 
-#include <QDialog>
 #include <KFileItem>
 #include <config-baloo.h>
-
 #ifndef HAVE_BALOO
 class KFileMetaDataConfigurationWidget;
 #else
+
+#include <QDialog>
+
 namespace Baloo {
     class FileMetaDataConfigWidget;
 }
diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index ac987c9b44..042849b251 100644
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -20,10 +20,12 @@
 #include "informationpanel.h"
 
 #include "informationpanelcontent.h"
+
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 #include <KDirNotify>
+
 #include <QApplication>
 #include <QShowEvent>
 #include <QVBoxLayout>
diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h
index 89a1bc3d24..6bb5862d69 100644
--- a/src/panels/information/informationpanel.h
+++ b/src/panels/information/informationpanel.h
@@ -20,8 +20,10 @@
 #ifndef INFORMATIONPANEL_H
 #define INFORMATIONPANEL_H
 
-#include <panels/panel.h>
+#include "panels/panel.h"
+
 #include <KFileItem>
+
 class InformationPanelContent;
 namespace KIO
 {
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 7507d54fb6..f44a3feb76 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -21,14 +21,15 @@
 
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
-#include <KJobWidgets>
 #include <KIconEffect>
 #include <KIconLoader>
-#include <QIcon>
+#include <KJobWidgets>
 #include <KLocalizedString>
-#include <QMenu>
 #include <KSeparator>
 #include <KStringHandler>
+
+#include <QIcon>
+#include <QMenu>
 #include <QTextDocument>
 
 #ifndef HAVE_BALOO
diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index a6c2b56228..80f3c8e22a 100644
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -20,12 +20,11 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
+#include <KFileItem>
 #include <config-baloo.h>
 
-#include <KFileItem>
-
-#include <QUrl>
 #include <QPointer>
+#include <QUrl>
 #include <QWidget>
 
 class KFileItemList;
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 94523c40dc..fed6b0ee28 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,19 +20,16 @@
 
 #include "phononwidget.h"
 
+#include <KIconLoader>
+#include <KLocalizedString>
 #include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
-#pragma GCC diagnostic push                          // Phonon doesn't use C++11 compiler by default, so override
-#pragma GCC diagnostic ignored "-Wsuggest-override"  // specifier is not available. Remove this pragmas after fixing it.
 #include <Phonon/VideoWidget>
-#pragma GCC diagnostic pop
 
-#include <QVBoxLayout>
 #include <QShowEvent>
 #include <QToolButton>
-#include <KIconLoader>
-#include <KLocalizedString>
+#include <QVBoxLayout>
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
index eff613bd96..971e8c7312 100644
--- a/src/panels/information/phononwidget.h
+++ b/src/panels/information/phononwidget.h
@@ -21,12 +21,12 @@
 #ifndef PHONONWIDGET_H
 #define PHONONWIDGET_H
 
-#include <QUrl>
-#include <QSize>
-#include <QWidget>
-
 #include <Phonon/Global>
 
+#include <QSize>
+#include <QUrl>
+#include <QWidget>
+
 namespace Phonon
 {
     class AudioOutput;
diff --git a/src/panels/information/pixmapviewer.h b/src/panels/information/pixmapviewer.h
index f6b456ee62..46e5cf5fc7 100644
--- a/src/panels/information/pixmapviewer.h
+++ b/src/panels/information/pixmapviewer.h
@@ -20,10 +20,10 @@
 #ifndef PIXMAPVIEWER_H
 #define PIXMAPVIEWER_H
 
-#include <QWidget>
 #include <QPixmap>
 #include <QQueue>
 #include <QTimeLine>
+#include <QWidget>
 
 class QPaintEvent;
 
diff --git a/src/panels/panel.h b/src/panels/panel.h
index 84d73e74c0..ec3405ad25 100644
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -21,8 +21,8 @@
 #ifndef PANEL_H
 #define PANEL_H
 
-#include <QWidget>
 #include <QUrl>
+#include <QWidget>
 
 /**
  * @brief Base widget for all panels that can be docked on the window borders.
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index a1e4611a57..20c19e1520 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -23,9 +23,10 @@
 #include "placesitem.h"
 
 #include "dolphindebug.h"
+#include "placesitemsignalhandler.h"
+
 #include <KDirLister>
 #include <KLocalizedString>
-#include "placesitemsignalhandler.h"
 #include <Solid/Block>
 
 PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h
index 733265d468..680590dcd4 100644
--- a/src/panels/places/placesitem.h
+++ b/src/panels/places/placesitem.h
@@ -20,15 +20,18 @@
 #ifndef PLACESITEM_H
 #define PLACESITEM_H
 
+#include "kitemviews/kstandarditem.h"
+
 #include <KBookmark>
-#include <kitemviews/kstandarditem.h>
-#include <QUrl>
-#include <QPointer>
 #include <Solid/Device>
 #include <Solid/OpticalDisc>
+#include <Solid/PortableMediaPlayer>
 #include <Solid/StorageAccess>
 #include <Solid/StorageVolume>
-#include <Solid/PortableMediaPlayer>
+
+#include <QPointer>
+#include <QUrl>
+
 
 class KDirLister;
 class PlacesItemSignalHandler;
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 9722eb5866..289b511afd 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -23,18 +23,20 @@
 
 #include "placesitemeditdialog.h"
 
-#include <KAboutData>
 #include "dolphindebug.h"
+
+#include <KAboutData>
 #include <KFile>
 #include <KIconButton>
 #include <KLocalizedString>
-#include <QMimeDatabase>
 #include <KUrlRequester>
+
 #include <QCheckBox>
+#include <QDialogButtonBox>
 #include <QEvent>
 #include <QFormLayout>
-#include <QDialogButtonBox>
 #include <QLineEdit>
+#include <QMimeDatabase>
 
 PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
     QDialog(parent),
diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h
index 7276622416..ef14b5c9d2 100644
--- a/src/panels/places/placesitemlistgroupheader.h
+++ b/src/panels/places/placesitemlistgroupheader.h
@@ -20,7 +20,7 @@
 #ifndef PLACESITEMLISTGROUPHEADER_H
 #define PLACESITEMLISTGROUPHEADER_H
 
-#include <kitemviews/kstandarditemlistgroupheader.h>
+#include "kitemviews/kstandarditemlistgroupheader.h"
 
 class PlacesItemListGroupHeader : public KStandardItemListGroupHeader
 {
diff --git a/src/panels/places/placesitemlistwidget.h b/src/panels/places/placesitemlistwidget.h
index 3be5dde7cf..ab78564c3d 100644
--- a/src/panels/places/placesitemlistwidget.h
+++ b/src/panels/places/placesitemlistwidget.h
@@ -20,7 +20,7 @@
 #ifndef PLACESITEMLISTWIDGET_H
 #define PLACESITEMLISTWIDGET_H
 
-#include <kitemviews/kstandarditemlistwidget.h>
+#include "kitemviews/kstandarditemlistwidget.h"
 
 /**
  * @brief Extends KStandardItemListWidget to interpret the hidden
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 76b22f1fd8..207a982713 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -22,25 +22,24 @@
  ***************************************************************************/
 
 #include "placesitemmodel.h"
-#include "placesitemsignalhandler.h"
 
 #include "dolphin_generalsettings.h"
-
 #include "dolphindebug.h"
-#include <QIcon>
-#include <KLocalizedString>
-#include <KAboutData>
 #include "placesitem.h"
-#include <QAction>
-#include <QMimeData>
-#include <QTimer>
-#include <KUrlMimeData>
+#include "placesitemsignalhandler.h"
+#include "views/dolphinview.h"
+#include "views/viewproperties.h"
 
+#include <KAboutData>
+#include <KLocalizedString>
+#include <KUrlMimeData>
 #include <Solid/DeviceNotifier>
 #include <Solid/OpticalDrive>
 
-#include <views/dolphinview.h>
-#include <views/viewproperties.h>
+#include <QAction>
+#include <QIcon>
+#include <QMimeData>
+#include <QTimer>
 
 namespace {
     // A suffix to the application-name of the stored bookmarks is
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index a1b23b2201..1aa31facdc 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -20,15 +20,16 @@
 #ifndef PLACESITEMMODEL_H
 #define PLACESITEMMODEL_H
 
-#include <kitemviews/kstandarditemmodel.h>
-#include <KFilePlacesModel>
+#include "kitemviews/kstandarditemmodel.h"
+
+#include <KFilePlacesModel>
+#include <Solid/Predicate>
+#include <Solid/StorageAccess>
 
-#include <QUrl>
 #include <QHash>
 #include <QList>
 #include <QSet>
-#include <Solid/Predicate>
-#include <Solid/StorageAccess>
+#include <QUrl>
 
 class KBookmark;
 class KBookmarkManager;
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index e2bdeaafa2..29acd034c7 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -24,34 +24,35 @@
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"
-
 #include "global.h"
-#include <KFileItem>
-#include <KDirNotify>
-#include <QIcon>
-#include <KIO/Job>
-#include <KIO/DropJob>
-#include <KIO/EmptyTrashJob>
-#include <KIO/JobUiDelegate>
-#include <KFilePlacesModel>
-#include <KJobWidgets>
-#include <KLocalizedString>
-#include <KIconLoader>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kstandarditem.h>
-#include <QMenu>
-#include <KMessageBox>
-#include <KNotification>
 #include "placesitem.h"
 #include "placesitemeditdialog.h"
 #include "placesitemlistgroupheader.h"
 #include "placesitemlistwidget.h"
 #include "placesitemmodel.h"
 #include "placesview.h"
-#include <views/draganddrophelper.h>
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistselectionmanager.h"
+#include "kitemviews/kstandarditem.h"
+#include "views/draganddrophelper.h"
+
+#include <KDirNotify>
+#include <KFileItem>
+#include <KFilePlacesModel>
+#include <KIO/DropJob>
+#include <KIO/EmptyTrashJob>
+#include <KIO/Job>
+#include <KIO/JobUiDelegate>
+#include <KIconLoader>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KNotification>
+
 #include <QGraphicsSceneDragDropEvent>
+#include <QIcon>
+#include <QMenu>
 #include <QVBoxLayout>
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 444785888e..7159357f8c 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -21,9 +21,10 @@
 #ifndef PLACESPANEL_H
 #define PLACESPANEL_H
 
-#include <QUrl>
+#include "panels/panel.h"
+
 #include <QMimeData>
-#include <panels/panel.h>
+#include <QUrl>
 
 class KItemListController;
 class PlacesItem;
diff --git a/src/panels/places/placesview.h b/src/panels/places/placesview.h
index ba71935256..ffafa30b7e 100644
--- a/src/panels/places/placesview.h
+++ b/src/panels/places/placesview.h
@@ -20,7 +20,7 @@
 #ifndef PLACESVIEW_H
 #define PLACESVIEW_H
 
-#include <kitemviews/kstandarditemlistview.h>
+#include "kitemviews/kstandarditemlistview.h"
 
 /**
  * @brief View class for the Places Panel.
diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 7bd811b381..4f77f6136c 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -19,17 +19,15 @@
 
 #include "terminalpanel.h"
 
-#include <signal.h>
-
-#include <KPluginLoader>
-#include <KPluginFactory>
-#include <KService>
-#include <kde_terminal_interface.h>
-#include <KParts/ReadOnlyPart>
-#include <KShell>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
+#include <KParts/ReadOnlyPart>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KService>
+#include <KShell>
+#include <kde_terminal_interface.h>
 
 #include <QDir>
 #include <QShowEvent>
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index b078b76e37..b36f24142f 100644
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -20,7 +20,7 @@
 #ifndef TERMINALPANEL_H
 #define TERMINALPANEL_H
 
-#include <panels/panel.h>
+#include "panels/panel.h"
 
 #include <QQueue>
 
diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index 21a45cd9b8..7c0e97f86c 100644
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -20,11 +20,12 @@
 #include "dolphinfacetswidget.h"
 
 #include <KLocalizedString>
+
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDate>
-#include <QRadioButton>
 #include <QHBoxLayout>
+#include <QRadioButton>
 
 DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     QWidget(parent),
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 6cae37e197..12f0c21384 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -21,31 +21,29 @@
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
+#include "panels/places/placesitemmodel.h"
 
-#include <panels/places/placesitemmodel.h>
-
-#include <QIcon>
-#include <QLineEdit>
 #include <KLocalizedString>
-#include <KSeparator>
 #include <KNS3/KMoreToolsMenuFactory>
+#include <KSeparator>
+#include <config-baloo.h>
+#ifdef HAVE_BALOO
+#include <Baloo/Query>
+#include <Baloo/IndexerConfig>
+#endif
 
 #include <QButtonGroup>
 #include <QDir>
+#include <QFontDatabase>
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QLabel>
+#include <QLineEdit>
 #include <QScrollArea>
 #include <QTimer>
 #include <QToolButton>
 #include <QUrlQuery>
 
-#include <config-baloo.h>
-#ifdef HAVE_BALOO
-    #include <Baloo/Query>
-    #include <Baloo/IndexerConfig>
-#endif
-#include <QFontDatabase>
-
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_startedSearching(false),
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 6b838fc187..535aa944b9 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,19 +19,19 @@
 
 #include "additionalinfodialog.h"
 
+#include "kitemviews/kfileitemmodel.h"
+
+#include <KConfigGroup>
+#include <KLocalizedString>
+#include <KSharedConfig>
+#include <KWindowConfig>
 #include <config-baloo.h>
 
-#include <KSharedConfig>
-#include <KLocalizedString>
-#include "kitemviews/kfileitemmodel.h"
-#include <KConfigGroup>
-#include <KWindowConfig>
-
 #include <QCheckBox>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QDialogButtonBox>
+#include <QLabel>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>
diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h
index 2a4cd7dbaa..d6bf1e08c5 100644
--- a/src/settings/additionalinfodialog.h
+++ b/src/settings/additionalinfodialog.h
@@ -24,7 +24,6 @@
 #include <QList>
 #include <QListWidget>
 
-
 /**
  * @brief Dialog for changing the additional information shown in the view.
  */
diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 59f8c8eee6..b274bb8fbf 100644
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -21,7 +21,8 @@
  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
-#include <views/viewproperties.h>
+
+#include "views/viewproperties.h"
 
 ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir,
                                      const ViewProperties& viewProps) :
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index aeb4a60c6d..c41f30965a 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -24,6 +24,7 @@
 #define APPLYVIEWPROPSJOB_H
 
 #include <KIO/Job>
+
 #include <QUrl>
 
 class ViewProperties;
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index ffed870f17..5c0d43d836 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -20,18 +20,18 @@
 
 #include "dolphinsettingsdialog.h"
 
-#include <dolphinmainwindow.h>
 #include "dolphin_generalsettings.h"
+#include "dolphinmainwindow.h"
 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"
 #include "services/servicessettingspage.h"
 #include "startup/startupsettingspage.h"
-#include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
+#include "viewmodes/viewsettingspage.h"
 
 #include <KAuthorized>
-#include <KWindowConfig>
 #include <KLocalizedString>
+#include <KWindowConfig>
 
 #include <QPushButton>
 
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index fb3f77ebaa..ba8d0549c7 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -20,6 +20,8 @@
 
 #include "behaviorsettingspage.h"
 
+#include "views/viewproperties.h"
+
 #include <KLocalizedString>
 
 #include <QCheckBox>
@@ -27,8 +29,6 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
-#include <views/viewproperties.h>
-
 BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 16a3e95c2e..779fae3770 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -20,9 +20,10 @@
 #ifndef BEHAVIORSETTINGSPAGE_H
 #define BEHAVIORSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
-#include <QUrl>
 #include "dolphin_generalsettings.h"
+#include "settings/settingspagebase.h"
+
+#include <QUrl>
 
 class QCheckBox;
 class QLabel;
diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp
index 6a4f3769af..60e814c13d 100644
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@@ -19,18 +19,18 @@
 
 #include "configurepreviewplugindialog.h"
 
-#include <KPluginLoader>
-#include <KLocalizedString>
-#include <KJobWidgets>
-#include <KIO/JobUiDelegate>
 #include <KIO/DeleteJob>
+#include <KIO/JobUiDelegate>
 #include <KIO/ThumbCreator>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KPluginLoader>
 
-#include <QUrl>
-#include <QVBoxLayout>
-#include <QStandardPaths>
 #include <QDialogButtonBox>
 #include <QPushButton>
+#include <QStandardPaths>
+#include <QUrl>
+#include <QVBoxLayout>
 
 ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& pluginName,
                                                            const QString& desktopEntryName,
diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 39a7058212..728d082d29 100644
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "confirmationssettingspage.h"
 
-#include <dolphin_generalsettings.h>
+#include "dolphin_generalsettings.h"
 
 #include <KLocalizedString>
 
diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index 1aa7be700e..4cdb32b200 100644
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -19,7 +19,7 @@
 #ifndef CONFIRMATIONSSETTINGSPAGE_H
 #define CONFIRMATIONSSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QCheckBox;
 
diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index a68fc933b1..1324e9e93b 100644
--- a/src/settings/general/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
@@ -20,8 +20,9 @@
 #ifndef GENERALSETTINGSPAGE_H
 #define GENERALSETTINGSPAGE_H
 
+#include "settings/settingspagebase.h"
+
 #include <QWidget>
-#include <settings/settingspagebase.h>
 
 class QUrl;
 class SettingsPageBase;
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 672bb722df..1d6e922c83 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -21,20 +21,19 @@
 
 #include "dolphin_generalsettings.h"
 #include "configurepreviewplugindialog.h"
+#include "settings/serviceitemdelegate.h"
+#include "settings/servicemodel.h"
 
+#include <KIO/PreviewJob>
 #include <KLocalizedString>
 #include <KServiceTypeTrader>
-#include <KIO/PreviewJob>
-
-#include <settings/serviceitemdelegate.h>
-#include <settings/servicemodel.h>
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListView>
 #include <QPainter>
-#include <QSpinBox>
 #include <QSortFilterProxyModel>
+#include <QSpinBox>
 
 // default settings
 namespace {
diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index 875c19dd65..9575237101 100644
--- a/src/settings/general/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
@@ -20,7 +20,7 @@
 #ifndef PREVIEWSSETTINGSPAGE_H
 #define PREVIEWSSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QSpinBox;
 class QListView;
diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 85195cb637..58c570f9da 100644
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "statusbarsettingspage.h"
 
-#include <dolphin_generalsettings.h>
+#include "dolphin_generalsettings.h"
 
 #include <KLocalizedString>
 
diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h
index 3c0bd2b3c1..99e4bbe587 100644
--- a/src/settings/general/statusbarsettingspage.h
+++ b/src/settings/general/statusbarsettingspage.h
@@ -19,7 +19,7 @@
 #ifndef STATUSBARSETTINGSPAGE_H
 #define STATUSBARSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QCheckBox;
 
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 2ae88ffd79..bd1124adaf 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -19,16 +19,16 @@
 
 #include "kcmdolphingeneral.h"
 
+#include "settings/general/behaviorsettingspage.h"
+#include "settings/general/previewssettingspage.h"
+#include "settings/general/confirmationssettingspage.h"
+
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
 
-#include <settings/general/behaviorsettingspage.h>
-#include <settings/general/previewssettingspage.h>
-#include <settings/general/confirmationssettingspage.h>
-
-#include <QVBoxLayout>
 #include <QTabWidget>
+#include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>(QStringLiteral("dolphingeneral"));)
 
diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h
index 66e42009f8..c542c01395 100644
--- a/src/settings/kcm/kcmdolphingeneral.h
+++ b/src/settings/kcm/kcmdolphingeneral.h
@@ -21,6 +21,7 @@
 #define KCMDOLPHINGENERAL_H
 
 #include <kcmodule.h>
+
 #include <QList>
 
 class SettingsPageBase;
diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 54cf7ed3c0..bbc07365dd 100644
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,11 +19,11 @@
 
 #include "kcmdolphinnavigation.h"
 
+#include "settings/navigation/navigationsettingspage.h"
+
 #include <KPluginFactory>
 #include <KPluginLoader>
 
-#include <settings/navigation/navigationsettingspage.h>
-
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>(QStringLiteral("dolphinnavigation"));)
diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 5d011c6273..202bc5cf5d 100644
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -19,11 +19,11 @@
 
 #include "kcmdolphinservices.h"
 
+#include "settings/services/servicessettingspage.h"
+
 #include <KPluginFactory>
 #include <KPluginLoader>
 
-#include <settings/services/servicessettingspage.h>
-
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>(QStringLiteral("dolphinservices"));)
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 71364bf5cb..8b04baeb69 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -19,17 +19,17 @@
 
 #include "kcmdolphinviewmodes.h"
 
+#include "settings/viewmodes/viewsettingstab.h"
+
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
-#include <QIcon>
-
-#include <settings/viewmodes/viewsettingstab.h>
 
 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QVBoxLayout>
+#include <QIcon>
 #include <QTabWidget>
+#include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin<DolphinViewModesConfigModule>(QStringLiteral("dolphinviewmodes"));)
 
diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 188fe51f1e..d7dd4de22f 100644
--- a/src/settings/navigation/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
@@ -19,7 +19,7 @@
 #ifndef NAVIGATIONSETTINGSPAGE_H
 #define NAVIGATIONSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QCheckBox;
 
diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index 3350061b64..0f20304845 100644
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -19,13 +19,12 @@
 
 #include "serviceitemdelegate.h"
 
-#include <QPushButton>
-
 #include "servicemodel.h"
 
 #include <QAbstractItemView>
 #include <QCheckBox>
 #include <QPainter>
+#include <QPushButton>
 
 ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent) :
     KWidgetItemDelegate(itemView, parent)
diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index 63f0c323b4..45acccd9fd 100644
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -21,19 +21,17 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_versioncontrolsettings.h"
+#include "settings/serviceitemdelegate.h"
+#include "settings/servicemodel.h"
 
 #include <KDesktopFile>
-#include <kdesktopfileactions.h>
-#include <QIcon>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KNS3/Button>
 #include <KPluginMetaData>
 #include <KService>
 #include <KServiceTypeTrader>
-
-#include <settings/serviceitemdelegate.h>
-#include <settings/servicemodel.h>
+#include <kdesktopfileactions.h>
 
 #include <QGridLayout>
 #include <QLabel>
diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index bcbce19180..cd4cbe52fc 100644
--- a/src/settings/services/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
@@ -19,7 +19,7 @@
 #ifndef SERVICESSETTINGSPAGE_H
 #define SERVICESSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 #include <QString>
 
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 3e1fe7c4ee..4071ee04f5 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -19,22 +19,21 @@
 
 #include "startupsettingspage.h"
 
-#include "global.h"
+#include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
-
-#include "dolphin_generalsettings.h"
+#include "global.h"
 
 #include <KLocalizedString>
-#include <QLineEdit>
 #include <KMessageBox>
 
-#include <QVBoxLayout>
 #include <QCheckBox>
+#include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLineEdit>
 #include <QPushButton>
-#include <QFileDialog>
+#include <QVBoxLayout>
 
 StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index da278e3715..e06b65697f 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -19,7 +19,8 @@
 #ifndef STARTUPSETTINGSPAGE_H
 #define STARTUPSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
+
 #include <QUrl>
 
 class QLineEdit;
diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h
index 6faf3f61e2..53ac5f5985 100644
--- a/src/settings/trash/trashsettingspage.h
+++ b/src/settings/trash/trashsettingspage.h
@@ -20,6 +20,7 @@
 #define TRASHSETTINGSPAGE_H
 
 #include "settings/settingspagebase.h"
+
 class KCModuleProxy;
 
 /**
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index c185fc55dc..0a9eb166c1 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -19,13 +19,13 @@
 
 #include "dolphinfontrequester.h"
 
-#include <KLocalizedString>
 #include <KComboBox>
+#include <KLocalizedString>
 
-#include <QHBoxLayout>
-#include <QPushButton>
 #include <QFontDatabase>
 #include <QFontDialog>
+#include <QHBoxLayout>
+#include <QPushButton>
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),
diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp
index 2191b76fe7..6625cfb81a 100644
--- a/src/settings/viewmodes/viewmodesettings.cpp
+++ b/src/settings/viewmodes/viewmodesettings.cpp
@@ -19,9 +19,9 @@
 
 #include "viewmodesettings.h"
 
-#include "dolphin_iconsmodesettings.h"
-#include "dolphin_detailsmodesettings.h"
 #include "dolphin_compactmodesettings.h"
+#include "dolphin_detailsmodesettings.h"
+#include "dolphin_iconsmodesettings.h"
 
 #define VIEWMODESETTINGS_SET_VALUE(mode, setValue, value) \
     switch (mode) { \
diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index ab87201e29..dd85a6159e 100644
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -20,14 +20,14 @@
 
 #include "viewsettingspage.h"
 
-#include <views/dolphinview.h>
+#include "views/dolphinview.h"
 #include "viewsettingstab.h"
 
-#include <QVBoxLayout>
-#include <QTabWidget>
-
 #include <KLocalizedString>
 
+#include <QTabWidget>
+#include <QVBoxLayout>
+
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_tabs()
diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h
index 2e456a867c..3350e1c86a 100644
--- a/src/settings/viewmodes/viewsettingspage.h
+++ b/src/settings/viewmodes/viewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef VIEWSETTINGSPAGE_H
 #define VIEWSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class ViewSettingsTab;
 class QWidget;
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index e79ac0f4c7..85af5b0836 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -19,22 +19,21 @@
 
 #include "viewsettingstab.h"
 
-#include "dolphinfontrequester.h"
 #include "dolphin_compactmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_iconsmodesettings.h"
+#include "dolphinfontrequester.h"
+#include "views/zoomlevelinfo.h"
 
 #include <KComboBox>
 #include <KLocalizedString>
 
+#include <QApplication>
 #include <QCheckBox>
 #include <QGroupBox>
+#include <QHelpEvent>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QHelpEvent>
-#include <QApplication>
-
-#include <views/zoomlevelinfo.h>
 
 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     QWidget(parent),
diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h
index 8b1ffc428d..0c1b8a3b54 100644
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -20,8 +20,9 @@
 #ifndef VIEWSETTINGSTAB_H
 #define VIEWSETTINGSTAB_H
 
+#include "settings/viewmodes/viewmodesettings.h"
+
 #include <QWidget>
-#include <settings/viewmodes/viewmodesettings.h>
 
 class DolphinFontRequester;
 class KComboBox;
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 4f005e0dae..dbbf5fa683 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,15 +21,15 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
-#include "kitemviews/kfileitemmodel.h"
-#include "views/dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
+#include "kitemviews/kfileitemmodel.h"
 #include "viewpropsprogressinfo.h"
+#include "views/dolphinview.h"
 
+#include <KComboBox>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KComboBox>
 #include <KWindowConfig>
 
 #include <QButtonGroup>
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index 471ac01d06..a6c0c6d584 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 
 #include "viewpropsprogressinfo.h"
-#include "applyviewpropsjob.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
-#include <QVBoxLayout>
-#include <QDialogButtonBox>
-#include <QPushButton>
+#include "applyviewpropsjob.h"
+#include "views/viewproperties.h"
 
 #include <KConfigGroup>
 #include <KLocalizedString>
 
-#include <views/viewproperties.h>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QTimer>
+#include <QVBoxLayout>
 
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
                                              const QUrl& dir,
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index e69de29762..05eafa6f5d 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -20,8 +20,9 @@
 #ifndef VIEWPROPSPROGRESSINFO_H
 #define VIEWPROPSPROGRESSINFO_H
 
-#include <QDialog>
 #include <kio/directorysizejob.h>
+
+#include <QDialog>
 #include <QUrl>
 
 class ApplyViewPropsJob;
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 14672dff07..34916830ea 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -20,25 +20,23 @@
 #include "dolphinstatusbar.h"
 
 #include "dolphin_generalsettings.h"
+#include "statusbarspaceinfo.h"
+#include "views/dolphinview.h"
+#include "views/zoomlevelinfo.h"
 
-#include <QIcon>
 #include <KLocalizedString>
 #include <KSqueezedTextLabel>
-#include <QMenu>
-
-#include "statusbarspaceinfo.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
+#include <QHelpEvent>
+#include <QIcon>
+#include <QMenu>
 #include <QProgressBar>
-#include <QToolButton>
-#include <QTimer>
 #include <QSlider>
 #include <QTextDocument>
-#include <QHelpEvent>
-
-#include <views/dolphinview.h>
-#include <views/zoomlevelinfo.h>
+#include <QTimer>
+#include <QToolButton>
 
 namespace {
     const int ResetToDefaultTimeout = 1000;
diff --git a/src/statusbar/mountpointobserver.cpp b/src/statusbar/mountpointobserver.cpp
index fa6472c0a7..0be0f71732 100644
--- a/src/statusbar/mountpointobserver.cpp
+++ b/src/statusbar/mountpointobserver.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "mountpointobserver.h"
+
 #include "mountpointobservercache.h"
 
 #include <KIO/FileSystemFreeSpaceJob>
diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
index 144d11fa7f..1e74caef47 100644
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -20,10 +20,10 @@
 #ifndef SPACEINFOOBSERVER_H
 #define SPACEINFOOBSERVER_H
 
-#include <QObject>
-
 #include <KIO/Job>
 
+#include <QObject>
+
 class QUrl;
 class MountPointObserver;
 
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index a8ba9db8b9..9b8d249fb9 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -22,12 +22,12 @@
 
 #include "spaceinfoobserver.h"
 
-#include <QMouseEvent>
-
 #include <KLocalizedString>
 #include <KNS3/KMoreToolsMenuFactory>
 #include <knewstuff_version.h>
 
+#include <QMouseEvent>
+
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),
     m_observer(nullptr)
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 87e9f776b4..4f36517aea 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -20,11 +20,10 @@
 #ifndef STATUSBARSPACEINFO_H
 #define STATUSBARSPACEINFO_H
 
-#include <QUrl>
-
-
 #include <KCapacityBar>
 
+#include <QUrl>
+
 class QHideEvent;
 class QShowEvent;
 class QMouseEvent;
diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index 197fe5591f..3a1572de9d 100644
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -19,10 +19,10 @@
 
 #include "dolphinfileitemlistwidget.h"
 
-#include <KIconLoader>
-
 #include "dolphindebug.h"
 
+#include <KIconLoader>
+
 DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant,
                                                      QGraphicsItem* parent) :
     KFileItemListWidget(informant, parent)
diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h
index a04bc68282..5c2d17eec5 100644
--- a/src/views/dolphinfileitemlistwidget.h
+++ b/src/views/dolphinfileitemlistwidget.h
@@ -21,8 +21,7 @@
 #define DOLPHINFILEITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kfileitemlistwidget.h>
+#include "kitemviews/kfileitemlistwidget.h"
 #include "versioncontrol/kversioncontrolplugin.h"
 
 /**
diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index be142205dc..0655b33080 100644
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -19,21 +19,18 @@
 
 #include "dolphinitemlistview.h"
 
+#include "dolphin_compactmodesettings.h"
+#include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "dolphin_detailsmodesettings.h"
-#include "dolphin_compactmodesettings.h"
 #include "dolphinfileitemlistwidget.h"
-
-#include <kitemviews/kfileitemmodel.h>
-#include <kitemviews/kitemlistcontroller.h>
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "views/viewmodecontroller.h"
+#include "zoomlevelinfo.h"
 
 #include <KIO/PreviewJob>
 
-#include <views/viewmodecontroller.h>
-
-#include "zoomlevelinfo.h"
-
 
 DolphinItemListView::DolphinItemListView(QGraphicsWidget* parent) :
     KFileItemListView(parent),
diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h
index ff14fbe7c4..b8e3ab7de6 100644
--- a/src/views/dolphinitemlistview.h
+++ b/src/views/dolphinitemlistview.h
@@ -20,10 +20,9 @@
 #ifndef DOLPHINITEMLISTVIEW_H
 #define DOLPHINITEMLISTVIEW_H
 
-#include <kitemviews/kfileitemlistview.h>
-#include <settings/viewmodes/viewmodesettings.h>
-
 #include "dolphin_export.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "settings/viewmodes/viewmodesettings.h"
 
 class KFileItemListView;
 
diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
index 2386bce1ee..6bb42ed824 100644
--- a/src/views/dolphinnewfilemenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -20,10 +20,10 @@
 #ifndef DOLPHINNEWFILEMENUOBSERVER_H
 #define DOLPHINNEWFILEMENUOBSERVER_H
 
-#include <QObject>
-
 #include "dolphin_export.h"
 
+#include <QObject>
+
 class DolphinNewFileMenu;
 
 /**
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index bdf747f084..269cc3085f 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -24,19 +24,21 @@
  */
 
 #include "dolphinremoteencoding.h"
-#include "dolphinviewactionhandler.h"
 
+#include "dolphinviewactionhandler.h"
 #include "dolphindebug.h"
-#include <KActionMenu>
+
 #include <KActionCollection>
-#include <KConfig>
+#include <KActionMenu>
 #include <KCharsets>
-#include <QMenu>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KIO/Scheduler>
+#include <KLocalizedString>
 #include <KProtocolInfo>
 #include <KProtocolManager>
-#include <KIO/Scheduler>
-#include <KConfigGroup>
-#include <KLocalizedString>
+
+#include <QMenu>
 
 #define DATA_KEY        QStringLiteral("Charset")
 
diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
index ca1cea2c7f..bcb0d79013 100644
--- a/src/views/dolphinremoteencoding.h
+++ b/src/views/dolphinremoteencoding.h
@@ -20,11 +20,11 @@
 #ifndef DOLPHINREMOTEENCODING_H
 #define DOLPHINREMOTEENCODING_H
 
-#include <QStringList>
-#include <QAction>
-#include <QUrl>
 #include "dolphin_export.h"
 
+#include <QAction>
+#include <QStringList>
+#include <QUrl>
 
 class KActionMenu;
 class DolphinViewActionHandler;
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 463ab51baf..acd66eb572 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -20,44 +20,17 @@
 
 #include "dolphinview.h"
 
-#include <QAbstractItemView>
-#include <QApplication>
-#include <QClipboard>
-#include <QDropEvent>
-#include <QGraphicsSceneDragDropEvent>
-#include <QTimer>
-#include <QScrollBar>
-#include <QPixmapCache>
-#include <QPointer>
-#include <QMenu>
-#include <QVBoxLayout>
-#include <KDesktopFile>
-#include <KProtocolManager>
-#include <KColorScheme>
-#include <KDirModel>
-#include <KFileItemListProperties>
-#include <KLocalizedString>
-#include <kitemviews/kfileitemmodel.h>
-#include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistheader.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <KIO/CopyJob>
-#include <KIO/DeleteJob>
-#include <KIO/JobUiDelegate>
-#include <KIO/PreviewJob>
-#include <KIO/DropJob>
-#include <KIO/PasteJob>
-#include <KIO/Paste>
-#include <KMessageBox>
-#include <KJobWidgets>
-
-#include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphinitemlistview.h"
+#include "dolphinnewfilemenuobserver.h"
 #include "draganddrophelper.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistheader.h"
+#include "kitemviews/kitemlistselectionmanager.h"
 #include "renamedialog.h"
 #include "versioncontrol/versioncontrolobserver.h"
 #include "viewproperties.h"
@@ -65,9 +38,36 @@
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_BALOO
-    #include <Baloo/IndexerConfig>
+#include <Baloo/IndexerConfig>
 #endif
+#include <KColorScheme>
+#include <KDesktopFile>
+#include <KDirModel>
+#include <KFileItemListProperties>
 #include <KFormat>
+#include <KIO/CopyJob>
+#include <KIO/DeleteJob>
+#include <KIO/DropJob>
+#include <KIO/JobUiDelegate>
+#include <KIO/Paste>
+#include <KIO/PasteJob>
+#include <KIO/PreviewJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KProtocolManager>
+
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QClipboard>
+#include <QDropEvent>
+#include <QGraphicsSceneDragDropEvent>
+#include <QMenu>
+#include <QPixmapCache>
+#include <QPointer>
+#include <QScrollBar>
+#include <QTimer>
+#include <QVBoxLayout>
 
 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 61f6af1e2f..ea1b9c0077 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -21,16 +21,16 @@
 #ifndef DOLPHINVIEW_H
 #define DOLPHINVIEW_H
 
-#include <config-baloo.h>
-
 #include "dolphin_export.h"
 
-#include <kparts/part.h>
 #include <KFileItem>
-#include <kio/fileundomanager.h>
 #include <KIO/Job>
-#include <QUrl>
+#include <config-baloo.h>
+#include <kio/fileundomanager.h>
+#include <kparts/part.h>
+
 #include <QMimeData>
+#include <QUrl>
 #include <QWidget>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 9fff160b25..2b3a241a3e 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -20,25 +20,23 @@
 
 #include "dolphinviewactionhandler.h"
 
+#include "dolphindebug.h"
+#include "kitemviews/kfileitemmodel.h"
 #include "settings/viewpropertiesdialog.h"
 #include "views/zoomlevelinfo.h"
 
-#include <QPointer>
-#include <QMenu>
-
+#ifdef HAVE_BALOO
+#include <Baloo/IndexerConfig>
+#endif
 #include <KActionCollection>
 #include <KActionMenu>
-#include <kitemviews/kfileitemmodel.h>
 #include <KLocalizedString>
 #include <KNewFileMenu>
 #include <KPropertiesDialog>
 #include <KProtocolManager>
 
-#include "dolphindebug.h"
-
-#ifdef HAVE_BALOO
-    #include <Baloo/IndexerConfig>
-#endif
+#include <QMenu>
+#include <QPointer>
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
     QObject(parent),
diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index eb375b5c9d..be22739178 100644
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -24,6 +24,7 @@
 
 #include "dolphin_export.h"
 #include "views/dolphinview.h"
+
 #include <QObject>
 
 class KToggleAction;
diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index bd4374ec3a..d437b877ea 100644
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -20,13 +20,13 @@
 
 #include "draganddrophelper.h"
 
-#include <QDBusMessage>
-#include <QDBusConnection>
-#include <QMimeData>
-
 #include <KIO/DropJob>
 #include <KJobWidgets>
 
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QMimeData>
+
 QHash<QUrl, bool> DragAndDropHelper::m_urlListMatchesUrlCache;
 
 bool DragAndDropHelper::urlListMatchesUrl(const QList<QUrl>& urls, const QUrl& destUrl)
diff --git a/src/views/draganddrophelper.h b/src/views/draganddrophelper.h
index 0c7eadc6cb..1a6b5900eb 100644
--- a/src/views/draganddrophelper.h
+++ b/src/views/draganddrophelper.h
@@ -22,10 +22,10 @@
 #define DRAGANDDROPHELPER_H
 
 #include "dolphin_export.h"
+
 #include <QList>
 #include <QUrl>
 
-
 class QDropEvent;
 class QWidget;
 namespace KIO { class DropJob; }
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 24b7986be9..44c0a5a7be 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -19,21 +19,21 @@
 
 #include "renamedialog.h"
 
-#include <KLocalizedString>
-#include <KJobWidgets>
+#include <KGuiItem>
+#include <KIO/BatchRenameJob>
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
 #include <KJobUiDelegate>
-#include <KIO/BatchRenameJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
 
+#include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMimeDatabase>
-#include <QDialogButtonBox>
-#include <QPushButton>
 #include <QLineEdit>
+#include <QMimeDatabase>
+#include <QPushButton>
 #include <QSpinBox>
-#include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     QDialog(parent),
diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index 8da770895f..5b04f857cf 100644
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -22,8 +22,9 @@
 
 #include "dolphin_export.h"
 
-#include <QDialog>
 #include <KFileItem>
+
+#include <QDialog>
 #include <QString>
 
 class QLineEdit;
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index fcf51a2407..1df6a66732 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -24,20 +24,19 @@
 #include <KColorScheme>
 #include <KSeparator>
 #include <KStringHandler>
-#include <QTextDocument>
-
-#include <QLabel>
-#include <QStyleOptionFrame>
-#include <QStylePainter>
-#include <QVBoxLayout>
-#include <QTextLayout>
-
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 #else
 #include <Baloo/FileMetaDataWidget>
 #endif
 
+#include <QLabel>
+#include <QStyleOptionFrame>
+#include <QStylePainter>
+#include <QTextDocument>
+#include <QTextLayout>
+#include <QVBoxLayout>
+
 DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
     QWidget(parent),
     m_preview(nullptr),
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h
index e7459b1972..1e2cfadb67 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.h
+++ b/src/views/tooltips/dolphinfilemetadatawidget.h
@@ -22,9 +22,10 @@
 #ifndef DOLPHINFILEMETADATAWIDGET_H
 #define DOLPHINFILEMETADATAWIDGET_H
 
-#include <QWidget>
 #include <config-baloo.h>
 
+#include <QWidget>
+
 class KFileItemList;
 class QLabel;
 
diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index 3d3598ff5f..19c87b0847 100644
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -20,7 +20,7 @@
 #include "tooltipmanager.h"
 
 #include "dolphinfilemetadatawidget.h"
-#include <QIcon>
+
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>
@@ -28,6 +28,7 @@
 
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QIcon>
 #include <QLayout>
 #include <QStyle>
 #include <QTimer>
diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h
index 746d6cb67d..f6d2b7304e 100644
--- a/src/views/tooltips/tooltipmanager.h
+++ b/src/views/tooltips/tooltipmanager.h
@@ -20,11 +20,11 @@
 #ifndef TOOLTIPMANAGER_H
 #define TOOLTIPMANAGER_H
 
+#include <KFileItem>
+
 #include <QObject>
 #include <QRect>
 
-#include <KFileItem>
-
 class DolphinFileMetaDataWidget;
 class KToolTipWidget;
 class QTimer;
diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index a3be381f3f..d59da515ba 100644
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -22,8 +22,9 @@
 
 #include <dolphinvcs_export.h>
 
-#include <QObject>
 #include <QAction>
+#include <QObject>
+
 class KFileItemList;
 class KFileItem;
 /**
diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h
index d33a64cc7f..92563faa57 100644
--- a/src/views/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -21,7 +21,7 @@
 #define UPDATEITEMSTATESTHREAD_H
 
 #include "dolphin_export.h"
-#include <views/versioncontrol/versioncontrolobserver.h>
+#include "views/versioncontrol/versioncontrolobserver.h"
 
 #include <QMutex>
 #include <QThread>
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 459bef0e9f..7295a245ae 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -20,14 +20,13 @@
 #include "versioncontrolobserver.h"
 
 #include "dolphin_versioncontrolsettings.h"
+#include "dolphindebug.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "updateitemstatesthread.h"
 
 #include <KLocalizedString>
 #include <KService>
-#include "dolphindebug.h"
 #include <KServiceTypeTrader>
-#include <kitemviews/kfileitemmodel.h>
-
-#include "updateitemstatesthread.h"
 
 #include <QTimer>
 
diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index 2c2fe2940c..ea0834e657 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -26,10 +26,10 @@
 
 #include <KFileItem>
 
-#include <QUrl>
 #include <QList>
 #include <QObject>
 #include <QString>
+#include <QUrl>
 
 class KFileItemList;
 class KFileItemModel;
diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h
index 6fa43c38b1..2cc5c6c916 100644
--- a/src/views/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -20,10 +20,11 @@
 #ifndef VIEWMODECONTROLLER_H
 #define VIEWMODECONTROLLER_H
 
-#include <QUrl>
-#include <QObject>
 #include "dolphin_export.h"
-#include <views/dolphinview.h>
+#include "views/dolphinview.h"
+
+#include <QObject>
+#include <QUrl>
 
 /**
  * @brief Allows the DolphinView to control the view implementations for the
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 4444f64e76..e5d636cd1e 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -22,7 +22,6 @@
 
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
-
 #include "dolphindebug.h"
 
 #include <QCryptographicHash>
diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h
index 05b80f4555..6a3f18e6bd 100644
--- a/src/views/viewproperties.h
+++ b/src/views/viewproperties.h
@@ -21,9 +21,10 @@
 #ifndef VIEWPROPERTIES_H
 #define VIEWPROPERTIES_H
 
-#include <views/dolphinview.h>
-#include <QUrl>
 #include "dolphin_export.h"
+#include "views/dolphinview.h"
+
+#include <QUrl>
 
 class ViewPropertySettings;
 /**
diff --git a/src/views/zoomlevelinfo.cpp b/src/views/zoomlevelinfo.cpp
index faca8fd5d7..d64974d294 100644
--- a/src/views/zoomlevelinfo.cpp
+++ b/src/views/zoomlevelinfo.cpp
@@ -18,7 +18,9 @@
  ***************************************************************************/
 
 #include "zoomlevelinfo.h"
+
 #include <KIconLoader>
+
 #include <QSize>
 
 int ZoomLevelInfo::minimumLevel()