diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index d47cde0c7b924901182c7b29d69f7822efbe22c9..ba5866aecc28d81421ba3384e5aa59b77c8a2ea7 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -235,7 +235,7 @@ bool CppHoverHandler::matchDiagnosticMessage(const CPlusPlus::Document::Ptr &doc
                                              const int line)
 {
     foreach (const Document::DiagnosticMessage &m, document->diagnosticMessages()) {
-        if (m.line() == line) {
+        if (m.line() == unsigned(line)) {
             m_toolTip = m.text();
             return true;
         }
@@ -246,7 +246,7 @@ bool CppHoverHandler::matchDiagnosticMessage(const CPlusPlus::Document::Ptr &doc
 bool CppHoverHandler::matchIncludeFile(const CPlusPlus::Document::Ptr &document, const int line)
 {
     foreach (const Document::Include &includeFile, document->includes()) {
-        if (includeFile.line() == line) {
+        if (includeFile.line() == unsigned(line)) {
             m_toolTip = QDir::toNativeSeparators(includeFile.fileName());
             const QString &fileName = QFileInfo(includeFile.fileName()).fileName();
             m_helpCandidates.append(HelpCandidate(fileName, fileName, HelpCandidate::Include));
diff --git a/src/plugins/projectexplorer/buildconfigdialog.cpp b/src/plugins/projectexplorer/buildconfigdialog.cpp
index 5e3a58fbe19248d1416da46f4987d34e0664e6ac..32e018ec4583b6e54bba09c8ccb1fe84feb5537a 100644
--- a/src/plugins/projectexplorer/buildconfigdialog.cpp
+++ b/src/plugins/projectexplorer/buildconfigdialog.cpp
@@ -31,6 +31,7 @@
 #include "project.h"
 #include "runconfiguration.h"
 #include "buildconfiguration.h"
+#include "target.h"
 
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QPushButton>
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 591e9e10eb9fa990c80e939f2aa0e39838654bd2..1e789d1fba36f2c5a3e3a966e3130b1c7adeb272 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -38,6 +38,7 @@
 
 #include <QtGui/QKeyEvent>
 #include <QtGui/QIcon>
+#include <QtGui/QTextCharFormat>
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextEdit>
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index 2065af56a8b0ecbee4899311fd4f751d13c82566..8d34cf1656cec9bda1631ee4c571ad0eb9861359 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -34,11 +34,9 @@
 
 #include <QtCore/QHash>
 
-#include <QtGui/QColor>
-#include <QtGui/QTextCharFormat>
-
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
+class QTextCharFormat;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index de2894ac8cda7fe9bab40e206f93f5e0b92c9c6a..43a3af6a7392cabab2da5dc12a4f4aa12d67eb75 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -38,6 +38,7 @@
 #include <utils/detailswidget.h>
 #include <utils/pathchooser.h>
 
+#include <QtCore/QDir>
 #include <QtGui/QCheckBox>
 #include <QtGui/QComboBox>
 #include <QtGui/QDialog>
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 3bbc97bf283c27600f149a8e2711d1773c8d6945..315ed6f1da7f7708acf12519a92357fdd953357a 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -30,6 +30,7 @@
 #include "miniprojecttargetselector.h"
 #include "buildconfigurationmodel.h"
 #include "runconfigurationmodel.h"
+#include "target.h"
 
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 91d0cab9514d4b97ee8c3c973c914cadd89d4bc7..481bf4deb78b79b328df11c3260f8cdced379116 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -33,6 +33,7 @@
 #include "projectexplorersettings.h"
 #include "runconfiguration.h"
 #include "session.h"
+#include "outputformatter.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -56,6 +57,7 @@
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QTabWidget>
 #include <QtGui/QToolButton>
+#include <QtGui/QShowEvent>
 
 using namespace ProjectExplorer::Internal;
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h
index 0646c16f7e9186e00a0255a38f4529af33c71c5b..6822b1cfcf709e6d97fef7e5213033202b438d91 100644
--- a/src/plugins/projectexplorer/outputwindow.h
+++ b/src/plugins/projectexplorer/outputwindow.h
@@ -31,12 +31,9 @@
 #define OUTPUTWINDOW_H
 
 #include <coreplugin/ioutputpane.h>
-#include <projectexplorer/outputformatter.h>
 
-#include <QtCore/QObject>
 #include <QtCore/QHash>
 #include <QtGui/QIcon>
-#include <QtGui/QShowEvent>
 #include <QtGui/QPlainTextEdit>
 
 QT_BEGIN_NAMESPACE
@@ -50,7 +47,7 @@ namespace Core {
 }
 
 namespace ProjectExplorer {
-
+class OutputFormatter;
 class RunControl;
 
 namespace Constants {
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 01b4569cb37603192ecf119316131a7bc6cdf6d2..f88dcabd7601c44090b95c565258cde316fbef18 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -31,7 +31,6 @@
 #define PROJECT_H
 
 #include "projectexplorer_export.h"
-#include "target.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QSet>
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index d6b4e505cbe26a4a2e663dcda0640b7869717329..cd1a210ca712c972308ac4dab601f89a876cf401 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -59,6 +59,7 @@
 #include <QtGui/QScrollArea>
 #include <QtGui/QLabel>
 #include <QtGui/QPainter>
+#include <QtGui/QStackedWidget>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QMenu>
 
diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h
index b8f9e0e01a4fee3e48da15b4ed5a56ab67009270..b4bf4fc948bc366eebf0e1b488683e63b6eb3c9a 100644
--- a/src/plugins/projectexplorer/projectwindow.h
+++ b/src/plugins/projectexplorer/projectwindow.h
@@ -30,22 +30,13 @@
 #ifndef PROJECTWINDOW_H
 #define PROJECTWINDOW_H
 
-#include "iprojectproperties.h"
-
-#include <QtCore/QPair>
-#include <QtCore/QMap>
-#include <QtGui/QApplication>
-#include <QtGui/QComboBox>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
 #include <QtGui/QScrollArea>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
 class QGridLayout;
 class QMenu;
+class QStackedWidget;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
@@ -105,7 +96,6 @@ private:
     QList<ProjectExplorer::Project *> m_tabIndexToProject;
 };
 
-
 } // namespace Internal
 } // namespace ProjectExplorer
 
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h
index 29eeb04b2e01267f4323128b185933cd44bd811f..5491a2afbdf30cc7b7858358e63147377711c3ba 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.h
@@ -33,7 +33,6 @@
 #include "iprojectproperties.h"
 
 #include <QtGui/QWidget>
-#include <QtCore/QAbstractListModel>
 
 QT_BEGIN_NAMESPACE
 class QMenu;
diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h
index d92128a82423c218b832ea46258d79a737c40117..f68e31176644977acb1a3590e76a337fe9d06c32 100644
--- a/src/plugins/projectexplorer/target.h
+++ b/src/plugins/projectexplorer/target.h
@@ -33,8 +33,6 @@
 #include "projectconfiguration.h"
 #include "projectexplorer_export.h"
 
-#include <QtCore/QObject>
-#include <QtGui/QFileSystemModel>
 #include <QtGui/QIcon>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index 69a77ae983451116d0751ca0d73c4724f6c70e2a..8ef5beb3d93eec5ffa9f2d720625ebd924857013 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -43,6 +43,7 @@
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>
 #include <QtGui/QVBoxLayout>
+#include <QtGui/QStackedWidget>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/targetsettingspanel.h b/src/plugins/projectexplorer/targetsettingspanel.h
index 6d449ec1c7d6804711f5ee9fc7801aa816c23bb6..874263b936dea4e22a5382d4484fc0c7c2fab139 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.h
+++ b/src/plugins/projectexplorer/targetsettingspanel.h
@@ -30,19 +30,18 @@
 #ifndef TARGETSETTINGSPANEL_H
 #define TARGETSETTINGSPANEL_H
 
-#include "iprojectproperties.h"
-
-#include <QtGui/QStackedWidget>
 #include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAction;
 class QMenu;
+class QStackedWidget;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
 
 class Target;
+class Project;
 
 namespace Internal {
 
diff --git a/src/plugins/projectexplorer/taskhub.h b/src/plugins/projectexplorer/taskhub.h
index ec27b0a3c952f07e9b58de59f2e0c77592f50807..1fd5a10f92a208f5d8bf1ccf98e88cbd60b8710d 100644
--- a/src/plugins/projectexplorer/taskhub.h
+++ b/src/plugins/projectexplorer/taskhub.h
@@ -31,7 +31,7 @@
 #define TASKHUB_H
 
 #include "task.h"
-#include "projectexplorer_export.h"
+
 #include <QtCore/QObject>
 #include <QtGui/QIcon>
 
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index b6f1f4c8fb9c07e0719e64b8fa5478406c309383..d5a0f410c070320502d5413bbf3a44d5c8382439 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -30,17 +30,17 @@
 #ifndef TASKWINDOW_H
 #define TASKWINDOW_H
 
-#include "task.h"
 #include <coreplugin/ioutputpane.h>
-#include <QtGui/QIcon>
 
 QT_BEGIN_NAMESPACE
 class QAction;
 class QModelIndex;
+class QPoint;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
 class TaskHub;
+class Task;
 
 namespace Internal {
 class TaskWindowPrivate;
diff --git a/src/plugins/projectexplorer/vcsannotatetaskhandler.h b/src/plugins/projectexplorer/vcsannotatetaskhandler.h
index 27fa40a8042e47286d30f2da0014def881c8630b..18bfcaf6b8d8c84cefba12f69db7513436ecc39a 100644
--- a/src/plugins/projectexplorer/vcsannotatetaskhandler.h
+++ b/src/plugins/projectexplorer/vcsannotatetaskhandler.h
@@ -34,9 +34,6 @@
 
 #include "itaskhandler.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QString>
-
 namespace Core {
 class IVersionControl;
 }
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
index db2664dee946e69d46129c74fd8a0bd9c8f12ff1..e0903d3eed6fbfabf4dcaae40275f6cf0bd8f039 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h
@@ -30,7 +30,7 @@
 #ifndef GETTINGSTARTEDWELCOMEPAGEWIDGET_H
 #define GETTINGSTARTEDWELCOMEPAGEWIDGET_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 3a5e3986e8f1c67c6d33c257ab3d96182f04bf7c..277b3b8ae01b2bf65299c9774802bd5ab38690fc 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -35,6 +35,7 @@
 #include "makestep.h"
 #include "qt4buildconfiguration.h"
 #include "qt4projectmanagerconstants.h"
+#include "qtversionmanager.h"
 
 #include "wizards/targetsetuppage.h"
 
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.h b/src/plugins/qt4projectmanager/projectloadwizard.h
index c05345c98115030d2df6648ada3e3894ca175c97..b6e56d6ce1353910e30270b5010bcbe650845d9b 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.h
+++ b/src/plugins/qt4projectmanager/projectloadwizard.h
@@ -30,17 +30,13 @@
 #ifndef PROJECTLOADWIZARD_H
 #define PROJECTLOADWIZARD_H
 
-#include "qtversionmanager.h"
-#include <wizards/targetsetuppage.h>
-
 #include <QtGui/QWizard>
 
 namespace Qt4ProjectManager {
 class Qt4Project;
 
 namespace Internal {
-
-class TargetsPage;
+class TargetSetupPage;
 
 class ProjectLoadWizard : public QWizard
 {
diff --git a/src/plugins/qt4projectmanager/qmakeparser.h b/src/plugins/qt4projectmanager/qmakeparser.h
index 9f6999b14e878d40049a4cba76d4cec1c528ade8..0bbd17e30e3dc485c7fbc25322da40c524e13974 100644
--- a/src/plugins/qt4projectmanager/qmakeparser.h
+++ b/src/plugins/qt4projectmanager/qmakeparser.h
@@ -32,8 +32,6 @@
 
 #include <projectexplorer/ioutputparser.h>
 
-#include <QtCore/QRegExp>
-
 namespace Qt4ProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
index 3683accd3705198150c6cd171ea3880739d4ae04..54a88c18aafa5bf7a912b962431c827b8a05cfa8 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
@@ -37,6 +37,8 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/gnumakeparser.h>
 
+#include <QtCore/QDir>
+
 using namespace Qt4ProjectManager::Internal;
 
 namespace {
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h
index 5f066880c0b2bb439abcaf3ec05ae387b29f40ac..65a3956a3a5f3b703d0e95409c589ab5603259b7 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.h
+++ b/src/plugins/qt4projectmanager/qtoptionspage.h
@@ -35,8 +35,6 @@
 #include <QtCore/QFutureInterface>
 
 #include <QtGui/QWidget>
-#include <QtGui/QPixmap>
-#include <QtGui/QIcon>
 
 QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index 385c22730f079f726c77cefa3e7e3d5d3606c99b..60f77252f3a740a8131a82f0da46efb157ca2690 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -30,8 +30,8 @@
 #ifndef QTVERSIONMANAGER_H
 #define QTVERSIONMANAGER_H
 
-#include <projectexplorer/taskwindow.h>
 #include <projectexplorer/toolchain.h>
+#include <projectexplorer/task.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QSet>