diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index caa2c1c922..97f76cff47 100644
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -25,7 +25,6 @@
 #include <QToolButton>
 #include <QHBoxLayout>
 
-#include <QIcon>
 #include <KLocalizedString>
 #include <QLineEdit>
 
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 41f8aeade0..dd8167d79a 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -24,7 +24,6 @@
 #include "kfileitemmodel.h"
 #include "private/kpixmapmodifier.h"
 
-#include <QIcon>
 #include <KIconLoader>
 
 #include <QPainter>
diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 5fa3e548c5..92b84b1455 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -22,11 +22,8 @@
 #include "kitemlistview.h"
 
 #include <KLocalizedString>
-#include <KIO/MetaData>
-#include <QDateTime>
 #include <KFormat>
 #include <QMimeDatabase>
-#include <QLocale>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 8c736ccfe5..70014e1a75 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -36,9 +36,6 @@
 #include <QTimer>
 #include <QWidget>
 
-#include <algorithm>
-#include <vector>
-
 // #define KFILEITEMMODEL_DEBUG
 
 KFileItemModel::KFileItemModel(QObject* parent) :
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index a08f1ae150..ddbed16a8f 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -24,7 +24,6 @@
 #include <KConfig>
 #include <KConfigGroup>
 #include <KSharedConfig>
-#include <KFileItem>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KIO/JobUiDelegate>
@@ -37,12 +36,9 @@
 
 #include <QApplication>
 #include <QPainter>
-#include <QPixmap>
 #include <QElapsedTimer>
 #include <QTimer>
 
-#include <algorithm>
-
 #ifdef HAVE_BALOO
     #include "private/kbaloorolesprovider.h"
     #include <Baloo/File>
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index c1eae53bd6..cdc7baa357 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -24,7 +24,6 @@
 
 #include "kitemlistcontroller.h"
 #include "kitemlistview.h"
-#include "kitemmodelbase.h"
 
 #include "private/kitemlistsmoothscroller.h"
 
@@ -32,7 +31,6 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QScrollBar>
-#include <QStyle>
 #include <QStyleOption>
 
 /**
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 7af8781b48..c8e109a05f 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -32,7 +32,6 @@
 
 #include <QApplication>
 #include <QDrag>
-#include <QEvent>
 #include <QGraphicsScene>
 #include <QGraphicsSceneEvent>
 #include <QGraphicsView>
diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 5d7b08eeb0..efc256e1e6 100644
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -23,8 +23,6 @@
 
 #include "kitemlistselectionmanager.h"
 
-#include "kitemmodelbase.h"
-
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),
     m_currentItem(-1),
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index dbeb571a40..f457b00ac0 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -33,18 +33,13 @@
 #include "private/kitemlistrubberband.h"
 #include "private/kitemlistsizehintresolver.h"
 #include "private/kitemlistviewlayouter.h"
-#include "private/kitemlistviewanimation.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
-#include <QPainter>
-#include <QStyle>
 #include <QStyleOptionRubberBand>
 #include <QTimer>
 #include <QElapsedTimer>
 
-#include <algorithm>
-
 #include "kitemlistviewaccessible.h"
 
 namespace {
diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index c593dad82c..ce45ed81d0 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -27,12 +27,9 @@
 #include "kitemlistview.h"
 #include "private/kitemlistviewlayouter.h"
 
-#include <qaccessible.h>
 #include <qgraphicsscene.h>
 #include <qgraphicsview.h>
 
-#include <QHash>
-
 KItemListView* KItemListViewAccessible::view() const
 {
     return qobject_cast<KItemListView*>(object());
diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 579d8b7a2c..f92309254f 100644
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -23,7 +23,6 @@
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"
-#include "kitemmodelbase.h"
 
 #include "private/kitemlistselectiontoggle.h"
 
diff --git a/src/kitemviews/kitemset.cpp b/src/kitemviews/kitemset.cpp
index f855368c14..e36829eb5c 100644
--- a/src/kitemviews/kitemset.cpp
+++ b/src/kitemviews/kitemset.cpp
@@ -19,9 +19,6 @@
 
 #include "kitemset.h"
 
-#include <QVector>
-
-#include <algorithm>
 
 KItemSet::iterator KItemSet::insert(int i)
 {
diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp
index d4d1fa2f91..4fb3f8f983 100644
--- a/src/kitemviews/kstandarditem.cpp
+++ b/src/kitemviews/kstandarditem.cpp
@@ -18,8 +18,6 @@
  ***************************************************************************/
 
 #include "kstandarditem.h"
