diff --git a/autotests/kextracolumnsproxymodeltest.cpp b/autotests/kextracolumnsproxymodeltest.cpp
index b0e052d..75fe9a6 100644
--- a/autotests/kextracolumnsproxymodeltest.cpp
+++ b/autotests/kextracolumnsproxymodeltest.cpp
@@ -22,7 +22,6 @@
 #include <QSignalSpy>
 #include <QSortFilterProxyModel>
 #include <QTest>
-#include <QDebug>
 #include <QStandardItemModel>
 #include <QTreeView>
 
diff --git a/autotests/krearrangecolumnsproxymodeltest.cpp b/autotests/krearrangecolumnsproxymodeltest.cpp
index 9ed219d..e14e316 100644
--- a/autotests/krearrangecolumnsproxymodeltest.cpp
+++ b/autotests/krearrangecolumnsproxymodeltest.cpp
@@ -19,7 +19,6 @@
 */
 
 #include <QSignalSpy>
-#include <QSortFilterProxyModel>
 #include <QTest>
 #include <QDebug>
 #include <QStandardItemModel>
diff --git a/autotests/kselectionproxymodel_smoketest.cpp b/autotests/kselectionproxymodel_smoketest.cpp
index 6903e92..b9a2344 100644
--- a/autotests/kselectionproxymodel_smoketest.cpp
+++ b/autotests/kselectionproxymodel_smoketest.cpp
@@ -19,9 +19,6 @@
 
 #include "kselectionproxymodeltestsuite.h"
 
-#include <QApplication>
-#include <QTimer>
-#include <QtTest>
 
 #include <kselectionproxymodel.h>
 
diff --git a/autotests/proxymodeltestsuite/dynamictreemodel.cpp b/autotests/proxymodeltestsuite/dynamictreemodel.cpp
index 8d6f933..d727607 100644
--- a/autotests/proxymodeltestsuite/dynamictreemodel.cpp
+++ b/autotests/proxymodeltestsuite/dynamictreemodel.cpp
@@ -21,7 +21,6 @@
 
 #include <QHash>
 #include <QList>
-#include <QTimer>
 #include <QMimeData>
 
 #include <QDebug>
diff --git a/autotests/proxymodeltestsuite/dynamictreemodel.h b/autotests/proxymodeltestsuite/dynamictreemodel.h
index c2894de..046849b 100644
--- a/autotests/proxymodeltestsuite/dynamictreemodel.h
+++ b/autotests/proxymodeltestsuite/dynamictreemodel.h
@@ -25,7 +25,6 @@
 #include <QHash>
 #include <QList>
 
-#include <QDebug>
 
 #include "indexfinder.h"
 
diff --git a/autotests/proxymodeltestsuite/dynamictreewidget.cpp b/autotests/proxymodeltestsuite/dynamictreewidget.cpp
index 9ddc4f0..23cd607 100644
--- a/autotests/proxymodeltestsuite/dynamictreewidget.cpp
+++ b/autotests/proxymodeltestsuite/dynamictreewidget.cpp
@@ -26,6 +26,7 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QDebug>
 
 #include "dynamictreemodel.h"
 
diff --git a/autotests/proxymodeltestsuite/eventloggerregister.cpp b/autotests/proxymodeltestsuite/eventloggerregister.cpp
index cac1532..b4d0456 100644
--- a/autotests/proxymodeltestsuite/eventloggerregister.cpp
+++ b/autotests/proxymodeltestsuite/eventloggerregister.cpp
@@ -23,7 +23,6 @@
 
 #include "modeleventlogger.h"
 
