diff --git a/src/plugins/qt4projectmanager/buildconfigurationinfo.h b/src/plugins/qt4projectmanager/buildconfigurationinfo.h
index cbfd8dbdc9c..a784416e0a1 100644
--- a/src/plugins/qt4projectmanager/buildconfigurationinfo.h
+++ b/src/plugins/qt4projectmanager/buildconfigurationinfo.h
@@ -32,7 +32,6 @@
 
 #include "qt4projectmanager_global.h"
 
-#include <coreplugin/featureprovider.h>
 #include <qtsupport/baseqtversion.h>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index d0acb3347d3..600f346b551 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -42,6 +42,7 @@
 #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>
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 01bccd2fe30..c4f41ded175 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -34,11 +34,11 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildstep.h>
-#include <projectexplorer/task.h>
 
 namespace ProjectExplorer {
 class BuildStep;
 class IBuildStepFactory;
+class Task;
 }
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index 6372dd55043..3b0bdb4714b 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -46,6 +46,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QSharedPointer>
+#include <QTextBlock>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h
index e5f8e30012c..9ae775785f6 100644
--- a/src/plugins/qt4projectmanager/profilehighlighter.h
+++ b/src/plugins/qt4projectmanager/profilehighlighter.h
@@ -32,10 +32,6 @@
 
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/codeassist/keywordscompletionassist.h>
-#include <QtAlgorithms>
-#include <QSyntaxHighlighter>
-#include <QTextCharFormat>
-#include <QVector>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 386af710402..77c298ac683 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -39,6 +39,8 @@
 #include "qmakekitinformation.h"
 #include "qt4nodes.h"
 
+#include <utils/fileutils.h>
+
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 1c41474bd67..f59e4520d1a 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -31,11 +31,12 @@
 #define QMAKESTEP_H
 
 #include "qt4projectmanager_global.h"
-#include <utils/fileutils.h>
 #include <projectexplorer/abstractprocessstep.h>
 
 #include <QStringList>
 
