diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 41812aaa90..8a6b4cc03f 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -24,9 +24,7 @@
 
 #include <KCmdLineArgs>
 #include <KDebug>
-#include <KRun>
 #include <KUrl>
-#include <KGlobal>
 
 DolphinApplication::DolphinApplication() :
     m_mainWindow(0)
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index f3337a6913..f597d52e32 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -27,37 +27,28 @@
 #include "dolphinremoveaction.h"
 
 #include <KActionCollection>
-#include <KDesktopFile>
 #include <kfileitemactionplugin.h>
 #include <kabstractfileitemactionplugin.h>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
-#include <KGlobal>
-#include <KIconLoader>
 #include <KIO/RestoreJob>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
-#include <KJobUiDelegate>
 #include <KJobWidgets>
 #include <QMenu>
-#include <KMenuBar>
-#include <KMessageBox>
 #include <KMimeTypeTrader>
 #include <KMimeType>
 #include <KNewFileMenu>
 #include <konq_operations.h>
 #include <KService>
 #include <KLocalizedString>
-#include <KPropertiesDialog>
 #include <KStandardAction>
 #include <KToolBar>
 
+#include <QMenuBar>
 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
 
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 62dffd074e..f082e1c6ca 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -21,16 +21,12 @@
 #define DOLPHINCONTEXTMENU_H
 
 #include <KFileItem>
-#include <KService>
 #include <KUrl>
 #include <konq_copytomenu.h>
 #include <QMenu>
 
-#include <QObject>
 
-#include <QVector>
 
-#include <QScopedPointer>
 
 class QAction;
 class DolphinMainWindow;
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e6ef74ef36..3f83d054b5 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -46,48 +46,39 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <KAcceleratorManager>
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KConfig>
-#include <KDesktopFile>
 #include <kdeversion.h>
 #include <kdualaction.h>
-#include <KFileDialog>
-#include <KGlobal>
 #include <KDialog>
 #include <KJobWidgets>
 #include <KLineEdit>
 #include <KToolBar>
-#include <KIconLoader>
 #include <KIO/NetAccess>
 #include <KIO/JobUiDelegate>
-#include <KInputDialog>
 #include <KLocalizedString>
 #include <KProtocolManager>
 #include <QMenu>
-#include <KMenuBar>
 #include <KMessageBox>
 #include <KFileItemListProperties>
-#include <KProtocolInfo>
 #include <KRun>
 #include <KShell>
 #include <kstatusbar.h>
 #include <KStandardAction>
 #include <KToggleAction>
 #include <KUrlNavigator>
-#include <KUrlComboBox>
 #include <KToolInvocation>
+#include <KUrlComboBox>
 
-#include <QDesktopWidget>
-#include <QDBusMessage>
-#include <QKeyEvent>
+#include <QMenuBar>
 #include <QClipboard>
 #include <QToolButton>
-#include <QSplitter>
 #include <QTimer>
 #include <QStandardPaths>
 #include <QPushButton>