-#include <QDebug>
 
 EventLoggerRegister::~EventLoggerRegister()
 {
diff --git a/autotests/proxymodeltestsuite/modelcommander.cpp b/autotests/proxymodeltestsuite/modelcommander.cpp
index 87d98fc..72054fa 100644
--- a/autotests/proxymodeltestsuite/modelcommander.cpp
+++ b/autotests/proxymodeltestsuite/modelcommander.cpp
@@ -19,6 +19,7 @@
 
 #include "modelcommander.h"
 #include "dynamictreemodel.h"
+#include <QDebug>
 
 ModelCommander::ModelCommander(DynamicTreeModel *model, QObject *parent)
     : QObject(parent), m_model(model)
diff --git a/autotests/proxymodeltestsuite/modeleventlogger.h b/autotests/proxymodeltestsuite/modeleventlogger.h
index f279412..b84a302 100644
--- a/autotests/proxymodeltestsuite/modeleventlogger.h
+++ b/autotests/proxymodeltestsuite/modeleventlogger.h
@@ -23,7 +23,6 @@
 #define MODELEVENTLOGGER_H
 
 #include <QAbstractItemModel>
-#include <QIODevice>
 
 #include "proxymodeltestsuite_export.h"
 
diff --git a/autotests/proxymodeltestsuite/modeltest.cpp b/autotests/proxymodeltestsuite/modeltest.cpp
index 87e7f39..fe4d4e3 100644
--- a/autotests/proxymodeltestsuite/modeltest.cpp
+++ b/autotests/proxymodeltestsuite/modeltest.cpp
@@ -18,7 +18,6 @@
 
 #include "modeltest.h"
 
-#include <QtCore>
 #include <QtTest>
 
 /*!
diff --git a/autotests/proxymodeltestsuite/proxymodeltest.cpp b/autotests/proxymodeltestsuite/proxymodeltest.cpp
index 13231b2..6192ae5 100644
--- a/autotests/proxymodeltestsuite/proxymodeltest.cpp
+++ b/autotests/proxymodeltestsuite/proxymodeltest.cpp
@@ -21,7 +21,6 @@
 
 #include "dynamictreemodel.h"
 
-#include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
 
 #include "modelspy.h"
diff --git a/autotests/proxymodeltestsuite/proxymodeltest.h b/autotests/proxymodeltestsuite/proxymodeltest.h
index 14adeb1..576a32e 100644
--- a/autotests/proxymodeltestsuite/proxymodeltest.h
+++ b/autotests/proxymodeltestsuite/proxymodeltest.h
@@ -20,11 +20,8 @@
 #ifndef PROXY_MODEL_TEST_H
 #define PROXY_MODEL_TEST_H
 
-#include <QtTest>
-#include <QtCore>
-#include <QTestEvent>
-#include <QItemSelectionRange>
 #include <QAbstractProxyModel>
+#include <QtTest>
 
 #include "dynamictreemodel.h"
 #include "indexfinder.h"
diff --git a/src/kbreadcrumbselectionmodel.h b/src/kbreadcrumbselectionmodel.h
index 03dad88..799a256 100644
--- a/src/kbreadcrumbselectionmodel.h
+++ b/src/kbreadcrumbselectionmodel.h
@@ -23,7 +23,6 @@
 #define KBREADCRUMBSELECTIONMODEL_H
 
 #include <QItemSelectionModel>
-#include <QAbstractItemModel>
 
 #include "kitemmodels_export.h"
 
diff --git a/src/kdescendantsproxymodel.cpp b/src/kdescendantsproxymodel.cpp
index e21d77f..822edb2 100644
--- a/src/kdescendantsproxymodel.cpp
+++ b/src/kdescendantsproxymodel.cpp
@@ -23,8 +23,6 @@
 #include "kdescendantsproxymodel.h"
 
 #include <QStringList>
-#include <QTimer>
-#include <QDebug>
 
 #include "kbihash_p.h"
 
diff --git a/src/klinkitemselectionmodel.h b/src/klinkitemselectionmodel.h
index f2abf0d..218c9d2 100644
--- a/src/klinkitemselectionmodel.h
+++ b/src/klinkitemselectionmodel.h
@@ -25,7 +25,6 @@
 #define KLINKITEMSELECTIONMODEL_H
 
 #include <QItemSelectionModel>
-#include <QAbstractProxyModel>
 
 #include "kitemmodels_export.h"
 
diff --git a/src/kselectionproxymodel.cpp b/src/kselectionproxymodel.cpp
index c1acd65..c4dd893 100644
--- a/src/kselectionproxymodel.cpp
+++ b/src/kselectionproxymodel.cpp
@@ -21,7 +21,6 @@
 
 #include "kselectionproxymodel.h"
 
-#include <QStack>
 #include <QStringList>
 #include <QPointer>
 #include <QItemSelectionRange>
@@ -30,7 +29,6 @@
 #include "kbihash_p.h"
 #include "kvoidpointerfactory_p.h"
 
-#include <QDebug>
 
 typedef KBiHash<QPersistentModelIndex, QModelIndex> SourceProxyIndexMapping;
 typedef KBiHash<void *, QModelIndex> ParentMapping;
diff --git a/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp b/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp
index a60a197..9a27e24 100644
--- a/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp
+++ b/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp
@@ -23,10 +23,10 @@
 
 #include <dynamictreemodel.h>
 #include <kbreadcrumbselectionmodel.h>
-#include <QBoxLayout>
 #include <QSplitter>
 #include <QTreeView>
 #include <QEvent>
+#include <QHBoxLayout>
 
 BreadcrumbDirectionWidget::BreadcrumbDirectionWidget(QWidget *parent, Qt::WindowFlags f)
     : QWidget(parent, f)
diff --git a/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp b/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
index a96d003..a23207d 100644
--- a/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
+++ b/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp
@@ -27,7 +27,7 @@
 #include <QSplitter>
 #include <QListView>
 #include <QTreeView>
-#include <QBoxLayout>
+#include <QHBoxLayout>
 
 #include "kselectionproxymodel.h"
 #include "kbreadcrumbselectionmodel.h"
diff --git a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h
index cf404ce..51f7378 100644
--- a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h
+++ b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h
@@ -25,7 +25,6 @@
 #include <QWidget>
 #include <QItemSelection>
 #include <QLabel>
-#include <QListView>
 #include <kselectionproxymodel.h>
 
 #include "klinkitemselectionmodel.h"
diff --git a/tests/proxymodeltestapp/breadcrumbswidget.cpp b/tests/proxymodeltestapp/breadcrumbswidget.cpp
index 79c6704..1041920 100644
--- a/tests/proxymodeltestapp/breadcrumbswidget.cpp
+++ b/tests/proxymodeltestapp/breadcrumbswidget.cpp
@@ -27,7 +27,7 @@
 #include <QSplitter>
 #include <QListView>
 #include <QTreeView>
-#include <QBoxLayout>
+#include <QHBoxLayout>
 
 #include "kselectionproxymodel.h"
 #include "kbreadcrumbselectionmodel.h"
diff --git a/tests/proxymodeltestapp/breadcrumbswidget.h b/tests/proxymodeltestapp/breadcrumbswidget.h
index 4bb23f6..dc7bc60 100644
--- a/tests/proxymodeltestapp/breadcrumbswidget.h
+++ b/tests/proxymodeltestapp/breadcrumbswidget.h
@@ -24,8 +24,6 @@
 
 #include <QWidget>
 #include <QItemSelection>
-#include <QLabel>
-#include <QListView>
 #include <kselectionproxymodel.h>
 
 #include "klinkitemselectionmodel.h"
diff --git a/tests/proxymodeltestapp/descendantpmwidget.cpp b/tests/proxymodeltestapp/descendantpmwidget.cpp
index cc23974..0d9e272 100644
--- a/tests/proxymodeltestapp/descendantpmwidget.cpp
+++ b/tests/proxymodeltestapp/descendantpmwidget.cpp
@@ -29,7 +29,6 @@
 #include "kdescendantsproxymodel.h"
 #include <QHBoxLayout>
 #include <QLineEdit>
-#include <QApplication>
 
 #include "modeleventlogger.h"
 
diff --git a/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp b/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp
index d6f7628..313a57b 100644
--- a/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp
+++ b/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp
@@ -23,11 +23,10 @@
 
 #include <dynamictreemodel.h>
 #include <kbreadcrumbselectionmodel.h>
-#include <QBoxLayout>
 #include <QSplitter>
 #include <QTreeView>
-#include <QEvent>
 #include <QIdentityProxyModel>
+#include <QHBoxLayout>
 
 #include "dynamictreewidget.h"
 
diff --git a/tests/proxymodeltestapp/kreparentingproxymodel.cpp b/tests/proxymodeltestapp/kreparentingproxymodel.cpp
index 2fe53dd..9ada95e 100644
--- a/tests/proxymodeltestapp/kreparentingproxymodel.cpp
+++ b/tests/proxymodeltestapp/kreparentingproxymodel.cpp
@@ -19,7 +19,6 @@
 
 #include "kreparentingproxymodel.h"
 #include <QDebug>
-#include <QStack>
 
 #include <functional>
 #include <algorithm>
diff --git a/tests/proxymodeltestapp/mainwindow.cpp b/tests/proxymodeltestapp/mainwindow.cpp
index c4568df..8c68c1f 100644
--- a/tests/proxymodeltestapp/mainwindow.cpp
+++ b/tests/proxymodeltestapp/mainwindow.cpp
@@ -21,7 +21,6 @@
 
 #include "mainwindow.h"
 
-#include <QSplitter>
 #include <QTabWidget>
 
 #include "dynamictreemodel.h"
diff --git a/tests/proxymodeltestapp/proxymodeltestwidget.cpp b/tests/proxymodeltestapp/proxymodeltestwidget.cpp
index befc700..d8aae97 100644
--- a/tests/proxymodeltestapp/proxymodeltestwidget.cpp
+++ b/tests/proxymodeltestapp/proxymodeltestwidget.cpp
@@ -23,8 +23,8 @@
 
 #include <QSplitter>
 #include <QTreeView>
-#include <QHBoxLayout>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 #include "modelcommander.h"
 #include "dynamictreemodel.h"
diff --git a/tests/proxymodeltestapp/scriptablereparentingwidget.cpp b/tests/proxymodeltestapp/scriptablereparentingwidget.cpp
index 50a1269..c6d24a6 100644
--- a/tests/proxymodeltestapp/scriptablereparentingwidget.cpp
+++ b/tests/proxymodeltestapp/scriptablereparentingwidget.cpp
@@ -24,7 +24,6 @@
 #include <QVBoxLayout>
 #include <QScriptEngine>
 
-#include <QDebug>
 #include <QLabel>
 #include <QSplitter>
 #include <QComboBox>
diff --git a/tests/proxymodeltestapp/statesaverwidget.cpp b/tests/proxymodeltestapp/statesaverwidget.cpp
index 12d59bf..2799153 100644
--- a/tests/proxymodeltestapp/statesaverwidget.cpp
+++ b/tests/proxymodeltestapp/statesaverwidget.cpp
@@ -22,7 +22,6 @@
 #include "statesaverwidget.h"
 
 #include <QSplitter>
-#include <QBoxLayout>
 #include <QTreeView>
 #include <QApplication>