Clean headers in Qt4ProjectManager.

Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I53fa1aafaf98fd3105ef35b595e4311854cf9cbc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

68 files changed, 2 insertions, 271 deletions

diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp
index c55e3dfb56..63eaa4d278 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp
@@ -30,7 +30,6 @@
 #include "classdefinition.h"
 
 #include <QFileInfo>
-#include <QFileDialog>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
index 9d09d25c9b..e955d171d2 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
@@ -35,8 +35,6 @@
 #include <QMessageBox>
 #include <QStandardItemModel>
 #include <QStandardItem>
-#include <QLabel>
-#include <QToolButton>
 
 #include <QDebug>
 #include <QRegExp>
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
index 140db480f4..bf2342bb35 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
@@ -29,7 +29,6 @@
 
 #include "customwidgetpluginwizardpage.h"
 #include "customwidgetwidgetswizardpage.h"
-#include "pluginoptions.h"
 #include "ui_customwidgetpluginwizardpage.h"
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
index 499d46051b..3caf1938d4 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
@@ -29,12 +29,10 @@
 
 #include "customwidgetwidgetswizardpage.h"
 #include "ui_customwidgetwidgetswizardpage.h"
-#include "plugingenerator.h"
 #include "classdefinition.h"
 
 #include <coreplugin/coreconstants.h>
 
-#include <QFileInfo>
 #include <QTimer>
 
 #include <QStackedLayout>
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
index 7a2edd86d5..f53ca00ade 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
@@ -30,8 +30,8 @@
 #include "customwidgetwizard.h"
 #include "customwidgetwizarddialog.h"
 #include "plugingenerator.h"
-#include "pluginoptions.h"
 #include "filenamingparameters.h"
+#include "pluginoptions.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
index e818f7738a..c3241c97f9 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
@@ -30,12 +30,9 @@
 #include "customwidgetwizarddialog.h"
 #include "customwidgetwidgetswizardpage.h"
 #include "customwidgetpluginwizardpage.h"
-#include "customwidgetwizard.h"
+#include "pluginoptions.h"
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/kitmanager.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 
diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp
index 6ca97245f8..a39e0b1bf9 100644
--- a/src/plugins/qt4projectmanager/externaleditors.cpp
+++ b/src/plugins/qt4projectmanager/externaleditors.cpp
@@ -37,11 +37,9 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/session.h>
 #include <qtsupport/qtkitinformation.h>
-#include <qtsupport/qtversionmanager.h>
 #include <designer/designerconstants.h>
 
 #include <QProcess>
-#include <QFileInfo>
 #include <QDebug>
 #include <QSignalMapper>
 
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
index ca6dfb5535..abc528e4ca 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
@@ -39,7 +39,6 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
-#include <projectexplorer/buildconfiguration.h>
 #include <utils/hostosinfo.h>
 
 #include <QFileInfo>
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.h b/src/plugins/qt4projectmanager/librarydetailscontroller.h
index 968fa4cf4b..6390b17b24 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.h
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.h
@@ -30,7 +30,6 @@
 #ifndef LIBRARYDETAILSCONTROLLER_H
 #define LIBRARYDETAILSCONTROLLER_H
 
-#include <QWidget>
 #include "addlibrarywizard.h"
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 600f346b55..9d290202c7 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -40,13 +40,8 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/task.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcprocess.h>
-#include <qtsupport/qtparser.h>
-#include <qtsupport/qtkitinformation.h>
 
 #include <QDir>
 #include <QFileInfo>
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index c4f41ded17..b09ceecbe0 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -33,7 +33,6 @@
 #include "qt4projectmanager_global.h"
 
 #include <projectexplorer/abstractprocessstep.h>