+#include <QCloseEvent>
+#include <QShowEvent>
 
 namespace {
     // Used for GeneralSettings::version() to determine whether
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 3ea4e0e170..0505037ce7 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -24,7 +24,6 @@
 
 #include <config-baloo.h>
 
-#include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 9d4de3fe9e..6f84ab1d82 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -25,26 +25,22 @@
 
 #include <KAboutData>
 #include <KActionCollection>
-#include <KConfigGroup>
 #include <KDebug>
-#include <KGlobalSettings>
 #include <KIconLoader>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KPluginFactory>
 #include <KRun>
-#include <KToggleAction>
-#include <KGlobal>
 #include <KIO/NetAccess>
 #include <KToolInvocation>
 #include <kauthorized.h>
 #include <QMenu>
 #include <KInputDialog>
-#include <KProtocolInfo>
 #include <kdeversion.h>
+#include <KSharedConfig>
+#include <KConfigGroup>
 
 #include "dolphinpart_ext.h"
-
 #include "dolphinnewfilemenu.h"
 #include "views/dolphinview.h"
 #include "views/dolphinviewactionhandler.h"
@@ -53,11 +49,13 @@
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodeldirlister.h"
 
+#include <QStandardPaths>
 #include <QActionGroup>
+#include <QTextDocument>
 #include <QApplication>
 #include <QClipboard>
 #include <QDir>
-#include <QTextDocument>
+
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 70886d10d4..18ea0bfbf0 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -23,7 +23,6 @@
 #include <KParts/ReadOnlyPart>
 #include <KUrl>
 
-#include <QItemSelectionModel>
 
 class DolphinNewFileMenu;
 class DolphinViewActionHandler;
diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index f4492a214e..bce3996f64 100644
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -94,4 +94,4 @@ void DolphinRecentTabsMenu::handleAction(QAction* action)
     if (menu()->actions().count() <= 2) {
         setEnabled(false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index f7000ea668..763cd8f941 100644
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -23,6 +23,7 @@
 #include "dolphin_generalsettings.h"
 
 #include <QSplitter>
+#include <QVBoxLayout>
 
 DolphinTabPage::DolphinTabPage(const KUrl& primaryUrl, const KUrl& secondaryUrl, QWidget* parent) :
     QWidget(parent),
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 25207b5b74..14bc4b7bc9 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,24 +20,16 @@
 #include "dolphinviewcontainer.h"
 #include <KProtocolManager>
 
-#include <QApplication>
-#include <QKeyEvent>
-#include <QItemSelection>
-#include <QBoxLayout>
 #include <QTimer>
-#include <QScrollBar>
 #include <QMimeData>
+#include <QVBoxLayout>
 
-#include <KDesktopFile>
-#include <KFileItemDelegate>
 #include <KFileItemActions>
 #include <KFilePlacesModel>
 #include <KLocalizedString>
-#include <KIconEffect>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KMessageWidget>
-#include <KNewFileMenu>
 #include <konq_operations.h>
 #include <KShell>
 #include <KUrl>
@@ -46,7 +38,6 @@
 #include <KRun>
 
 #ifdef KActivities_FOUND
-#include <KActivities/ResourceInstance>
 #endif
 
 #include "dolphin_generalsettings.h"
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 4ca76961c5..ce2f606d57 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -21,7 +21,6 @@
 #define DOLPHINVIEWCONTAINER_H
 
 #include <KFileItem>
-#include <KFileItemDelegate>
 #include <KCompletion>
 #include <KIO/Job>
 
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index bb918d0de7..32d3903317 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -22,18 +22,13 @@
 #include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
-#include <KLocalizedString>
-#include <KStringHandler>
 #include "private/kpixmapmodifier.h"
 
 #include <KDebug>
 #include <QIcon>
-#include <KTextEdit>
 #include <KIconLoader>
-#include <KDateTime>
 
 #include <QPainter>
-#include <QTextLine>
 #include <QTimer>
 
 // #define KFILEITEMLISTVIEW_DEBUG
diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 4938e9d6db..a304ea69c9 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -23,7 +23,6 @@
 
 #include <kmimetype.h>
 #include <KDebug>
-#include <KGlobal>
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 25507c23d9..489e4edb43 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -30,7 +30,6 @@
 #include "private/kfileitemmodelsortalgorithm.h"
 #include "private/kfileitemmodeldirlister.h"
 
-#include <QApplication>
 #include <QMimeData>
 #include <QTimer>
 #include <QWidget>
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 256527c9ea..8e9b9dd980 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -25,7 +25,6 @@
 #include <KConfigGroup>
 #include <KDebug>
 #include <KFileItem>
-#include <KGlobal>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KIO/JobUiDelegate>
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 5e45a1766e..46ac4745e7 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -31,7 +31,6 @@
 #include <QApplication>
 #include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QPropertyAnimation>
 #include <QScrollBar>
 #include <QStyle>
 #include <QStyleOption>
diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h
index e599992dff..3373059d19 100644
--- a/src/kitemviews/kitemlistcontainer.h
+++ b/src/kitemviews/kitemlistcontainer.h
@@ -25,7 +25,6 @@
 
 #include <libdolphin_export.h>
 
-#include <QAbstractAnimation>
 #include <QAbstractScrollArea>
 
 class KItemListController;
diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index b07f117d0c..99df531042 100644
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -28,9 +28,8 @@
 #include "kitemset.h"
 
 #include <QObject>
-#include <QPixmap>
 #include <QPointF>
-
+class QTimer;
 class KItemModelBase;
 class KItemListKeyboardSearchManager;
 class KItemListSelectionManager;
diff --git a/src/kitemviews/kitemliststyleoption.cpp b/src/kitemviews/kitemliststyleoption.cpp
index edd6363c85..1ebcad1415 100644
--- a/src/kitemviews/kitemliststyleoption.cpp
+++ b/src/kitemviews/kitemliststyleoption.cpp
@@ -19,7 +19,6 @@
 
 #include "kitemliststyleoption.h"
 
-#include <KIconLoader>
 
 KItemListStyleOption::KItemListStyleOption() :
     rect(),
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 8c93361e0d..ea1ec3f3a5 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -35,11 +35,9 @@
 #include "private/kitemlistviewlayouter.h"
 #include "private/kitemlistviewanimation.h"
 
-#include <QCursor>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QPainter>
-#include <QPropertyAnimation>
 #include <QStyle>
 #include <QStyleOptionRubberBand>
 #include <QTimer>
diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h
index 689db42519..59190bfd5d 100644
--- a/src/kitemviews/kstandarditem.h
+++ b/src/kitemviews/kstandarditem.h
@@ -24,7 +24,6 @@
 
 #include <QByteArray>
 #include <QHash>
-#include <QIcon>
 #include <QList>
 #include <QVariant>
 
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index b8557c67f9..9a08a53dbd 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -25,7 +25,6 @@
 #include <QIcon>
 #include <KIconEffect>
 #include <KIconLoader>
-#include <KLocalizedString>
 #include <kratingpainter.h>
 #include <KStringHandler>
 #include <KDebug>
@@ -34,7 +33,6 @@
 #include "private/kitemlistroleeditor.h"
 #include "private/kpixmapmodifier.h"
 
-#include <QFontMetricsF>
 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.h b/src/kitemviews/private/kdirectorycontentscounterworker.h
index 96831ef811..b2e31ef0f8 100644
--- a/src/kitemviews/private/kdirectorycontentscounterworker.h
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.h
@@ -20,7 +20,6 @@
 #ifndef KDIRECTORYCONTENTENTSCOUNTERWORKER_H
 #define KDIRECTORYCONTENTENTSCOUNTERWORKER_H
 
-#include <QFlags>
 #include <QMetaType>
 #include <QObject>
 
diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index 6b6530fd29..e820bd7892 100644
--- a/src/kitemviews/private/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -19,7 +19,6 @@
 
 #include "kitemlistheaderwidget.h"
 
-#include <QMenu>
 #include <kitemviews/kitemmodelbase.h>
 
 #include <QApplication>
diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
index 3bd1b01f38..ffa92a1cf0 100644
--- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
+++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp
@@ -22,8 +22,6 @@
 
 #include "kitemlistkeyboardsearchmanager.h"
 
-#include <QApplication>
-#include <QElapsedTimer>
 
 KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject* parent) :
     QObject(parent),
diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index c33c15ec28..4daa55f9a9 100644
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -19,7 +19,6 @@
 
 #include "kitemlistselectiontoggle.h"
 
-#include <KIconEffect>
 #include <KIconLoader>
 #include <QPainter>
 
diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index 14d8e8782d..1d3039d1f0 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -26,7 +26,7 @@
 class KFileItemModel;
 class KItemListController;
 class QGraphicsSceneDragDropEvent;
-
+class KFileItem;
 /**
  * @brief Shows a tree view of the directories starting from
  *        the currently selected place.
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 445b261b9a..330e185603 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -21,7 +21,6 @@
 #include "treeviewcontextmenu.h"
 
 #include <KFileItem>
-#include <KIconLoader>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
 #include <KIO/JobUiDelegate>
diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h
index c68b66ee1f..8a1237b957 100644
--- a/src/panels/information/informationpanel.h
+++ b/src/panels/information/informationpanel.h
@@ -21,7 +21,7 @@
 #define INFORMATIONPANEL_H
 
 #include <panels/panel.h>
-
+#include <KFileItemList>
 class InformationPanelContent;
 namespace KIO
 {
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 0ec82a424d..ce138baee7 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -32,6 +32,7 @@
 #include <QMenu>
 #include <kseparator.h>
 #include <KStringHandler>
+#include <QTextDocument>
 
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
@@ -49,10 +50,8 @@
 #include <QEvent>
 #include <QLabel>
 #include <QPixmap>
-#include <QPointer>
 #include <QResizeEvent>
 #include <QScrollArea>
-#include <QTextDocument>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 67fdf6c5ab..6e4faec823 100644
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -21,12 +21,11 @@
 #define INFORMATIONPANELCONTENT_H
 
 #include "config-baloo.h"
-#include <KConfig>
 #include <KFileItem>
 #include <KUrl>
-#include <KVBox>
 
 #include <QPointer>
+#include <QWidget>
 
 class KFileItemList;
 class PhononWidget;
diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp
index 7b3a212f2e..0053e43f97 100644
--- a/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@ -21,10 +21,8 @@
 
 #include <KIconLoader>
 
-#include <QLayout>
 #include <QPainter>
 #include <QPixmap>
-#include <QKeyEvent>
 
 PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),
diff --git a/src/panels/panel.h b/src/panels/panel.h
index a0b25d6cc2..b2562dd6b8 100644
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -23,7 +23,6 @@
 
 #include <QWidget>
 #include <KUrl>
-#include <KFileItem>
 
 /**
  * @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 e667af3023..edfe023436 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -25,7 +25,6 @@
 #include <KBookmarkManager>
 #include <KDebug>
 #include <KDirLister>
-#include <QIcon>
 #include <KLocalizedString>
 #include "placesitemsignalhandler.h"
 #include <QDateTime>
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 87fbf4c29e..0fae3f2482 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -23,9 +23,7 @@
 
 #include "placesitemeditdialog.h"
 
-#include <KAboutData>
 #include <k4aboutdata.h>
-#include <KComponentData>
 #include <KDebug>
 #include <KFile>
 #include <KGlobal>
@@ -34,11 +32,11 @@
 #include <KLocalizedString>
 #include <KMimeType>
 #include <KUrlRequester>
+#include <KComponentData>
 #include <QCheckBox>
 #include <QEvent>
 #include <QFormLayout>
 #include <QVBoxLayout>
-#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>
 
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 344e176a32..14d97de5b4 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -28,11 +28,11 @@
 #include <KBookmark>
 #include <KBookmarkGroup>
 #include <KBookmarkManager>
-#include <KComponentData>
 #include <KDebug>
 #include <QIcon>
 #include <kprotocolinfo.h>
 #include <KLocalizedString>
+#include <KComponentData>
 #include <QStandardPaths>
 #include <KUser>
 #include <KGlobal>
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index cdc1ebb1af..68c7fa5580 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -25,6 +25,7 @@
 
 #include "dolphin_generalsettings.h"
 
+#include <KFileItem>
 #include <KDebug>
 #include <KDirNotify>
 #include <QIcon>
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 3078f0222b..1f7979ecac 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -29,7 +29,7 @@ class PlacesItem;
 class PlacesItemModel;
 class PlacesView;
 class QGraphicsSceneDragDropEvent;
-
+class KJob;
 /**
  * @brief Combines bookmarks and mounted devices as list.
  */
diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index c8352f73a4..964479628b 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -31,9 +31,9 @@
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 
-#include <QBoxLayout>
 #include <QDir>
 #include <QShowEvent>
+#include <QVBoxLayout>
 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index 987ee4753a..6a0b38f5b5 100644
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -33,7 +33,7 @@ namespace KIO {
 namespace KParts {
     class ReadOnlyPart;
 }
-
+class KJob;
 /**
  * @brief Shows the terminal which is synchronized with the URL of the
  *        active view.
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 94365c7de5..050ae394d8 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -26,12 +26,10 @@
 #include <KLineEdit>
 #include <KLocalizedString>
 #include <KSeparator>
-#include <KGlobalSettings>
 
 #include <QButtonGroup>
 #include <QDir>
 #include <QEvent>
-#include <QFormLayout>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index eba81346d5..16a6ec0c10 100644
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -21,7 +21,6 @@
 #define DOLPHINSEARCHBOX_H
 
 #include <KUrl>
-#include <QList>
 #include <QWidget>
 
 #include <config-baloo.h>
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index 68fdcc46b8..1d817fe569 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -24,7 +24,6 @@
 #define APPLYVIEWPROPSJOB_H
 
 #include <KIO/Job>
-#include <KFileItem>
 #include <KUrl>
 
 class ViewProperties;
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 43d95a0c6d..678ef7b8ed 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -31,7 +31,6 @@
 #include "trash/trashsettingspage.h"
 
 #include <KLocalizedString>
-#include <KMessageBox>
 #include <QIcon>
 
 #include <QPushButton>
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index af53080283..8d3e0ffb5d 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -22,14 +22,10 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <KComboBox>
-#include <KDialog>
 #include <KLocalizedString>
 
 #include <QCheckBox>
 #include <QGroupBox>
-#include <QHBoxLayout>
-#include <QLabel>
 #include <QRadioButton>
 #include <QVBoxLayout>
 
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index 07a31bc491..f749c33ce1 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -28,7 +28,6 @@
 
 #include <KDialog>
 #include <KLocalizedString>
-#include <KIconLoader>
 #include <KTabWidget>
 
 #include <QVBoxLayout>
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 82b216c3c0..68f515ac32 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -24,7 +24,6 @@
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
-#include <KGlobal>
 
 #include <settings/general/behaviorsettingspage.h>
 #include <settings/general/previewssettingspage.h>
diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index e7892a2468..5a0be61be2 100644
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,12 +19,9 @@
 
 #include "kcmdolphinnavigation.h"
 
-#include <KTabWidget>
 #include <KDialog>
-#include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
-#include <KGlobal>
 
 #include <settings/navigation/navigationsettingspage.h>
 
diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index ff0b09318c..b00f58abc3 100644
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -19,12 +19,9 @@
 
 #include "kcmdolphinservices.h"
 
-#include <KTabWidget>
 #include <KDialog>
-#include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
-#include <KGlobal>
 
 #include <settings/services/servicessettingspage.h>
 
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 83d6977126..fc211cdab0 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -25,13 +25,11 @@
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <QIcon>
-#include <KGlobal>
 
 #include <settings/viewmodes/viewsettingstab.h>
 
 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QDir>
 #include <QPushButton>
 #include <QVBoxLayout>
 
diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 10e009faa1..7ffb81115a 100644
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -28,7 +28,6 @@
 
 #include <QCheckBox>
 #include <QGroupBox>
-#include <QLabel>
 #include <QRadioButton>
 #include <QVBoxLayout>
 
diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index 7a56abd68a..5dbb691afc 100644
--- a/src/settings/services/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
@@ -21,7 +21,6 @@
 
 #include <settings/settingspagebase.h>
 
-#include <QMap>
 #include <QString>
 
 class QListView;
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index f1cdfecb8c..2c436b5417 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -31,11 +31,11 @@
 #include <KMessageBox>
 #include <KVBox>
 
+#include <QVBoxLayout>
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QLabel>
 #include <QPushButton>
-#include <QRadioButton>
 
 #include "views/dolphinview.h"
 
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index e5427f9f3d..4d8b4813c4 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -20,11 +20,9 @@
 #include "dolphinfontrequester.h"
 
 #include <KFontDialog>
-#include <KGlobalSettings>
 #include <KLocalizedString>
 #include <KComboBox>
 
-#include <QEvent>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QFontDatabase>
diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 2639c8bb4b..2b657c264d 100644
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -27,7 +27,6 @@
 
 #include <KDialog>
 #include <KLocalizedString>
-#include <KIconLoader>
 #include <KTabWidget>
 
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 20229a34ba..2e0b172b93 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -29,24 +29,19 @@
 
 #include <config-baloo.h>
 
-#include <KComponentData>
 #include <KLocalizedString>
-#include <KIconLoader>
 #include <KIO/NetAccess>
 #include <KMessageBox>
 #include <KUrl>
 #include <KComboBox>
 
-#include <QAction>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QMenu>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QBoxLayout>
 
 #include <views/viewproperties.h>
 
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index a755476093..091003416e 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -24,7 +24,7 @@
 #include <QLabel>
 #include <QProgressBar>
 #include <QTimer>
-#include <QBoxLayout>
+#include <QVBoxLayout>
 
 #include <KLocalizedString>
 #include <KIO/JobClasses>
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 4892ee7a8f..c5d7b45f64 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -21,11 +21,9 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <KIconLoader>
 #include <QIcon>
 #include <KLocalizedString>
 #include <QMenu>
-#include <KVBox>
 
 #include "statusbarspaceinfo.h"
 
@@ -33,10 +31,12 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QProgressBar>
-#include <QTextDocument>
 #include <QToolButton>
 #include <QTime>
 #include <QTimer>
+#include <QSlider>
+#include <QTextDocument>
+#include <QHelpEvent>
 
 #include <views/dolphinview.h>
 #include <views/zoomlevelinfo.h>
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index dd909beb46..1c90483047 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -25,7 +25,6 @@
 #include <KLocalizedString>
 #include <KIO/Job>
 
-#include <QKeyEvent>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 1065d9f455..597d91ef62 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -22,9 +22,6 @@
 
 #include <KUrl>
 
-#include <QColor>
-#include <QKeyEvent>
-#include <QString>
 
 #include <kcapacitybar.h>
 
diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index c584c5e62a..3d505c7663 100644
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -20,7 +20,6 @@
 
 #include <qtest_kde.h>
 
-#include <KDirLister>
 #include <kio/job.h>
 
 #include "kitemviews/kfileitemmodel.h"
diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index 6c72a5706b..d5584ce82b 100644
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -23,7 +23,6 @@
 #include "views/viewproperties.h"
 #include "testdir.h"
 
-#include <QDebug>
 #include <QDir>
 
 class ViewPropertiesTest : public QObject
diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index cd16aead03..60c8bb97c0 100644
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -30,8 +30,6 @@
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemliststyleoption.h>
 
-#include <KGlobalSettings>
-#include <KGlobal>
 
 #include <views/viewmodecontroller.h>
 
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 059b898e52..3b5fbcd719 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -31,8 +31,6 @@
 #include <KActionCollection>
 #include <QIcon>
 #include <KLocalizedString>
-#include <KGlobal>
-#include <KMimeType>
 #include <KConfig>
 #include <KCharsets>
 #include <QMenu>
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 1898493763..4ed32ed434 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -24,23 +24,18 @@
 
 #include <QAbstractItemView>
 #include <QApplication>
-#include <QBoxLayout>
 #include <QClipboard>
 #include <QDropEvent>
 #include <QGraphicsSceneDragDropEvent>
-#include <QKeyEvent>
-#include <QItemSelection>
 #include <QTimer>
 #include <QScrollBar>
 #include <QPointer>
 #include <QMenu>
-
+#include <QVBoxLayout>
 #include <KDesktopFile>
 #include <KProtocolManager>
-#include <KActionCollection>
 #include <KColorScheme>
 #include <KDirModel>
-#include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>
 #include <KLocalizedString>
@@ -59,11 +54,9 @@
 #include <KIO/Paste>
 #include <KJob>
 #include <QMenu>
-#include <KGlobal>
 #include <KMessageBox>
 #include <KJobWidgets>
 #include <konq_operations.h>
-#include <KToggleAction>
 #include <KUrl>
 
 #include "dolphinnewfilemenuobserver.h"
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 1616bcaa6c..d6daf28263 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -27,18 +27,14 @@
 
 #include <kparts/part.h>
 #include <KFileItem>
-#include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
 #include <KIO/Job>
 #include <KUrl>
 
-#include <QBoxLayout>
-#include <QKeyEvent>
-#include <QLinkedList>
 #include <QWidget>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
-
+class QVBoxLayout;
 class DolphinItemListView;
 class KFileItemModel;
 class KItemListContainer;
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index c3d4319a22..84025a5f84 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -28,12 +28,12 @@
 #include <konq_operations.h>
 
 #include <QPointer>
+#include <QMenu>
 
 #include <KActionCollection>
 #include <KActionMenu>
 #include <kitemviews/kfileitemmodel.h>
 #include <KLocalizedString>
-#include <QMenu>
 #include <KNewFileMenu>
 #include <KSelectAction>
 #include <KToggleAction>
diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index 58cdb54160..bf664f7317 100644
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -23,8 +23,6 @@
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #include "libdolphin_export.h"
-#include <KActionMenu>
-#include <KSelectAction>
 #include "views/dolphinview.h"
 #include <QObject>
 
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 82c4c8b9da..458b9ef794 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -22,19 +22,17 @@
 #include <KLineEdit>
 #include <KLocalizedString>
 #include <KJobWidgets>
-#include <KJobUiDelegate>
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
-#include <KStringHandler>
 #include <kstringhandler_deprecated.h> //TODO port to QCollator
 #include <knuminput.h>
 #include <kmimetype.h>
+#include <KJobUiDelegate>
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QMimeDatabase>
-#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <KGuiItem>
diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index afb1a32d30..11b9ecd1d0 100644
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -23,16 +23,15 @@
 
 #include <KColorScheme>
 #include <KSeparator>
-#include <KWindowSystem>
 // For the blurred tooltip background
 #include <KWindowEffects>
 #include <KStringHandler>
+#include <QTextDocument>
 
 #include <QLabel>
 #include <QStyleOptionFrame>
 #include <QStylePainter>
 #include <QVBoxLayout>
-#include <QTextDocument>
 #include <QTextLayout>
 #include <QTextLine>
 
diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index 25fa8e0ed4..0636df795b 100644
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -28,8 +28,6 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLayout>
-#include <QScrollArea>
-#include <QScrollBar>
 #include <QStyle>
 #include <QTimer>
 
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index dca99ed117..ca8ef3bbc2 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -31,7 +31,6 @@
 #include "updateitemstatesthread.h"
 
 #include <QFile>
-#include <QMutexLocker>
 #include <QTimer>
 
 VersionControlObserver::VersionControlObserver(QObject* parent) :
diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index 562a599d25..b9ab134273 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -26,7 +26,6 @@
 #include <KUrl>
 #include <kversioncontrolplugin2.h>
 #include <QList>
-#include <QMutex>
 #include <QObject>
 #include <QString>
 
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 06097977da..100b1ad2d5 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -23,12 +23,11 @@
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
 
-#include <KComponentData>
-#include <KLocalizedString>
 #include <KUrl>
 #include <KDebug>
 #include <KGlobal>
 
+#include <KComponentData>
 #include <QCryptographicHash>
 #include <QDate>
 #include <QFile>