-#include <QSet>
-#include <QByteArray>
 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :
diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index 6471002c72..00f111053c 100644
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -21,7 +21,6 @@
 
 #include <KIconLoader>
 #include "kstandarditemlistwidget.h"
-#include "kstandarditemlistgroupheader.h"
 
 KStandardItemListView::KStandardItemListView(QGraphicsWidget* parent) :
     KItemListView(parent),
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index aa12f884c1..0841ad4017 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -22,7 +22,6 @@
 #include "kfileitemlistview.h"
 #include "kfileitemmodel.h"
 
-#include <QIcon>
 #include <KIconEffect>
 #include <KIconLoader>
 #include <KRatingPainter>
@@ -35,10 +34,7 @@
 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
-#include <QPainter>
 #include <QStyleOption>
-#include <QTextLayout>
-#include <QTextLine>
 #include <QPixmapCache>
 #include <QGuiApplication>
 
diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index 0779614c3e..a4d42b5715 100644
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -20,8 +20,7 @@
 #include "kstandarditemmodel.h"
 
 #include "kstandarditem.h"
-#include <QSet>
-#include <QByteArray>
+
 KStandardItemModel::KStandardItemModel(QObject* parent) :
     KItemModelBase(parent),
     m_items(),
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 53fc0b3b9c..182428db5f 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -29,7 +29,6 @@
 #include <KFormat>
 
 #include <QTime>
-#include <QMap>
 #include <QCollator>
 
 struct KBalooRolesProviderSingleton
diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp
index 90716173c5..2c33edd411 100644
--- a/src/kitemviews/private/kdirectorycontentscounter.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounter.cpp
@@ -20,7 +20,6 @@
 
 #include "kdirectorycontentscounter.h"
 
-#include "kdirectorycontentscounterworker.h"
 #include <kitemviews/kfileitemmodel.h>
 
 #include <KDirWatch>
diff --git a/src/kitemviews/private/kfileitemmodelfilter.cpp b/src/kitemviews/private/kfileitemmodelfilter.cpp
index a388a242c8..fc56cc71d5 100644
--- a/src/kitemviews/private/kfileitemmodelfilter.cpp
+++ b/src/kitemviews/private/kfileitemmodelfilter.cpp
@@ -21,7 +21,6 @@
 #include "kfileitemmodelfilter.h"
 
 #include <KFileItem>
-#include <QRegExp>
 
 
 KFileItemModelFilter::KFileItemModelFilter() :
diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 5ff013429c..e79a9f9d14 100644
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -20,7 +20,6 @@
 #include "kitemlistroleeditor.h"
 
 #include <KIO/Global>
-#include <QKeyEvent>
 
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),
diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index 77a842838f..f1f6145c45 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -20,7 +20,6 @@
 #include "kitemlistsmoothscroller.h"
 
 #include <QApplication>
-#include <QEvent>
 #include <QPropertyAnimation>
 #include <QScrollBar>
 #include <QWheelEvent>
diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
index 89b3452108..7c6782b7a2 100644
--- a/src/kitemviews/private/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -21,8 +21,6 @@
 
 #include <kitemviews/kitemlistview.h>
 
-
-#include <QGraphicsWidget>
 #include <QPropertyAnimation>
 
 KItemListViewAnimation::KItemListViewAnimation(QObject* parent) :
diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 9340c9790f..3bf11483b8 100644
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -36,8 +36,6 @@
 
 #include <QImage>
 #include <QPainter>
-#include <QPixmap>
-#include <QSize>
 #include <QGuiApplication>
 
 static const quint32 stackBlur8Mul[255] =
diff --git a/src/main.cpp b/src/main.cpp
index 789a529967..e05c67d96a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,6 @@
 #include <KAboutData>
 #include <KCrash>
 #include <QCommandLineParser>
-#include <QCommandLineOption>
 #include <QApplication>
 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 4a476ad76a..e455780e02 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -27,12 +27,10 @@
 #include <views/renamedialog.h>
 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kfileitemlistwidget.h>
 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kfileitemmodel.h>
 
-#include <KFileItem>
 #include <KJobWidgets>
 #include <KJobUiDelegate>
 #include <KIO/CopyJob>
@@ -41,7 +39,6 @@
 
 #include <QApplication>
 #include <QBoxLayout>
-#include <QDropEvent>
 #include <QGraphicsSceneDragDropEvent>
 #include <QGraphicsView>
 #include <QPropertyAnimation>
@@ -49,7 +46,6 @@
 
 #include <views/draganddrophelper.h>
 
-#include "dolphindebug.h"
 #include "global.h"
 
 FoldersPanel::FoldersPanel(QWidget* parent) :
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 132637f15a..99802ed18c 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -20,12 +20,10 @@
 
 #include "treeviewcontextmenu.h"
 
-#include <KFileItem>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
 #include <KIO/JobUiDelegate>
 #include <QMenu>
-#include <QIcon>
 #include <KJobWidgets>
 #include <KSharedConfig>
 #include <KConfigGroup>
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 157568269d..7507d54fb6 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -19,7 +19,6 @@
 
 #include "informationpanelcontent.h"
 
-#include <KFileItem>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>
@@ -43,18 +42,12 @@
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
-#include <Phonon/SeekSlider>
 
-#include <QEvent>
 #include <QLabel>
-#include <QPixmap>
-#include <QResizeEvent>
 #include <QScrollArea>
 #include <QTextLayout>
-#include <QTextLine>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QFontDatabase>
 #include <QStyle>
 
 #include "dolphin_informationpanelsettings.h"
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index a71a77897f..b8d3d6ef61 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -21,19 +21,14 @@
 #include "phononwidget.h"
 
 #include <Phonon/AudioOutput>
-#include <Phonon/Global>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
 #include <Phonon/VideoWidget>
 
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QShowEvent>
 #include <QToolButton>
-#include <QDialog>
-#include <QIcon>
 #include <KIconLoader>
-#include <QUrl>
 #include <KLocalizedString>
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp
index 0874f2b391..24a6295696 100644
--- a/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@ -22,7 +22,6 @@
 #include <KIconLoader>
 
 #include <QPainter>
-#include <QPixmap>
 #include <QStyle>
 
 PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index 348191c981..30cff509d5 100644
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "panel.h"
-#include <QUrl>
 
 Panel::Panel(QWidget* parent) :
     QWidget(parent),
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index 3c6023ba80..a1e4611a57 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -22,12 +22,10 @@
 
 #include "placesitem.h"
 
-#include <KBookmarkManager>
 #include "dolphindebug.h"
 #include <KDirLister>
 #include <KLocalizedString>
 #include "placesitemsignalhandler.h"
-#include <QDateTime>
 #include <Solid/Block>
 
 PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 4a56ce9085..9722eb5866 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -33,9 +33,7 @@
 #include <QCheckBox>
 #include <QEvent>
 #include <QFormLayout>
-#include <QVBoxLayout>
 #include <QDialogButtonBox>
-#include <QPushButton>
 #include <QLineEdit>
 
 PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 077c9044c2..76b22f1fd8 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -26,28 +26,18 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <KBookmark>
