diff --git a/src/plugins/qttest/dialogs.cpp b/src/plugins/qttest/dialogs.cpp
index 718212f3473c20943605db58564fd04386465eb6..8cda83ded58bc3a0f463ce0c01b389c63d782f4b 100644
--- a/src/plugins/qttest/dialogs.cpp
+++ b/src/plugins/qttest/dialogs.cpp
@@ -34,10 +34,7 @@
 #include "qsystem.h"
 
 #include <QTimer>
-#include <QMessageBox>
-#include <QFileDialog>
 #include <QAbstractItemView>
-#include <QHeaderView>
 #include <QTableWidgetItem>
 #include <QResizeEvent>
 #include <QScrollBar>
diff --git a/src/plugins/qttest/newtestcasedlg.cpp b/src/plugins/qttest/newtestcasedlg.cpp
index fcc669343443cd4c70bd9ccce7f0ded87b244fb7..96b33de86a6ad0e9dd8927f00ef31a168a24acff 100644
--- a/src/plugins/qttest/newtestcasedlg.cpp
+++ b/src/plugins/qttest/newtestcasedlg.cpp
@@ -34,11 +34,9 @@
 #include "ui_newtestcasedlg.h"
 #include "testgenerator.h"
 
-#include <QPushButton>
 #include <QFileDialog>
 #include <QRegExpValidator>
 #include <QRegExp>
-#include <QDir>
 #include <QDebug>
 
 NewTestCaseDlg::NewTestCaseDlg(const QString &path, QWidget *parent) :
diff --git a/src/plugins/qttest/qsystem.cpp b/src/plugins/qttest/qsystem.cpp
index f343482a5c0a6b1f02b89ef492809dca77a9baa6..266a4e0971fa43e2231b1f9b14f25173c94e6633 100644
--- a/src/plugins/qttest/qsystem.cpp
+++ b/src/plugins/qttest/qsystem.cpp
@@ -32,13 +32,8 @@
 
 #include "qsystem.h"
 
-#include <QApplication>
-#include <QProcess>
 #include <QFile>
 #include <QDir>
-#include <QDateTime>
-#include <QtNetwork/QUdpSocket>
-#include <QTimer>
 #include <QHostInfo>
 
 #include <stdlib.h>
diff --git a/src/plugins/qttest/qttestplugin.cpp b/src/plugins/qttest/qttestplugin.cpp
index 30fecaa7cbf084ae82b4b7e657fe4abd4e804e64..b7518a7f34acf86318f2af075564376ed1e25d0f 100644
--- a/src/plugins/qttest/qttestplugin.cpp
+++ b/src/plugins/qttest/qttestplugin.cpp
@@ -40,6 +40,7 @@
 #include "testcontextmenu.h"
 #include "testsuite.h"
 #include "testoutputwindow.h"
+#include "testconfigurations.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -60,6 +61,7 @@
 #include <utils/linecolumnlabel.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerrunner.h>
 #include <debugger/debuggerengine.h>
@@ -69,12 +71,9 @@
 # include <debugger/qtuitest/qtuitestengine.h>
 #endif
 
-#include <QtCore/QDebug>
 #include <QtCore/QtPlugin>
-#include <QtGui/QAction>
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
 #include <QMenuBar>
 #include <QDebug>
 #include <QToolButton>
diff --git a/src/plugins/qttest/qttestplugin.h b/src/plugins/qttest/qttestplugin.h
index d54459011f9ed6964b93e72e2760d142a8e45745..e6ab36b3b68bb0cd7879711ea4aa0154c116f4e6 100644
--- a/src/plugins/qttest/qttestplugin.h
+++ b/src/plugins/qttest/qttestplugin.h
@@ -35,9 +35,9 @@
 
 #include "testsuite.h"
 
+#include <projectexplorer/project.h>
 #include <coreplugin/inavigationwidgetfactory.h>
 #include <extensionsystem/iplugin.h>
-#include <QtCore/QObject>
 
 class TestContextMenu;
 class TestResultsWindow;