+namespace Utils { class FileName; }
+
 namespace ProjectExplorer {
 class BuildStep;
 class IBuildStepFactory;
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 2ab738e2805..90354fad922 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -35,6 +35,7 @@
 #include "qt4nodes.h"
 #include "qmakestep.h"
 #include "makestep.h"
+#include "buildconfigurationinfo.h"
 
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 4828ec2124e..1076541a721 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -32,8 +32,6 @@
 
 #include "qt4projectmanager_global.h"
 
-#include "buildconfigurationinfo.h"
-
 #include <projectexplorer/buildconfiguration.h>
 #include <qtsupport/baseqtversion.h>
 
@@ -45,6 +43,7 @@ class QMakeStep;
 class MakeStep;
 class Qt4BuildConfigurationFactory;
 class Qt4ProFileNode;
+class BuildConfigurationInfo;
 
 class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 82b71cd33bf..372d619b056 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -62,6 +62,7 @@
 #include <utils/stringutils.h>
 #include <utils/fileutils.h>
 #include <proparser/prowriter.h>
+#include <utils/fileutils.h>
 #include <algorithm>
 
 #include <QDebug>
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index 802a9468719..a552d615c43 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -32,7 +32,6 @@
 
 #include "qt4projectmanager_global.h"
 
-#include <utils/fileutils.h>
 #include <coreplugin/idocument.h>
 #include <projectexplorer/projectnodes.h>
 
@@ -47,6 +46,8 @@ QT_BEGIN_NAMESPACE
 class ProFile;
 QT_END_NAMESPACE
 
+namespace Utils { class FileName; }
+
 namespace Core {
 class ICore;
 }
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
index 5d6f949867f..63f81cf9184 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
@@ -31,10 +31,12 @@
 #define ABSTRACTMOBILEAPPWIZARD_H
 
 #include <qt4projectmanager/qt4projectmanager_global.h>
-#include <qtsupport/qtversionmanager.h>
-#include <coreplugin/basefilewizard.h>
 #include <projectexplorer/baseprojectwizarddialog.h>
-#include <qt4projectmanager/wizards/abstractmobileapp.h>
+
+namespace QtSupport {
+class QtVersionNumber;
+class QtVersionManager;
+} // QtSupport
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index e369209b981..f705706541d 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -35,6 +35,7 @@
 #include "targetsetuppage.h"
 #include "qt4projectmanagerconstants.h"
 
+#include <qtsupport/baseqtversion.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <limits>
diff --git a/src/plugins/qt4projectmanager/wizards/importwidget.cpp b/src/plugins/qt4projectmanager/wizards/importwidget.cpp
index 7ed1683e473..467d84f6fbb 100644
--- a/src/plugins/qt4projectmanager/wizards/importwidget.cpp
+++ b/src/plugins/qt4projectmanager/wizards/importwidget.cpp
@@ -31,6 +31,7 @@
 
 #include <utils/detailswidget.h>
 #include <utils/pathchooser.h>
+#include <utils/fileutils.h>
 
 #include <QFileInfo>
 
diff --git a/src/plugins/qt4projectmanager/wizards/importwidget.h b/src/plugins/qt4projectmanager/wizards/importwidget.h
index e12e25ab276..9cb1d728ca4 100644
--- a/src/plugins/qt4projectmanager/wizards/importwidget.h
+++ b/src/plugins/qt4projectmanager/wizards/importwidget.h
@@ -32,9 +32,10 @@
 
 #include <QWidget>
 
-#include <utils/fileutils.h>
-
-namespace Utils { class PathChooser; }
+namespace Utils {
+class PathChooser;
+class FileName;
+} // namespace Utils
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
index a80caf8096d..ce2b90c25e3 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp
@@ -38,6 +38,7 @@
 #include <projectexplorer/task.h>
 
 #include <qtsupport/qtsupportconstants.h>
+#include <qtsupport/baseqtversion.h>
 
 #include <QCoreApplication>
 #include <QIcon>
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index d5d2b431d1c..a368d0429e2 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -36,6 +36,7 @@
 #include "qt4projectmanagerconstants.h"
 
 #include <qtsupport/qtsupportconstants.h>
+#include <qtsupport/baseqtversion.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <coreplugin/dialogs/iwizard.h>
 
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 1aef625e0e2..7b82edcbe6b 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -29,6 +29,7 @@
 
 #include "targetsetuppage.h"
 #include "importwidget.h"
+#include "../qt4targetsetupwidget.h"
 
 #include "buildconfigurationinfo.h"
 #include "qt4buildconfiguration.h"
@@ -43,6 +44,7 @@
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionfactory.h>
+#include <qtsupport/qtversionmanager.h>
 #include <utils/qtcprocess.h>
 
 #include <QLabel>
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h
index 917cea7a0b5..73dd8a601ca 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h
@@ -31,17 +31,29 @@
 #define TARGETSETUPPAGE_H
 
 #include "../qt4projectmanager_global.h"
-#include "../qt4targetsetupwidget.h"
-
-#include <coreplugin/featureprovider.h>
-#include <projectexplorer/kitmanager.h>
-#include <qtsupport/qtversionmanager.h>
 
 #include <QString>
 #include <QWizardPage>
+#include <QMap>
+
+QT_FORWARD_DECLARE_CLASS(QSpacerItem)
+
+namespace Utils { class FileName; }
+
+namespace Core {
+class Id;
+} // namespace Core
+
+namespace ProjectExplorer {
+class Kit;
+class KitMatcher;
+} // namespace ProjectExplorer
+
+namespace QtSupport { class BaseQtVersion; }
 
 namespace Qt4ProjectManager {
 class Qt4Project;
+class Qt4TargetSetupWidget;
 
 namespace Internal {
 class ImportWidget;