-#include <KBookmarkManager>
 #include "dolphindebug.h"
 #include <QIcon>
-#include <KProtocolInfo>
 #include <KLocalizedString>
-#include <QStandardPaths>
 #include <KAboutData>
 #include "placesitem.h"
 #include <QAction>
-#include <QDate>
 #include <QMimeData>
 #include <QTimer>
 #include <KUrlMimeData>
-#include <KFilePlacesModel>
 
-#include <Solid/Device>
 #include <Solid/DeviceNotifier>
-#include <Solid/OpticalDisc>
 #include <Solid/OpticalDrive>
-#include <Solid/StorageAccess>
-#include <Solid/StorageDrive>
 
 #include <views/dolphinview.h>
 #include <views/viewproperties.h>
diff --git a/src/panels/places/placesitemsignalhandler.cpp b/src/panels/places/placesitemsignalhandler.cpp
index bd3fc9f727..5531d1b631 100644
--- a/src/panels/places/placesitemsignalhandler.cpp
+++ b/src/panels/places/placesitemsignalhandler.cpp
@@ -20,7 +20,6 @@
 #include "placesitemsignalhandler.h"
 
 #include "placesitem.h"
-#include <Solid/StorageAccess>
 
 PlacesItemSignalHandler::PlacesItemSignalHandler(PlacesItem* item,
                                                  QObject* parent) :
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index f7ca7d010d..e2bdeaafa2 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -27,7 +27,6 @@
 
 #include "global.h"
 #include <KFileItem>
-#include "dolphindebug.h"
 #include <KDirNotify>
 #include <QIcon>
 #include <KIO/Job>
@@ -54,8 +53,6 @@
 #include <views/draganddrophelper.h>
 #include <QGraphicsSceneDragDropEvent>
 #include <QVBoxLayout>
-#include <QShowEvent>
-#include <QMimeData>
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     Panel(parent),
diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index cf0134f4e3..21a45cd9b8 100644
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -25,7 +25,6 @@
 #include <QDate>
 #include <QRadioButton>
 #include <QHBoxLayout>
-#include <QVBoxLayout>
 
 DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     QWidget(parent),
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 44de97aa02..6cae37e197 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -32,14 +32,11 @@
 
 #include <QButtonGroup>
 #include <QDir>
-#include <QEvent>
 #include <QHBoxLayout>
-#include <QKeyEvent>
 #include <QLabel>
 #include <QScrollArea>
 #include <QTimer>
 #include <QToolButton>
-#include <QVBoxLayout>
 #include <QUrlQuery>
 
 #include <config-baloo.h>
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 50fd41e4c6..ffed870f17 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -32,10 +32,8 @@
 #include <KAuthorized>
 #include <KWindowConfig>
 #include <KLocalizedString>
-#include <QIcon>
 
 #include <QPushButton>
-#include <QDialogButtonBox>
 
 DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     KPageDialog(parent),
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index b600c2be60..fb3f77ebaa 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -20,8 +20,6 @@
 
 #include "behaviorsettingspage.h"
 
-#include "dolphin_generalsettings.h"
-
 #include <KLocalizedString>
 
 #include <QCheckBox>
diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp
index 6297187056..6a4f3769af 100644
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@@ -27,7 +27,6 @@
 #include <KIO/ThumbCreator>
 
 #include <QUrl>
-#include <QLibrary>
 #include <QVBoxLayout>
 #include <QStandardPaths>
 #include <QDialogButtonBox>
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index f9a2c67d0b..3793fcdb5f 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -23,7 +23,6 @@
 #include "behaviorsettingspage.h"
 #include "confirmationssettingspage.h"
 #include "previewssettingspage.h"
-#include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 
 #include <KLocalizedString>
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index e579a572d0..672bb722df 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -22,27 +22,19 @@
 #include "dolphin_generalsettings.h"
 #include "configurepreviewplugindialog.h"
 