diff --git a/src/plugins/qttest/resultsview.cpp b/src/plugins/qttest/resultsview.cpp
index 89be797c8bde22b30293088f0531708b11d62b07..6f7b977e19059bcf0f4ca665a1f87c842fb4b80e 100644
--- a/src/plugins/qttest/resultsview.cpp
+++ b/src/plugins/qttest/resultsview.cpp
@@ -42,7 +42,6 @@
 
 #include <QHeaderView>
 #include <QResizeEvent>
-#include <QSize>
 #include <QTimer>
 #include <QFileInfo>
 #include <QDesktopServices>
diff --git a/src/plugins/qttest/resultsview.h b/src/plugins/qttest/resultsview.h
index dc03a05ae5276724ccfbb5aa0d03ae93ad49ed7d..2e53672af29d986efbcc5eb714abca43490134c1 100644
--- a/src/plugins/qttest/resultsview.h
+++ b/src/plugins/qttest/resultsview.h
@@ -39,7 +39,6 @@
 #include <coreplugin/ioutputpane.h>
 
 #include <QTableWidget>
-#include <QBrush>
 
 class ResultsView;
 class TestResultsWindow;
diff --git a/src/plugins/qttest/testcode.cpp b/src/plugins/qttest/testcode.cpp
old mode 100755
new mode 100644
index f57cfe7b539ddc328fe75f2610cdd7781253bbc8..252eb6d31b47b784f9fc6d519cb46f8072c64ffa
--- a/src/plugins/qttest/testcode.cpp
+++ b/src/plugins/qttest/testcode.cpp
@@ -70,8 +70,6 @@
 #include <QIODevice>
 #include <QRegExp>
 #include <QDebug>