-#include <projectexplorer/buildstep.h>
 
 namespace ProjectExplorer {
 class BuildStep;
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index 3b0bdb4714..c9d3f0a599 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -30,17 +30,11 @@
 #include "profileeditor.h"
 
 #include "profilehighlighter.h"
-#include "qt4projectmanager.h"
 #include "qt4projectmanagerconstants.h"
 #include "profileeditorfactory.h"
 
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditoractionhandler.h>
-#include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <QFileInfo>
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index dbe3de98e9..20ddbfa621 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -34,14 +34,9 @@
 #include "profileeditor.h"
 
 #include <coreplugin/fileiconprovider.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <QCoreApplication>
-#include <QFileInfo>
-#include <QAction>
-#include <QMenu>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/profilehighlighter.cpp b/src/plugins/qt4projectmanager/profilehighlighter.cpp
index 0a0ccc4938..01ef269347 100644
--- a/src/plugins/qt4projectmanager/profilehighlighter.cpp
+++ b/src/plugins/qt4projectmanager/profilehighlighter.cpp
@@ -32,10 +32,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <QRegExp>
-#include <QColor>
 #include <QTextDocument>
-#include <QTextEdit>
 
 using namespace Qt4ProjectManager::Internal;
 
diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp
index 2aab3a4aad..1d900c3153 100644
--- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp
+++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp
@@ -31,16 +31,10 @@
 #include "profileeditor.h"
 #include "profilecompletionassist.h"
 
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/helpmanager.h>
 #include <extensionsystem/pluginmanager.h>
-#include <texteditor/itexteditor.h>
-#include <texteditor/basetexteditor.h>
-#include <texteditor/helpitem.h>
 #include <utils/htmldocextractor.h>
 
-#include <QTextCursor>
 #include <QTextBlock>
 #include <QUrl>
 
diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
index 26d2e358e8..fe4814b339 100644
--- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
@@ -29,12 +29,8 @@
 
 #include "qmakekitconfigwidget.h"
 
-#include "qt4projectmanagerconstants.h"
 #include "qmakekitinformation.h"
 
-#include <coreplugin/icore.h>
-#include <projectexplorer/projectexplorerconstants.h>
-
 #include <utils/fileutils.h>
 
 #include <QLineEdit>
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
index e3e6918cbe..9e95506691 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
@@ -35,7 +35,6 @@
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/qmakeparser.cpp b/src/plugins/qt4projectmanager/qmakeparser.cpp
index e0f544be77..37dfaf3557 100644
--- a/src/plugins/qt4projectmanager/qmakeparser.cpp
+++ b/src/plugins/qt4projectmanager/qmakeparser.cpp
@@ -28,11 +28,9 @@
 ****************************************************************************/
 
 #include "qmakeparser.h"
-#include "qt4projectmanagerconstants.h"
 
 #include <projectexplorer/task.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <utils/qtcassert.h>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
index acdae762bd..7a578cf1ed 100644
--- a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
+++ b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
@@ -30,8 +30,6 @@
 #include "qmakerunconfigurationfactory.h"
 
 #include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/target.h>
-#include <qtsupport/customexecutablerunconfiguration.h>
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 77c298ac68..8a66c8872a 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -30,39 +30,28 @@
 #include "qmakestep.h"
 #include "ui_qmakestep.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
 #include "qmakeparser.h"
 #include "qt4buildconfiguration.h"
 #include "qt4project.h"
 #include "qt4projectmanagerconstants.h"
-#include "qt4projectmanager.h"
 #include "qmakekitinformation.h"
 #include "qt4nodes.h"
 
-#include <utils/fileutils.h>
-
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
 
 #include <coreplugin/icore.h>
-#include <coreplugin/mainwindow.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/messagemanager.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/debugginghelperbuildtask.h>
 #include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
 #include <QDir>
-#include <QFile>
 #include <utils/runextensions.h>
-#include <QtConcurrentRun>
 #include <QMessageBox>
 
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index 0d6204c42e..deab7c39cb 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -28,15 +28,11 @@
 ****************************************************************************/
 
 #include "desktopqtversion.h"
-#include "../qt4projectmanagerconstants.h"
 
 #include <qtsupport/qtsupportconstants.h>
-#include <proparser/profileevaluator.h>
 #include <coreplugin/featureprovider.h>
 
 #include <QCoreApplication>
-#include <QDir>
-#include <QFileInfoList>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
index b31c909e52..41586f88de 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp
@@ -28,9 +28,6 @@
 ****************************************************************************/
 #include "desktopqtversionfactory.h"
 #include "desktopqtversion.h"
-#include "../qt4projectmanagerconstants.h"
-
-#include <qtsupport/qtversionmanager.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <QFileInfo>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index c9cce8dc0a..97f7fcc1f8 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -29,39 +29,24 @@
 
 #include "qt4runconfiguration.h"
 
-#include "../makestep.h"
 #include "../qt4nodes.h"
 #include "../qt4project.h"
 #include "../qt4buildconfiguration.h"
-#include "../qt4projectmanagerconstants.h"
-#include "../qmakestep.h"
 
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/variablemanager.h>
-#include <coreplugin/idocument.h>
-#include <coreplugin/helpmanager.h>
-#include <projectexplorer/buildstep.h>
 #include <projectexplorer/environmentwidget.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/pathchooser.h>
 #include <utils/detailswidget.h>
 #include <utils/stringutils.h>
 #include <utils/persistentsettings.h>
-#include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/qtoutputformatter.h>
 #include <qtsupport/qtsupportconstants.h>
-#include <qtsupport/baseqtversion.h>
-#include <qtsupport/profilereader.h>
 #include <qtsupport/qtkitinformation.h>
 #include <utils/hostosinfo.h>
 
 #include <QFormLayout>
-#include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
 #include <QCheckBox>
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
index ce61c7baa3..2c83cf1be6 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
@@ -37,7 +37,6 @@
 #include <utils/environment.h>
 
 #include <QStringList>
-#include <QMetaType>
 #include <QLabel>
 #include <QWidget>
 
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
index e98c5dd22c..14bce0294f 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
@@ -28,15 +28,11 @@
 ****************************************************************************/
 
 #include "simulatorqtversion.h"
-#include "qt4projectmanagerconstants.h"
 
 #include <qtsupport/qtsupportconstants.h>
-#include <proparser/profileevaluator.h>
 #include <coreplugin/featureprovider.h>
 
 #include <QCoreApplication>
-#include <QDir>
-#include <QFileInfoList>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp
index a1d7876106..21e7b3bbe9 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "simulatorqtversionfactory.h"
-#include "qt4projectmanagerconstants.h"
 #include "simulatorqtversion.h"
 
 #include <qtsupport/qtsupportconstants.h>
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 90354fad92..ec061818f2 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -37,7 +37,6 @@
 #include "makestep.h"
 #include "buildconfigurationinfo.h"
 
-#include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <limits>
 #include <projectexplorer/buildsteplist.h>
@@ -45,10 +44,6 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
-#include <projectexplorer/kitinformation.h>
-#include <qtsupport/qtsupportconstants.h>
-#include <qtsupport/qtversionfactory.h>
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qt4projectmanager/qmakekitinformation.h>
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 372d619b05..0c34f545a4 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -32,13 +32,10 @@
 #include "qt4projectmanager.h"
 #include "qt4projectmanagerconstants.h"
 #include "qtuicodemodelsupport.h"
-#include "qmakestep.h"
 #include "qt4buildconfiguration.h"
 #include "qmakerunconfigurationfactory.h"
 
 #include <projectexplorer/nodesvisitor.h>
-#include <projectexplorer/runconfiguration.h>
-
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/fileiconprovider.h>
@@ -47,34 +44,24 @@
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
 
-#include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/CppDocument.h>
-#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/target.h>
 #include <qtsupport/profilereader.h>
 #include <qtsupport/qtkitinformation.h>
-#include <qtsupport/qtsupportconstants.h>
 
 #include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
 #include <utils/stringutils.h>
-#include <utils/fileutils.h>
 #include <proparser/prowriter.h>
-#include <utils/fileutils.h>
 #include <algorithm>
 
 #include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QCoreApplication>
 #include <QXmlStreamReader>
 
-#include <QPainter>
 #include <QMessageBox>
-#include <QPushButton>
 #include <utils/QtConcurrentTools>
 
 // Static cached data in struct Qt4NodeStaticData providing information and icons
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 91730715a0..aa1e6487b8 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -30,53 +30,32 @@
 #include "qt4project.h"
 
 #include "qt4projectmanager.h"
-#include "makestep.h"
 #include "qmakestep.h"
-#include "qmakerunconfigurationfactory.h"
 #include "qt4nodes.h"
-#include "qt4projectconfigwidget.h"
 #include "qt4projectmanagerconstants.h"
 #include "qt4buildconfiguration.h"
 #include "findqt4profiles.h"
 #include "buildconfigurationinfo.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
 #include <coreplugin/icontext.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/coreconstants.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/documentmanager.h>
-#include <coreplugin/variablemanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <cpptools/ModelManagerInterface.h>
-#include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljstools/qmljsmodelmanager.h>
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/headerpath.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmacroexpander.h>
-#include <utils/qtcassert.h>
-#include <qtsupport/customexecutablerunconfiguration.h>
-#include <qtsupport/qmldumptool.h>
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/profilereader.h>
 #include <qtsupport/qtkitinformation.h>
-#include <qtsupport/qtsupportconstants.h>
-#include <qtsupport/qtversionmanager.h>
-#include <utils/QtConcurrentTools>
-#include <utils/stringutils.h>
 
 #include <QDebug>
 #include <QDir>
 #include <QFileSystemWatcher>
-#include <QFileDialog>
-#include <QInputDialog>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 2621885ae0..c03ef7e960 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -36,7 +36,6 @@
 #include <projectexplorer/projectnodes.h>
 
 #include <QStringList>
-#include <QMap>
 #include <QFutureInterface>
 #include <QTimer>
 #include <QFuture>
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 74d0607129..ca78da73b9 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -29,33 +29,14 @@
 
 #include "qt4projectconfigwidget.h"
 
-#include "makestep.h"
-#include "qmakestep.h"
 #include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt4projectmanager.h"
 #include "qt4buildconfiguration.h"
 #include "qt4nodes.h"
 #include "ui_qt4projectconfigwidget.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
-
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
-#include <projectexplorer/task.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/buildconfiguration.h>
-#include <qtsupport/qtversionfactory.h>
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
-#include <qtsupport/qtsupportconstants.h>
-#include <qtsupport/qtversionmanager.h>
-#include <utils/qtcassert.h>
-#include <utils/qtcprocess.h>
-#include <extensionsystem/pluginmanager.h>
 
-#include <QPushButton>
 #include <utils/detailswidget.h>
 
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index b1c742f37e..f8063e13cf 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -40,24 +40,12 @@
 #include "wizards/qtquickapp.h"
 #include "wizards/html5app.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/basefilewizard.h>
-#include <coreplugin/id.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/session.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <utils/qtcassert.h>
-#include <qtsupport/profilereader.h>
-#include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
-#include <qtsupport/qtversionmanager.h>
 
-#include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
 #include <QVariant>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 530c888dfd..58352173d9 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -48,7 +48,6 @@
 #include "profilehoverhandler.h"
 #include "qt4projectmanagerconstants.h"
 #include "qt4project.h"
-#include "profileeditor.h"
 #include "externaleditors.h"
 #include "profilecompletionassist.h"
 #include "qt-desktop/qt4runconfiguration.h"
@@ -58,25 +57,16 @@
 #include "unconfiguredprojectpanel.h"
 #include "qmakekitinformation.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildmanager.h>
-#include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
-#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/projectnodes.h>
 #include <projectexplorer/target.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
-#include <texteditor/texteditorsettings.h>
 #include <utils/hostosinfo.h>
 #include <utils/parameteraction.h>
 
@@ -85,7 +75,6 @@
 #endif
 
 #include <QtPlugin>
-#include <QMenu>
 
 using namespace Qt4ProjectManager::Internal;
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
index 7b62ecd53f..638276b9c3 100644
--- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
@@ -34,7 +34,6 @@
 
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/kit.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/kitoptionspage.h>
 #include <qtsupport/qtkitinformation.h>
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
index cb132afbae..7529b6d41a 100644
--- a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
@@ -28,10 +28,8 @@
 ****************************************************************************/
 
 #include "qtmodulesinfo.h"
-#include "qglobal.h"
 #include <QDebug>
 #include <QString>
-#include <QHash>
 #include <QCoreApplication>
 
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
index 8786246cf3..d664dc40a9 100644
--- a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
@@ -31,9 +31,7 @@
 #include "qt4buildconfiguration.h"
 
 #include "qt4project.h"
-#include "qt4projectmanager.h"
 #include <projectexplorer/target.h>
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
index 3368760033..eedebc4bf4 100644
--- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
+++ b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
@@ -32,7 +32,6 @@
 #include "qt4projectmanagerconstants.h"
 
 #include "qt4project.h"
-#include "qt4projectmanager.h"
 
 #include <coreplugin/idocument.h>
 #include <coreplugin/icore.h>
@@ -40,13 +39,9 @@
 #include <coreplugin/coreconstants.h>
 #include <qtsupport/qtkitinformation.h>
 
-#include <projectexplorer/kit.h>
-#include <projectexplorer/kitmanager.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 
-#include <QLabel>
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QDialogButtonBox>
diff --git a/src/plugins/qt4projectmanager/winceqtversion.cpp b/src/plugins/qt4projectmanager/winceqtversion.cpp
index 3749392c56..4c1c0dc8c3 100644
--- a/src/plugins/qt4projectmanager/winceqtversion.cpp
+++ b/src/plugins/qt4projectmanager/winceqtversion.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "winceqtversion.h"
-#include "qt4projectmanagerconstants.h"
 #include <qtsupport/qtsupportconstants.h>
 #include <QCoreApplication>
 #include <QStringList>
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
index f64d2fc10c..b98c5a9570 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
@@ -29,7 +29,6 @@
 
 #include "abstractmobileapp.h"
 
-#include <QCoreApplication>
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index fce7d4abbe..b0c8ef6322 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -29,22 +29,17 @@
 
 #include "abstractmobileappwizard.h"
 
-#include "abstractmobileapp.h"
 #include "mobileappwizardpages.h"
 #include "targetsetuppage.h"
 
 #include <extensionsystem/pluginmanager.h>
 #include <qt4projectmanager/qt4project.h>
 #include <qt4projectmanager/qt4projectmanager.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtkitinformation.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/customwizard/customwizard.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <utils/qtcassert.h>
-
-#include <QIcon>
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index 50956af875..ad2fbb7536 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -30,7 +30,6 @@
 #include "consoleappwizard.h"
 
 #include "consoleappwizarddialog.h"
-#include "qt4projectmanagerconstants.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <cpptools/abstracteditorsupport.h>
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
index 41bfe92efc..1d8ea43bef 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
@@ -28,8 +28,6 @@
 ****************************************************************************/
 
 #include "consoleappwizarddialog.h"
-#include "consoleappwizard.h"
-#include <coreplugin/basefilewizard.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <QDebug>
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
index 0201d89b2a..46d8e0864a 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "emptyprojectwizarddialog.h"
-#include "qtprojectparameters.h"
 #include <projectexplorer/projectexplorerconstants.h>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 28091fe2b0..2b90f2887b 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -34,7 +34,6 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <cpptools/abstracteditorsupport.h>
 #include <designer/cpp/formclasswizardparameters.h>
-#include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/invoker.h>
 #include <qtsupport/qtsupportconstants.h>
@@ -42,9 +41,7 @@
 #include <utils/fileutils.h>
 
 #include <QDir>
-#include <QFile>
 #include <QTextStream>
-#include <QUuid>
 #include <QFileInfo>
 #include <QSharedPointer>
 
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index 79d5b28b1b..d674e570db 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -30,12 +30,10 @@
 #include "guiappwizarddialog.h"
 
 #include "filespage.h"
-#include "qtprojectparameters.h"
 
 #include <qtsupport/qtsupportconstants.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
-#include <QSet>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp
index 21964a5091..929e59ff1d 100644
--- a/src/plugins/qt4projectmanager/wizards/html5app.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp
@@ -31,7 +31,6 @@
 
 #include <QDir>
 #include <QFile>
-#include <QRegExp>
 #include <QTextStream>
 #include <QCoreApplication>
 
diff --git a/src/plugins/qt4projectmanager/wizards/html5app.h b/src/plugins/qt4projectmanager/wizards/html5app.h
index 20da2d6ed2..61076255bc 100644
--- a/src/plugins/qt4projectmanager/wizards/html5app.h
+++ b/src/plugins/qt4projectmanager/wizards/html5app.h
@@ -32,9 +32,6 @@
 
 #include "abstractmobileapp.h"
 
-#include <QHash>
-#include <QStringList>
-
 namespace Qt4ProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index f705706541..ac53c77a28 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "html5appwizard.h"
-#include "mobileappwizardpages.h"
 
 #include "html5app.h"
 #include "html5appwizardpages.h"
@@ -40,7 +39,6 @@
 #include <qtsupport/qtsupportconstants.h>
 #include <limits>
 
-#include <QCoreApplication>
 #include <QIcon>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
index 45af128407..d19c2b84de 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
@@ -29,11 +29,6 @@
 
 #include "html5appwizardpages.h"
 #include "ui_html5appwizardsourcespage.h"
-#include <coreplugin/coreconstants.h>
-
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QMessageBox>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/importwidget.cpp b/src/plugins/qt4projectmanager/wizards/importwidget.cpp
index 467d84f6fb..d3e5d99395 100644
--- a/src/plugins/qt4projectmanager/wizards/importwidget.cpp
+++ b/src/plugins/qt4projectmanager/wizards/importwidget.cpp
@@ -31,9 +31,6 @@
 
 #include <utils/detailswidget.h>
 #include <utils/pathchooser.h>
-#include <utils/fileutils.h>
-
-#include <QFileInfo>
 
 #include <QPushButton>
 #include <QVBoxLayout>
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index fd98474c4c..af83637b55 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -29,16 +29,12 @@
 
 #include "librarywizard.h"
 #include "librarywizarddialog.h"
-#include "qt4projectmanager.h"
-#include "qt4projectmanagerconstants.h"
 #include "mobilelibraryparameters.h"
 
-#include <utils/codegeneration.h>
 #include <cpptools/abstracteditorsupport.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <qtsupport/qtsupportconstants.h>
 
-#include <QDir>
 #include <QFileInfo>
 #include <QTextStream>
 #include <QIcon>
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
index 8f799f107a..01b1143c03 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
@@ -33,16 +33,11 @@
 #include "modulespage.h"
 #include "mobilelibrarywizardoptionpage.h"
 #include "mobilelibraryparameters.h"
-#include "abstractmobileapp.h"
-#include "qt4projectmanagerconstants.h"
-
-#include <qtsupport/qtsupportconstants.h>
 
 #include <utils/projectintropage.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <QDebug>
-#include <QDir>
 
 #include <QComboBox>
 #include <QLabel>
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
index 43a2702e6a..67b7215e5b 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
@@ -31,7 +31,6 @@
 #define LIBRARYWIZARDDIALOG_H
 
 #include "qtwizard.h"
-#include "qtprojectparameters.h"
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
index e78115aff8..e888d5abcc 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
@@ -29,11 +29,6 @@
 
 #include "mobileapp.h"
 
-#include <coreplugin/icore.h>
-
-#include <QDir>
-#include <QFile>
-#include <QRegExp>
 #include <QTextStream>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
index ce2b90c25e..bac306b563 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
@@ -29,13 +29,11 @@
 
 #include "mobileappwizard.h"
 
-#include "mobileappwizardpages.h"
 #include "mobileapp.h"
 #include "targetsetuppage.h"
 #include "qt4projectmanagerconstants.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/task.h>
 
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/baseqtversion.h>
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
index 29d694d423..bcc3152129 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
@@ -31,11 +31,9 @@
 #include "ui_mobileappwizardgenericoptionspage.h"
 #include "ui_mobileappwizardmaemooptionspage.h"
 #include "ui_mobileappwizardharmattanoptionspage.h"
-#include <coreplugin/coreconstants.h>
 #include <utils/fileutils.h>
 
 #include <QTemporaryFile>
-#include <QDesktopServices>
 #include <QFileDialog>
 #include <QMessageBox>
 
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
index 7424b8aa4c..33f6fe4776 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
@@ -28,10 +28,8 @@
 ****************************************************************************/
 
 #include "mobilelibraryparameters.h"
-#include "qtprojectparameters.h"
 
 #include <QTextStream>
-#include <QDir>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp
index 1416b64ecb..cdb39a266d 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp
@@ -31,12 +31,6 @@
 #include "ui_mobilelibrarywizardoptionpage.h"
 #include "qtprojectparameters.h"
 
-#include <coreplugin/coreconstants.h>
-
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QMessageBox>
-
 namespace Qt4ProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
index b96ffdcdb5..65a791dc58 100644
--- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
@@ -31,10 +31,7 @@
 
 #include "qtmodulesinfo.h"
 
-#include <utils/qtcassert.h>
-
 #include <QDebug>
-#include <QVariant>
 
 #include <QCheckBox>
 #include <QLabel>
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index ec50c9fbaf..eafa5e8dc5 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -31,9 +31,7 @@
 
 #include <QDir>
 #include <QFile>
-#include <QRegExp>
 #include <QTextStream>
-#include <QCoreApplication>
 
 #ifndef CREATORLESSTEST
 #include <coreplugin/icore.h>
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.h b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
index 772b9bb252..db6d86c1b0 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
@@ -32,9 +32,6 @@
 
 #include "abstractmobileapp.h"
 
-#include <QHash>
-#include <QStringList>
-
 namespace Qt4ProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index a368d0429e..5ba6947172 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "qtquickappwizard.h"
-#include "mobileappwizardpages.h"
 
 #include "qtquickapp.h"
 #include "qtquickappwizardpages.h"
@@ -38,9 +37,7 @@
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/baseqtversion.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <coreplugin/dialogs/iwizard.h>
 
-#include <QCoreApplication>
 #include <QIcon>
 #include <QDebug>
 
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
index 27fe0bd675..0048c20f15 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
@@ -29,11 +29,6 @@
 
 #include "qtquickappwizardpages.h"
 #include "ui_qtquickcomponentsetoptionspage.h"
-#include <coreplugin/coreconstants.h>
-
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QMessageBox>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
index 5b4f4b8c5e..7c82e2db3f 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
@@ -30,8 +30,6 @@
 #ifndef QTQUICKAPPWIZARDPAGES_H
 #define QTQUICKAPPWIZARDPAGES_H
 
-#include "qtquickapp.h"
-
 #include <QWizardPage>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index 90d7067843..de4813e262 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -36,13 +36,10 @@
 #include "targetsetuppage.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
 
 #include <cpptools/cpptoolsconstants.h>
 
-#include <projectexplorer/kit.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/task.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index 1b69716621..35b095de96 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -34,10 +34,6 @@
 #include <projectexplorer/baseprojectwizarddialog.h>
 #include <projectexplorer/customwizard/customwizard.h>
 
-#include <coreplugin/basefilewizard.h>
-
-#include <QSet>
-
 namespace ProjectExplorer { class Kit; }
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
index 188e4cc8b0..94a1b8aca6 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "subdirsprojectwizarddialog.h"
-#include "qtprojectparameters.h"
 #include <projectexplorer/projectexplorerconstants.h>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 7b82edcbe6..a39b7c2413 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -34,13 +34,11 @@
 #include "buildconfigurationinfo.h"
 #include "qt4buildconfiguration.h"
 #include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
 #include "qmakekitinformation.h"
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionfactory.h>
@@ -49,11 +47,6 @@
 
 #include <QLabel>
 #include <QMessageBox>
-#include <QVariant>
-#include <QAction>
-#include <QApplication>
-#include <QButtonGroup>
-#include <QHeaderView>
 #include <QScrollArea>
 #include <QVBoxLayout>