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

36 files changed, 91 insertions, 89 deletions

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 6b838fc18..535aa944b 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,19 +19,19 @@
 
 #include "additionalinfodialog.h"
 
-#include <config-baloo.h>
-
-#include <KSharedConfig>
-#include <KLocalizedString>
 #include "kitemviews/kfileitemmodel.h"
+
 #include <KConfigGroup>
+#include <KLocalizedString>
+#include <KSharedConfig>
 #include <KWindowConfig>
+#include <config-baloo.h>
 
 #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 2a4cd7dba..d6bf1e08c 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 59f8c8eee..b274bb8fb 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 aeb4a60c6..c41f30965 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 ffed870f1..5c0d43d83 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 fb3f77eba..ba8d0549c 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 16a3e95c2..779fae377 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 6a4f3769a..60e814c13 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 39a705821..728d082d2 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 1aa7be700..4cdb32b20 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 a68fc933b..1324e9e93 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 672bb722d..1d6e922c8 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 875c19dd6..957523710 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 85195cb63..58c570f9d 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 3c0bd2b3c..99e4bbe58 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 2ae88ffd7..bd1124ada 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 66e42009f..c542c0139 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 54cf7ed3c..bbc07365d 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 5d011c627..202bc5cf5 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 71364bf5c..8b04baeb6 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 188fe51f1..d7dd4de22 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 3350061b6..0f2030484 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 63f0c323b..45acccd9f 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 bcbce1918..cd4cbe52f 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 3e1fe7c4e..4071ee04f 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 da278e371..e06b65697 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 6faf3f61e..53ac5f598 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 c185fc55d..0a9eb166c 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 2191b76fe..6625cfb81 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 ab87201e2..dd85a6159 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 2e456a867..3350e1c86 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 e79ac0f4c..85af5b083 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 8b1ffc428..0c1b8a3b5 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 4f005e0da..dbbf5fa68 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 471ac01d0..a6c0c6d58 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 
 #include "viewpropsprogressinfo.h"
+
 #include "applyviewpropsjob.h"
+#include "views/viewproperties.h"
+
+#include <KConfigGroup>
+#include <KLocalizedString>
 
+#include <QDialogButtonBox>
 #include <QLabel>
 #include <QProgressBar>
+#include <QPushButton>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QDialogButtonBox>
-#include <QPushButton>
-
-#include <KConfigGroup>
-#include <KLocalizedString>
-
-#include <views/viewproperties.h>
 
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
                                              const QUrl& dir,
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index e69de2976..05eafa6f5 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;