-#include <QMessageBox>
-#include <QMetaMethod>
 
 class SystemTestCodeSync : protected QmlJS::AST::Visitor
 {
diff --git a/src/plugins/qttest/testcode.h b/src/plugins/qttest/testcode.h
old mode 100755
new mode 100644
index 3187b40035fbdc4ea2bbf0c19b77f22d477fff82..f81ebe7456e5732b2c49c536936f609bdc9c5456
--- a/src/plugins/qttest/testcode.h
+++ b/src/plugins/qttest/testcode.h
@@ -33,17 +33,13 @@
 #ifndef TESTCODE_H
 #define TESTCODE_H
 
-#include "testconfigurations.h"
-
 #include <qmljs/qmljsdocument.h>
 #include <cplusplus/CppDocument.h>
 
-#include <QStringList>
-#include <QDate>
+#include <QDateTime>
 #include <QPointer>
 #include <QTimer>
 
-class QVConfig;
 class TestCollectionPrivate;
 
 namespace Core {
diff --git a/src/plugins/qttest/testconfigurations.cpp b/src/plugins/qttest/testconfigurations.cpp
old mode 100755
new mode 100644
index 2d8dc483fb59e0fc4aa702f75cb3c031f40ab649..26c2d492fb4515674a6c254855db6cbf08a9d728
--- a/src/plugins/qttest/testconfigurations.cpp
+++ b/src/plugins/qttest/testconfigurations.cpp
@@ -53,7 +53,6 @@
 #include <QDir>
 #include <QProcess>
 #include <QMessageBox>
-#include <QApplication>
 #include <QRegExp>
 #include <QStringList>
 #include <QDebug>
diff --git a/src/plugins/qttest/testconfigurations.h b/src/plugins/qttest/testconfigurations.h
old mode 100755
new mode 100644
index 57eae2bace84f0840f9876fa279348f3e8d4212d..ace54700e77931a491a5ce490f242088919a1225
--- a/src/plugins/qttest/testconfigurations.h
+++ b/src/plugins/qttest/testconfigurations.h
@@ -33,14 +33,9 @@
 #ifndef TESTCONFIGURATIONS_H
 #define TESTCONFIGURATIONS_H
 
-#ifndef QTTEST_PLUGIN_LEAN
-# include "testcontrol.h"
-#endif
-
-#include "projectexplorer/project.h"
-#include <../../libs/utils/ssh/sshconnection.h>
+#include <projectexplorer/project.h>
+#include <utils/ssh/sshconnection.h>
 
-#include <QStringList>
 #include <QPointer>
 #include <QTimer>
 
diff --git a/src/plugins/qttest/testcontextmenu.cpp b/src/plugins/qttest/testcontextmenu.cpp
index 03332312361db0514562b77e776a86fb6b278df9..f82359ae2ef8f02e2a507c653d17121b21ae5902 100644
--- a/src/plugins/qttest/testcontextmenu.cpp
+++ b/src/plugins/qttest/testcontextmenu.cpp
@@ -44,6 +44,8 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 
+#include <QDir>
+
 TestContextMenuPrivate *TestContextMenu::m_instance = 0;
 int TestContextMenu::m_refCount = 0;
 
diff --git a/src/plugins/qttest/testcontextmenu.h b/src/plugins/qttest/testcontextmenu.h
old mode 100755
new mode 100644
index 15f630b60118cadd86708b9b1a6b79f853a3f06e..834e1cbe428045dc0c313256852d46e24c36086b
--- a/src/plugins/qttest/testcontextmenu.h
+++ b/src/plugins/qttest/testcontextmenu.h
@@ -35,11 +35,6 @@
 
 #include "testsettings.h"
 
-#include "extensionsystem/iplugin.h"
-#include "projectexplorer/projectexplorer.h"
-
-#include <QString>
-
 namespace Core {
 class IEditor;
 }
diff --git a/src/plugins/qttest/testexecuter.cpp b/src/plugins/qttest/testexecuter.cpp
index f85201d14b33b556f7e74be7fbec327751919171..9003d980bd28086b8870ff1766b35e1d42c23752 100644
--- a/src/plugins/qttest/testexecuter.cpp
+++ b/src/plugins/qttest/testexecuter.cpp
@@ -33,7 +33,6 @@
 #include "testexecuter.h"
 #include "testgenerator.h"
 #include "qsystem.h"
-#include "testcode.h"
 #include "testsuite.h"
 #include "testoutputwindow.h"
 #include "resultsview.h"
@@ -57,9 +56,7 @@
 #include <sys/types.h>
 #include <signal.h>
 
-#include <QApplication>
 #include <QDir>
-#include <QBuffer>
 #include <QTimer>
 #include <QProcess>
 #include <QMessageBox>
diff --git a/src/plugins/qttest/testexecuter.h b/src/plugins/qttest/testexecuter.h
index 8b891d02058a35b85be881e1e3fcc8a5a0a95b6c..552b863ee312a3aa9aff4101cec9945eaf6a74b9 100644
--- a/src/plugins/qttest/testexecuter.h
+++ b/src/plugins/qttest/testexecuter.h
@@ -47,6 +47,7 @@
 
 #include <QtCore/QFutureWatcher>
 #include <QProcess>
+#include <QVariantMap>
 
 #define NO_X_SERVER_AVAILABLE "No X-server available for testing"
 #define COMPILE_ERROR "Compile error"
diff --git a/src/plugins/qttest/testgenerator.cpp b/src/plugins/qttest/testgenerator.cpp
index e3d34423eacae798d2b1595f7b10b2783e1a6e3e..b09e5eedc2fb7646623cd6fbf772dd1ffb19cfdf 100644
--- a/src/plugins/qttest/testgenerator.cpp
+++ b/src/plugins/qttest/testgenerator.cpp
@@ -37,7 +37,6 @@
 #include <QFile>
 #include <QTextStream>
 #include <QDir>
-#include <QDateTime>
 #include <QMessageBox>
 #include <QDebug>
 
diff --git a/src/plugins/qttest/testresultuploader.cpp b/src/plugins/qttest/testresultuploader.cpp
index 2d335c2989bcd256548c052c59832bbd4dd9e809..4c29f2dd3f9f4246db7369c8a0552f158efa544c 100644
--- a/src/plugins/qttest/testresultuploader.cpp
+++ b/src/plugins/qttest/testresultuploader.cpp
@@ -33,6 +33,7 @@
 #include "testresultuploader.h"
 #include "testoutputwindow.h"
 #include "qsystem.h"
+#include "testconfigurations.h"
 
 #include <QFileInfo>
 #include <QTextEdit>
diff --git a/src/plugins/qttest/testresultuploader.h b/src/plugins/qttest/testresultuploader.h
index b76671f99f11a8789c83985afa3fdd389cee94b8..c04865351f3790d70be1310faa9f4e5e68eac939 100644
--- a/src/plugins/qttest/testresultuploader.h
+++ b/src/plugins/qttest/testresultuploader.h
@@ -34,10 +34,12 @@
 #define TESTRESULTUPLOADER_H
 
 #include "testsettings.h"
-#include "testconfigurations.h"
 
 #include <QObject>
 #include <QProcess>
+#include <QFile>
+
+class TestConfig;
 
 class TestResultUploader : public QObject
 {
diff --git a/src/plugins/qttest/testselector.cpp b/src/plugins/qttest/testselector.cpp
index 849a645c118d0c72e7e6dedfd5f00d6aabb34181..8f36e83ed298b3f26108c27bcee2b38338894293 100644
--- a/src/plugins/qttest/testselector.cpp
+++ b/src/plugins/qttest/testselector.cpp
@@ -54,23 +54,12 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
 
-#include <QHeaderView>
 #include <QDir>
 #include <QPixmap>
 #include <QStringList>
-#include <QApplication>
-#include <QMessageBox>
 #include <QMouseEvent>
-#include <QTextStream>
-#include <QKeySequence>
-#include <QMenuBar>
 #include <QMenu>
-#include <QProcess>
 #include <QDebug>
-#include <QLabel>
-#include <QLineEdit>
-#include <QRadioButton>
-#include <QContextMenuEvent>
 
 static const char *childAssigned_xpm[] = {
     "8 8 3 1",
diff --git a/src/plugins/qttest/testsettings.cpp b/src/plugins/qttest/testsettings.cpp
old mode 100755
new mode 100644
diff --git a/src/plugins/qttest/testsettings.h b/src/plugins/qttest/testsettings.h
old mode 100755
new mode 100644
index da22944ce768d817a328df206c35f37301ed8181..b01b1fc3fe9de77cad49a11f2825e7ab95c925f6
--- a/src/plugins/qttest/testsettings.h
+++ b/src/plugins/qttest/testsettings.h
@@ -34,7 +34,6 @@
 #define TESTSETTINGS_H
 
 #include <QObject>
-#include <QString>
 
 // class TestSettingsPrivate;
 class TestSettingsPrivate : public QObject
diff --git a/src/plugins/qttest/testsettingspropertiespage.cpp b/src/plugins/qttest/testsettingspropertiespage.cpp
index fc49d7cbff5e4febadcb3aeb26c70ee6fec03e70..33188f00f74c58dd40f27a9c86fd51b274404e4e 100644
--- a/src/plugins/qttest/testsettingspropertiespage.cpp
+++ b/src/plugins/qttest/testsettingspropertiespage.cpp
@@ -35,12 +35,8 @@
 
 #include <projectexplorer/project.h>
 
-#include <QtCore/QTextCodec>
-#include <QDebug>
-#include <QPlainTextEdit>
-#include <QMessageBox>
 #include <QFileDialog>
-#include <QRegExp>
+#include <QDebug>
 
 using namespace QtTest;
 using namespace QtTest::Internal;
diff --git a/src/plugins/qttest/testsettingspropertiespage.h b/src/plugins/qttest/testsettingspropertiespage.h
index 8c41a82fd3f6bb218a1e43aaa0e08a94bac0cf18..866f27e4ed605f581c6916a3d9ded00ab374d025 100644
--- a/src/plugins/qttest/testsettingspropertiespage.h
+++ b/src/plugins/qttest/testsettingspropertiespage.h
@@ -34,11 +34,9 @@
 #define TESTSETTINGSPROPERTIESPAGE_H
 
 #include "testsettings.h"
+#include "ui_testsettingspropertiespage.h"
 
 #include <projectexplorer/iprojectproperties.h>
-#include <ui_testsettingspropertiespage.h>
-
-#include <QStringList>
 
 class TestConfig;