-#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KServiceTypeTrader>
-#include <KService>
 #include <KIO/PreviewJob>
 
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>
 
-#include <QCheckBox>
-#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListView>
 #include <QPainter>
-#include <QScrollBar>
-#include <QShowEvent>
-#include <QSlider>
 #include <QSpinBox>
 #include <QSortFilterProxyModel>
-#include <QVBoxLayout>
 
 // default settings
 namespace {
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 3aedf50750..2ae88ffd79 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -27,7 +27,6 @@
 #include <settings/general/previewssettingspage.h>
 #include <settings/general/confirmationssettingspage.h>
 
-#include <QDir>
 #include <QVBoxLayout>
 #include <QTabWidget>
 
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index af9b49026b..71364bf5cb 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -28,7 +28,6 @@
 
 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QPushButton>
 #include <QVBoxLayout>
 #include <QTabWidget>
 
diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index e2398d7fb1..3350061b64 100644
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -19,15 +19,12 @@
 
 #include "serviceitemdelegate.h"
 
-#include "dolphindebug.h"
 #include <QPushButton>
-#include <QIcon>
 
 #include "servicemodel.h"
 
 #include <QAbstractItemView>
 #include <QCheckBox>
-#include <QModelIndex>
 #include <QPainter>
 
 ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent) :
diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index a0d9effc8d..63f0c323b4 100644
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -22,8 +22,6 @@
 #include "dolphin_generalsettings.h"
 #include "dolphin_versioncontrolsettings.h"
 
-#include <KConfig>
-#include <KConfigGroup>
 #include <KDesktopFile>
 #include <kdesktopfileactions.h>
 #include <QIcon>
@@ -33,19 +31,14 @@
 #include <KPluginMetaData>
 #include <KService>
 #include <KServiceTypeTrader>
-#include <QStandardPaths>
 
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>
 
-#include <QCheckBox>
 #include <QGridLayout>
-#include <QGroupBox>
 #include <QLabel>
 #include <QListWidget>
-#include <QPushButton>
 #include <QSortFilterProxyModel>
-#include <QShowEvent>
 
 namespace
 {
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index b216181d88..3e1fe7c4ee 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -34,11 +34,8 @@
 #include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
-#include <QHBoxLayout>
 #include <QFileDialog>
 
-#include "views/dolphinview.h"
-
 StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 98f818c96e..e79ac0f4c7 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -30,7 +30,6 @@
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QLabel>
-#include <QSlider>
 #include <QVBoxLayout>
 #include <QHelpEvent>
 #include <QApplication>
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 8c5fccdef2..4f005e0dae 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -27,13 +27,9 @@
 #include "dolphin_iconsmodesettings.h"
 #include "viewpropsprogressinfo.h"
 
-#include <config-baloo.h>
-
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <QUrl>
 #include <KComboBox>
-#include <KConfigGroup>
 #include <KWindowConfig>
 
 #include <QButtonGroup>
@@ -43,8 +39,6 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
 
 #include <views/viewproperties.h>
 
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index 1878c81372..471ac01d06 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -30,7 +30,6 @@
 
 #include <KConfigGroup>
 #include <KLocalizedString>
-#include <KIO/Job>
 
 #include <views/viewproperties.h>
 
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 16683309dc..14672dff07 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -30,10 +30,8 @@
 
 #include <QApplication>
 #include <QHBoxLayout>
-#include <QLabel>
 #include <QProgressBar>
 #include <QToolButton>
-#include <QTime>
 #include <QTimer>
 #include <QSlider>
 #include <QTextDocument>
diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp
index 8f45c18f84..6cf695d550 100644
--- a/src/statusbar/spaceinfoobserver.cpp
+++ b/src/statusbar/spaceinfoobserver.cpp
@@ -21,8 +21,6 @@
 
 #include "mountpointobserver.h"
 
-#include <QUrl>
-
 SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) :
     QObject(parent),
     m_mountPointObserver(nullptr),
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index 6b6a6d6108..a8ba9db8b9 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -26,7 +26,6 @@
 
 #include <KLocalizedString>
 #include <KNS3/KMoreToolsMenuFactory>
