diff --git a/src/plugins/qt4projectmanager/buildconfigurationinfo.h b/src/plugins/qt4projectmanager/buildconfigurationinfo.h
index cbfd8dbdc9ca9ef04fe6fc31fdc587ae6ca1bf35..a784416e0a10a0923b06dbe944681583078540ea 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 d0acb3347d3faa293c718a7cb76db11a7fdddaca..600f346b551d676f451668b34e33811165e49f56 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 01bccd2fe3008a1bcd7e0c0ed24a8a4601e9f093..c4f41ded175917137b446bacf13c98561c8a5e08 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 6372dd550431c1d90e47f5015c7698d60ddf5b71..3b0bdb4714b3bc52981928795329207bce8fec97 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 e5f8e30012c1c5d1573f414da498b55ce1fd3a07..9ae775785f6ad6be9c1e5b9a56e80c63bb8010ff 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 386af7104026a7f4ddca17c23c7c4c8fa9849e34..77c298ac68337a50bf940ab641abfa54a6c558f4 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 1c41474bd67a9ad3d90910853eccdea4336edb1d..f59e4520d1ad095c481c58c75798229971f346ff 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 2ab738e2805343478a30318b387ea8424abe2291..90354fad9225080fdea3e3f88fce81b9fb2a1296 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 4828ec2124e7cbf03c54941208c6c78550d94461..1076541a72130076f1dd9b46e1503effb1efac82 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 82b71cd33bf67e189b912fc405b65a6eb063f1dc..372d619b05637ddb52d993894db653eb251d3f0d 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 802a9468719ce390691dbac127148a17200e5d40..a552d615c43a8036513fc32378ba66bc9d38bf26 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 5d6f949867ff88565d3f129bdb875a662a2d689a..63f81cf91843da3d6b100553d57f50bfbfad347b 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 e369209b9815e83f2bc086c0d39860a982892beb..f705706541d6d5fb881058e2202e957d92bd81e4 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 7ed1683e473a755b9c13de7fea833f39875f90f2..467d84f6fbbf638d02d8daed0ad50b2b5d039fe4 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 e12e25ab2760cd1dd870b3e8334d9d843b66c8f7..9cb1d728ca4199d8b88e641e293784ed10cb8436 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 a80caf8096da37aa03a68f7f80d8e428a4aeaf42..ce2b90c25e3e8ae6f9d9db8c4e9651d55ea39311 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 d5d2b431d1c29494e32abacd6e67476db566df8a..a368d0429e225e23157c2f049bfd37d8666d7daf 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 1aef625e0e2c3b18bc6c1a23e7664c803cf67fd3..7b82edcbe6b9aeef1b6749536b6ed4047d9074bb 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 917cea7a0b5c82c82b7337ba429e72c0c7da7bd6..73dd8a601ca1d774c8638b48eef3301df9d8c6cd 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;