-#include <KIO/Job>
 #include <knewstuff_version.h>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp
index 5e33533960..64ad116f62 100644
--- a/src/tests/kfileitemmodelbenchmark.cpp
+++ b/src/tests/kfileitemmodelbenchmark.cpp
@@ -21,14 +21,11 @@
 #include <QTest>
 #include <QSignalSpy>
 
-#include <algorithm>
 #include <random>
 
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodelsortalgorithm.h"
 
-#include "testdir.h"
-
 void myMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)
 {
     Q_UNUSED(context);
diff --git a/src/tests/kitemrangetest.cpp b/src/tests/kitemrangetest.cpp
index 5e4ea653f4..ee569a4d48 100644
--- a/src/tests/kitemrangetest.cpp
+++ b/src/tests/kitemrangetest.cpp
@@ -20,7 +20,6 @@
 #include "kitemviews/kitemrange.h"
 
 #include <QTest>
-#include <QVector>
 
 Q_DECLARE_METATYPE(QVector<int>)
 Q_DECLARE_METATYPE(KItemRangeList)
diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index d319939476..3e74184c2c 100644
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -20,7 +20,6 @@
 #include "kitemviews/kitemset.h"
 
 #include <QTest>
-#include <QVector>
 
 Q_DECLARE_METATYPE(KItemRangeList)
 
diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
index a74b3ea6cb..ec44c8f31b 100644
--- a/src/tests/placesitemmodeltest.cpp
+++ b/src/tests/placesitemmodeltest.cpp
@@ -19,13 +19,9 @@
 
 #include <QTest>
 #include <QSignalSpy>
-#include <QDebug>
-#include <QList>
-#include <QByteArray>
 #include <QStandardPaths>
 #include <QAction>
 #include <QDBusInterface>
-#include <QUrlQuery>
 
 #include <KBookmarkManager>
 #include <KConfig>
@@ -36,7 +32,6 @@
 #include "panels/places/placesitemmodel.h"
 #include "panels/places/placesitem.h"
 #include "views/viewproperties.h"
-#include "kitemviews/kitemrange.h"
 
 Q_DECLARE_METATYPE(KItemRangeList)
 Q_DECLARE_METATYPE(KItemRange)
diff --git a/src/tests/testdir.cpp b/src/tests/testdir.cpp
index b84b344b77..de81378d84 100644
--- a/src/tests/testdir.cpp
+++ b/src/tests/testdir.cpp
@@ -19,8 +19,6 @@
 
 #include "testdir.h"
 
-#include <QDir>
-
 #ifdef Q_OS_UNIX
 #include <utime.h>
 #else
diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index 5193bb35a2..0cd55662d2 100644
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -22,7 +22,6 @@
 #include "testdir.h"
 
 #include <QTest>
-#include <QDir>
 
 class ViewPropertiesTest : public QObject
 {
diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index e7398af2db..197fe5591f 100644
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -19,9 +19,7 @@
 
 #include "dolphinfileitemlistwidget.h"
 
-#include <QIcon>
 #include <KIconLoader>
-#include <QColor>
 
 #include "dolphindebug.h"
 
diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index a1472c6610..be142205dc 100644
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -25,10 +25,8 @@
 #include "dolphin_compactmodesettings.h"
 #include "dolphinfileitemlistwidget.h"
 
-#include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kitemliststyleoption.h>
 
 #include <KIO/PreviewJob>
 
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 116168a4b1..bdf747f084 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -29,8 +29,6 @@
 #include "dolphindebug.h"
 #include <KActionMenu>
 #include <KActionCollection>
-#include <QIcon>
-#include <KLocalizedString>
 #include <KConfig>
 #include <KCharsets>
 #include <QMenu>
@@ -38,6 +36,7 @@
 #include <KProtocolManager>
 #include <KIO/Scheduler>
 #include <KConfigGroup>
+#include <KLocalizedString>
 
 #define DATA_KEY        QStringLiteral("Charset")
 
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index e40e49d6e4..463ab51baf 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -20,8 +20,6 @@
 
 #include "dolphinview.h"
 
-#include <config-baloo.h>
-
 #include <QAbstractItemView>
 #include <QApplication>
 #include <QClipboard>
@@ -37,7 +35,6 @@
 #include <KProtocolManager>
 #include <KColorScheme>
 #include <KDirModel>
-#include <KFileItem>
 #include <KFileItemListProperties>
 #include <KLocalizedString>
 #include <kitemviews/kfileitemmodel.h>
@@ -45,7 +42,6 @@
 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kitemlistheader.h>
 #include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kitemlistview.h>
 #include <kitemviews/kitemlistcontroller.h>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
@@ -54,10 +50,8 @@
 #include <KIO/DropJob>
 #include <KIO/PasteJob>
 #include <KIO/Paste>
-#include <KJob>
 #include <KMessageBox>
 #include <KJobWidgets>
-#include <QUrl>
 
 #include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"
@@ -66,7 +60,6 @@
 #include "draganddrophelper.h"
 #include "renamedialog.h"
 #include "versioncontrol/versioncontrolobserver.h"
-#include "viewmodecontroller.h"
 #include "viewproperties.h"
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 2684816ef9..9fff160b25 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -20,10 +20,7 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include <config-baloo.h>
-
 #include "settings/viewpropertiesdialog.h"
-#include "views/dolphinview.h"
 #include "views/zoomlevelinfo.h"
 
 #include <QPointer>
@@ -34,11 +31,8 @@
 #include <kitemviews/kfileitemmodel.h>
 #include <KLocalizedString>
 #include <KNewFileMenu>
-#include <KSelectAction>
-#include <KToggleAction>
 #include <KPropertiesDialog>
 #include <KProtocolManager>
-#include <QIcon>
 
 #include "dolphindebug.h"
 
diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 4d76992cad..bd4374ec3a 100644
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -20,10 +20,8 @@
 
 #include "draganddrophelper.h"
 
-#include <QUrl>
 #include <QDBusMessage>
 #include <QDBusConnection>
-#include <QDropEvent>
 #include <QMimeData>
 
 #include <KIO/DropJob>
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 95a12474b1..24b7986be9 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -28,7 +28,6 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QVBoxLayout>
 #include <QMimeDatabase>
 #include <QDialogButtonBox>
 #include <QPushButton>
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index cabfc06176..fcf51a2407 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -31,7 +31,6 @@
 #include <QStylePainter>
 #include <QVBoxLayout>
 #include <QTextLayout>
-#include <QTextLine>
 
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp
index 574402dcde..0a183b4a58 100644
--- a/src/views/versioncontrol/updateitemstatesthread.cpp
+++ b/src/views/versioncontrol/updateitemstatesthread.cpp
@@ -19,8 +19,6 @@
 
 #include "updateitemstatesthread.h"
 
-#include <QVector>
-#include <QMutexLocker>
 
 UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin* plugin,
                                                const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates) :
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 44dffac45d..459bef0e9f 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -29,7 +29,6 @@
 
 #include "updateitemstatesthread.h"
 
-#include <QFile>
 #include <QTimer>
 
 VersionControlObserver::VersionControlObserver(QObject* parent) :
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index e2be188198..4444f64e76 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -23,14 +23,9 @@
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
 
-#include <QUrl>
 #include "dolphindebug.h"
 
 #include <QCryptographicHash>
-#include <QDate>
-#include <QFile>
-#include <QFileInfo>
-#include <QStandardPaths>
 
 namespace {
     const int AdditionalInfoViewPropertiesVersion = 1;