diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 50dce7a3edf..1c3e6dd9fb5 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -34,6 +34,7 @@
 #include <QString>
 #include <QVector>
 #include <projectexplorer/abi.h>
+#include <utils/fileutils.h>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index c5eb00bdf6f..cc857ad3d34 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -41,6 +41,7 @@
 #include <debugger/debuggerstartparameters.h>
 
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4nodes.h>
 #include <qt4projectmanager/qt4project.h>
diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp
index acde4161473..9c8305e3ab2 100644
--- a/src/plugins/android/androiddeployconfiguration.cpp
+++ b/src/plugins/android/androiddeployconfiguration.cpp
@@ -36,6 +36,7 @@
 
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 
 #include <qt4projectmanager/qt4project.h>
 #include <qtsupport/qtkitinformation.h>
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 13a10c6b710..7c32db3ae7d 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -40,12 +40,14 @@
 #include "makefileparserthread.h"
 
 #include <projectexplorer/abi.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/headerpath.h>
 #include <extensionsystem/pluginmanager.h>
 #include <cpptools/ModelManagerInterface.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 561e1ef78e2..1916bc454ca 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -35,6 +35,7 @@
 #include "cdb/cdbengine.h"
 
 #include <coreplugin/icore.h>
+#include <projectexplorer/toolchain.h>
 #include <utils/pathchooser.h>
 #include <utils/fancylineedit.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index 28f91f8eb9a..0305bb50a21 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -33,6 +33,7 @@
 
 #include <projectexplorer/abi.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
 #include <utils/environment.h>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index e1e95fb9e23..fcf0b9090b1 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -82,6 +82,7 @@
 
 #include <projectexplorer/localapplicationrunconfiguration.h>
 #include <projectexplorer/buildmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/devicesupport/deviceprocesslist.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
index 6c9d52a8343..774ae0948fd 100644
--- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp
+++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
@@ -36,6 +36,7 @@
 #include "debuggerstartparameters.h"
 
 #include <projectexplorer/kitchooser.h>
+#include <projectexplorer/devicesupport/deviceprocesslist.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
 #include <ssh/sshremoteprocessrunner.h>
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 132eb9b90d4..5177150b4da 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -50,6 +50,7 @@
 
 #include <utils/savedaction.h>
 #include <utils/fancylineedit.h>
+#include <utils/fileutils.h>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index 5e3016ea331..192e1c9f459 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -30,6 +30,7 @@
 #include "genericprojectnodes.h"
 #include "genericproject.h"
 
+#include <utils/fileutils.h>
 #include <coreplugin/idocument.h>
 #include <projectexplorer/projectexplorer.h>
 
diff --git a/src/plugins/madde/maemopublisherfremantlefree.cpp b/src/plugins/madde/maemopublisherfremantlefree.cpp
index 2656fa953ca..d5dd05fade6 100644
--- a/src/plugins/madde/maemopublisherfremantlefree.cpp
+++ b/src/plugins/madde/maemopublisherfremantlefree.cpp
@@ -38,6 +38,7 @@
 #include <coreplugin/idocument.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 #include <qt4projectmanager/qmakestep.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qtsupport/baseqtversion.h>
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index 44e37d05817..c9551fbd2fd 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -29,7 +29,8 @@
 
 #include "abi.h"
 
-#include <QCoreApplication>
+#include <utils/fileutils.h>
+
 #include <QDebug>
 #include <QtEndian>
 #include <QFile>
diff --git a/src/plugins/projectexplorer/abi.h b/src/plugins/projectexplorer/abi.h
index edbf466302c..2182da89e13 100644
--- a/src/plugins/projectexplorer/abi.h
+++ b/src/plugins/projectexplorer/abi.h
@@ -32,10 +32,10 @@
 
 #include "projectexplorer_export.h"
 
-#include <utils/fileutils.h>
-
 #include <QList>
 
+namespace Utils { class FileName; }
+
 namespace ProjectExplorer {
 
 // --------------------------------------------------------------------------
diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
index ed063ce1aaf..9d0e6265906 100644
--- a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
+++ b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
@@ -33,14 +33,10 @@
 
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
-#include <projectexplorer/gcctoolchain.h>
 
-
-#include <utils/fileutils.h>
 #include <utils/qtcprocess.h>
 #include <utils/synchronousprocess.h>
 
-#include <QFileInfo>
 #include <QDir>
 #include <QTemporaryFile>
 
diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.h b/src/plugins/projectexplorer/abstractmsvctoolchain.h
index 909954c91dc..a35aea1d569 100644
--- a/src/plugins/projectexplorer/abstractmsvctoolchain.h
+++ b/src/plugins/projectexplorer/abstractmsvctoolchain.h
@@ -32,8 +32,10 @@
 
 #include "toolchain.h"
 #include "abi.h"
+#include "headerpath.h"
 
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 0b2acf08db2..a025d03a0ca 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -29,17 +29,14 @@
 
 #include "abstractprocessstep.h"
 #include "ansifilterparser.h"
-#include "buildconfiguration.h"
 #include "buildstep.h"
 #include "ioutputparser.h"
 #include "project.h"
-#include "target.h"
 #include "task.h"
 
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
-#include <QEventLoop>
 #include <QTimer>
 #include <QDir>
 
diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp
index b65fb5bdc5d..4c858928651 100644
--- a/src/plugins/projectexplorer/allprojectsfilter.cpp
+++ b/src/plugins/projectexplorer/allprojectsfilter.cpp
@@ -32,8 +32,6 @@
 #include "session.h"
 #include "project.h"
 
-#include <QVariant>
-
 using namespace Core;
 using namespace Locator;
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h
index 68756d7bb00..fcab19fafc8 100644
--- a/src/plugins/projectexplorer/allprojectsfilter.h
+++ b/src/plugins/projectexplorer/allprojectsfilter.h
@@ -33,7 +33,6 @@
 #include <locator/basefilefilter.h>
 
 #include <QFutureInterface>
-#include <QString>
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index de57f23f193..dbb99c2488f 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -34,16 +34,13 @@
 #include "projectexplorer.h"
 #include "editorconfiguration.h"
 
-#include <utils/qtcassert.h>
 #include <texteditor/itexteditor.h>
-#include <coreplugin/editormanager/editormanager.h>
 
 #include <QSettings>
 #include <QRegExp>
 
 #include <QGridLayout>
 #include <QLabel>
-#include <QHBoxLayout>
 
 using namespace Find;
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index fbcfc7ec70a..51d87a5fceb 100644
--- a/src/plugins/projectexplorer/applicationlauncher.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher.cpp
@@ -40,14 +40,12 @@
 #include <utils/winutils.h>
 #endif
 
-#include <QTimer>
 #include <QTextCodec>
 
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
 
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
 
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 979857fa6b1..bde29975791 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -28,26 +28,21 @@
 ****************************************************************************/
 
 #include "appoutputpane.h"
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
 #include "runconfiguration.h"
 #include "session.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
+#include <coreplugin/outputwindow.h>
 #include <find/basetextfind.h>
-#include <aggregation/aggregate.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditorsettings.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/invoker.h>
 
 #include <utils/qtcassert.h>
-#include <utils/outputformatter.h>
 
 #include <QAction>
 #include <QVBoxLayout>
diff --git a/src/plugins/projectexplorer/appoutputpane.h b/src/plugins/projectexplorer/appoutputpane.h
index 211dee6eb90..1263a89585a 100644
--- a/src/plugins/projectexplorer/appoutputpane.h
+++ b/src/plugins/projectexplorer/appoutputpane.h
@@ -30,15 +30,19 @@
 #ifndef APPOUTPUTPANE_H
 #define APPOUTPUTPANE_H
 
-#include <coreplugin/outputwindow.h>
 #include <coreplugin/ioutputpane.h>
 
+#include <utils/outputformat.h>
+
 QT_BEGIN_NAMESPACE
 class QTabWidget;
 class QToolButton;
 class QAction;
+class QPoint;
 QT_END_NAMESPACE
 
+namespace Core { class OutputWindow; }
+
 namespace ProjectExplorer {
 
 class RunControl;
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
index 619f98986af..cfaf30c94f8 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
@@ -29,8 +29,6 @@
 
 #include "baseprojectwizarddialog.h"
 
-#include <coreplugin/basefilewizard.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/documentmanager.h>
 #include <utils/projectintropage.h>
 
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h
index 3320fe4a808..1a2cfe051cf 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.h
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h
@@ -31,12 +31,9 @@
 #define BASEPROJECTWIZARDDIALOG_H
 
 #include "projectexplorer_export.h"
-#include <coreplugin/featureprovider.h>
 #include <coreplugin/basefilewizard.h>
 #include <utils/wizard.h>
 
-#include <QWizard>
-
 namespace Utils {
     class ProjectIntroPage;
 }
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 5d9dd7f2f64..0f0754d9ccc 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -29,10 +29,8 @@
 
 #include "buildconfiguration.h"
 
-#include "buildmanager.h"
 #include "buildsteplist.h"
 #include "projectexplorer.h"
-#include "projectexplorerconstants.h"
 #include "kitmanager.h"
 #include "target.h"
 #include "project.h"
@@ -45,8 +43,6 @@
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
 
-#include <QProcess>
-
 static const char BUILD_STEP_LIST_COUNT[] = "ProjectExplorer.BuildConfiguration.BuildStepListCount";
 static const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildStepList.";
 static const char CLEAR_SYSTEM_ENVIRONMENT_KEY[] = "ProjectExplorer.BuildConfiguration.ClearSystemEnvironment";
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index c07c483b7d2..b778229784a 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -35,8 +35,6 @@
 
 #include <utils/environment.h>
 
-#include <QStringList>
-
 namespace Utils {
 class AbstractMacroExpander;
 }
diff --git a/src/plugins/projectexplorer/buildenvironmentwidget.cpp b/src/plugins/projectexplorer/buildenvironmentwidget.cpp
index a37312dc574..fb4faa01b67 100644
--- a/src/plugins/projectexplorer/buildenvironmentwidget.cpp
+++ b/src/plugins/projectexplorer/buildenvironmentwidget.cpp
@@ -33,7 +33,6 @@
 #include "environmentwidget.h"
 
 #include <projectexplorer/target.h>
-#include <utils/qtcassert.h>
 
 #include <QVBoxLayout>
 #include <QCheckBox>
diff --git a/src/plugins/projectexplorer/buildenvironmentwidget.h b/src/plugins/projectexplorer/buildenvironmentwidget.h
index 07e3976f83e..8c49c69d3a9 100644
--- a/src/plugins/projectexplorer/buildenvironmentwidget.h
+++ b/src/plugins/projectexplorer/buildenvironmentwidget.h
@@ -30,7 +30,6 @@
 #ifndef BUILDENVIRONMENTWIDGET_H
 #define BUILDENVIRONMENTWIDGET_H
 
-#include <projectexplorer/buildstep.h>
 #include <projectexplorer/namedwidget.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 2705e80ed92..f450f6727a1 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -32,7 +32,6 @@
 #include "buildprogress.h"
 #include "buildsteplist.h"
 #include "compileoutputwindow.h"
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "project.h"
 #include "projectexplorersettings.h"
@@ -45,13 +44,10 @@
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <projectexplorer/session.h>
 #include <extensionsystem/pluginmanager.h>
-#include <utils/qtcassert.h>
 
-#include <QDir>
 #include <QPointer>
 #include <QTime>
 #include <QTimer>
-#include <QMetaType>
 #include <QList>
 #include <QHash>
 #include <QFutureWatcher>
diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp
index 158de462830..1f83cbe0c90 100644
--- a/src/plugins/projectexplorer/buildprogress.cpp
+++ b/src/plugins/projectexplorer/buildprogress.cpp
@@ -34,6 +34,7 @@
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <QFont>
 #include <QPixmap>
 #include <QDebug>
diff --git a/src/plugins/projectexplorer/buildprogress.h b/src/plugins/projectexplorer/buildprogress.h
index e6440f94b5b..2535f5e5418 100644
--- a/src/plugins/projectexplorer/buildprogress.h
+++ b/src/plugins/projectexplorer/buildprogress.h
@@ -34,7 +34,8 @@
 
 #include <QPointer>
 #include <QWidget>
-#include <QLabel>
+
+QT_FORWARD_DECLARE_CLASS(QLabel)
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index bb07f50b496..2469430da4a 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -28,22 +28,17 @@
 ****************************************************************************/
 
 #include "buildsettingspropertiespage.h"
-#include "buildstep.h"
 #include "buildstepspage.h"
 #include "project.h"
-#include "projectexplorerconstants.h"
 #include "target.h"
 #include "buildconfiguration.h"
 #include "buildconfigurationmodel.h"
 
-#include <coreplugin/coreconstants.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/buildmanager.h>
 
 #include <QMargins>
-#include <QTimer>
 #include <QCoreApplication>
 #include <QComboBox>
 #include <QInputDialog>
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h
index 32f214e771d..42fd178bc3f 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h
@@ -33,7 +33,6 @@
 #include "iprojectproperties.h"
 
 #include <QWidget>
-#include <QIcon>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index aff53ec4358..bcc2b3d0fd2 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -33,7 +33,6 @@
 #include "buildsteplist.h"
 #include "projectexplorerconstants.h"
 
-#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
@@ -42,7 +41,6 @@
 
 #include <QSignalMapper>
 
-#include <QPropertyAnimation>
 #include <QLabel>
 #include <QPushButton>
 #include <QMenu>
@@ -50,7 +48,6 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QMessageBox>
-#include <QGraphicsOpacityEffect>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/buildstepspage.h b/src/plugins/projectexplorer/buildstepspage.h
index ee8222d7eca..2162d01bdd2 100644
--- a/src/plugins/projectexplorer/buildstepspage.h
+++ b/src/plugins/projectexplorer/buildstepspage.h
@@ -31,7 +31,6 @@
 #define BUILDSTEPSPAGE_H
 
 #include "buildstep.h"
-#include "deployconfiguration.h"
 #include "namedwidget.h"
 #include <utils/detailsbutton.h>
 
diff --git a/src/plugins/projectexplorer/cesdkhandler.cpp b/src/plugins/projectexplorer/cesdkhandler.cpp
index 8cb5ec6fcbe..b6b245cfd36 100644
--- a/src/plugins/projectexplorer/cesdkhandler.cpp
+++ b/src/plugins/projectexplorer/cesdkhandler.cpp
@@ -31,8 +31,8 @@
 
 #include <utils/environment.h>
 
-#include <QFile>
 #include <QDebug>
+#include <QFile>
 #include <QXmlStreamReader>
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/cesdkhandler.h b/src/plugins/projectexplorer/cesdkhandler.h
index a37dc38f5f5..dd0ac332015 100644
--- a/src/plugins/projectexplorer/cesdkhandler.h
+++ b/src/plugins/projectexplorer/cesdkhandler.h
@@ -32,7 +32,6 @@
 
 #include <projectexplorer/projectexplorer.h>
 
-#include <QStringList>
 #include <QDir>
 
 namespace Utils {
diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp
index 6de86dc241a..eab8e37d495 100644
--- a/src/plugins/projectexplorer/clangparser.cpp
+++ b/src/plugins/projectexplorer/clangparser.cpp
@@ -29,7 +29,6 @@
 
 #include "clangparser.h"
 #include "ldparser.h"
-#include "taskwindow.h"
 #include "projectexplorerconstants.h"
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
index 51cc900a770..839feef5ac3 100644
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
@@ -34,8 +34,6 @@
 #include <texteditor/icodestylepreferencesfactory.h>
 #include <texteditor/codestyleeditor.h>
 
-#include <QTextCodec>
-
 using namespace TextEditor;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 81ae4b96136..cc3073b7f70 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -31,25 +31,20 @@
 #include "buildmanager.h"
 #include "showoutputtaskhandler.h"
 #include "task.h"
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
 #include "taskhub.h"
 
-#include <coreplugin/icontext.h>
+#include <coreplugin/outputwindow.h>
 #include <find/basetextfind.h>
-#include <aggregation/aggregate.h>
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
 
-#include <QKeyEvent>
 #include <QIcon>
 #include <QTextCharFormat>
 #include <QTextBlock>
 #include <QTextCursor>
-#include <QTextEdit>
-#include <QScrollBar>
 #include <QPlainTextEdit>
 #include <QToolButton>
 
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index 202fdbaf44f..920b80986cc 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -31,7 +31,6 @@
 #define COMPILEOUTPUTWINDOW_H
 
 #include "buildstep.h"
-#include <coreplugin/outputwindow.h>
 #include <coreplugin/ioutputpane.h>
 
 #include <QHash>
diff --git a/src/plugins/projectexplorer/copytaskhandler.cpp b/src/plugins/projectexplorer/copytaskhandler.cpp
index ba8ae2948c3..58c3f691ad2 100644
--- a/src/plugins/projectexplorer/copytaskhandler.cpp
+++ b/src/plugins/projectexplorer/copytaskhandler.cpp
@@ -30,12 +30,9 @@
 #include "copytaskhandler.h"
 
 #include "task.h"
-#include "taskwindow.h"
 
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 
-#include <QDir>
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp
index 3ac9f87d4ed..1a068a0b3f0 100644
--- a/src/plugins/projectexplorer/currentprojectfind.cpp
+++ b/src/plugins/projectexplorer/currentprojectfind.cpp
@@ -38,8 +38,6 @@
 
 #include <QDebug>
 #include <QSettings>
-#include <QLabel>
-#include <QHBoxLayout>
 
 using namespace Find;
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h
index dcf3b09824b..2f2ee6ece61 100644
--- a/src/plugins/projectexplorer/customtoolchain.h
+++ b/src/plugins/projectexplorer/customtoolchain.h
@@ -33,9 +33,12 @@
 #include "projectexplorer_export.h"
 
 #include "abi.h"
+#include "headerpath.h"
 #include "toolchain.h"
 #include "toolchainconfigwidget.h"
 
+#include <utils/fileutils.h>
+
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
 class QTextEdit;
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index a2e8627d480..58d6cf6c2a7 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -36,7 +36,6 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index 87d84c721fc..241b40a0bf4 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -39,7 +39,6 @@
 
 #include <QDebug>
 #include <QCoreApplication>
-#include <QLocale>
 #include <QFile>
 #include <QDir>
 #include <QFileInfo>
diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
index 438a20d2045..d475cdcbc1f 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp
@@ -32,7 +32,6 @@
 #include "customwizardparameters.h"
 
 #include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
 
 #include <QProcess>
 #include <QDir>
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index efc6dfcb3cd..4e75ec1792f 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -35,21 +35,14 @@
 #include <coreplugin/idocument.h>
 #include <utils/detailswidget.h>
 
-#include <QVector>
 #include <QDebug>
 #include <QSize>
 #include <QCoreApplication>
 
-#include <QLabel>
-#include <QApplication>
 #include <QHBoxLayout>
 #include <QTreeView>
 #include <QSpacerItem>
-#include <QHeaderView>
 #include <QMessageBox>
-#include <QPushButton>
-#include <QToolButton>
-#include <QWidget>
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/deployablefile.cpp b/src/plugins/projectexplorer/deployablefile.cpp
index 02110ce2fea..84d70ad3a51 100644
--- a/src/plugins/projectexplorer/deployablefile.cpp
+++ b/src/plugins/projectexplorer/deployablefile.cpp
@@ -31,7 +31,6 @@
 
 #include <QFileInfo>
 #include <QHash>
-#include <QPair>
 
 using namespace Utils;
 
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index e88bfb2b9e5..da09c466370 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -29,19 +29,14 @@
 
 #include "deployconfiguration.h"
 
-#include "buildmanager.h"
 #include "buildsteplist.h"
-#include "buildstepspage.h"
 #include "kitinformation.h"
 #include "project.h"
 #include "projectexplorer.h"
-#include "projectexplorerconstants.h"
 #include "target.h"
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <QStringList>
-
 using namespace ProjectExplorer;
 
 namespace {
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index 846b1c05118..cf36f092283 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/src/plugins/projectexplorer/deployconfiguration.h
@@ -33,7 +33,6 @@
 #include "projectexplorer_export.h"
 
 #include "projectconfiguration.h"
-#include "namedwidget.h"
 
 #include <QString>
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
index 812914902b1..93625d2b932 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
@@ -32,8 +32,9 @@
 #include "idevice.h"
 #include "idevicefactory.h"
 
+#include <coreplugin/id.h>
+
 #include <extensionsystem/pluginmanager.h>
-#include <utils/qtcassert.h>
 
 #include <QPushButton>
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h
index 89d3dd5c2d2..1ceb0565e7d 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h
+++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h
@@ -30,10 +30,10 @@
 #ifndef DEVICEFACTORYSELECTIONDIALOG_H
 #define DEVICEFACTORYSELECTIONDIALOG_H
 
-#include <coreplugin/id.h>
-
 #include <QDialog>
 
+namespace Core { class Id; }
+
 namespace ProjectExplorer {
 class IDeviceFactory;
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 6a0f0861247..bbfd502ec74 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -31,18 +31,16 @@
 #include "idevicefactory.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/project.h>
+#include <utils/fileutils.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
 
 #include <QFileInfo>
 #include <QHash>
 #include <QList>
-#include <QSettings>
 #include <QString>
-#include <QVariantHash>
 #include <QVariantList>
 
 #include <limits>
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.h b/src/plugins/projectexplorer/devicesupport/devicemanager.h
index d57f3074060..0255b9699d7 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.h
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.h
@@ -32,10 +32,11 @@
 #include "idevice.h"
 
 #include <projectexplorer/projectexplorer_export.h>
-#include <utils/fileutils.h>
 
 #include <QObject>
 
+namespace Utils { class FileName; }
+
 namespace ProjectExplorer {
 class IDevice;
 class IDeviceFactory;
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
index 97e35c8bf7d..aa8b9e55d1c 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
@@ -28,10 +28,8 @@
 ****************************************************************************/
 #include "devicemanagermodel.h"
 
-#include "../projectexplorerconstants.h"
 #include "devicemanager.h"
 
-#include <coreplugin/id.h>
 #include <utils/qtcassert.h>
 
 #include <QString>
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
index 1148ee0f2f5..c162a12f163 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
+++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
@@ -32,8 +32,6 @@
 #include "../projectexplorer_export.h"
 #include "idevice.h"
 
-#include <coreplugin/id.h>
-
 #include <QAbstractListModel>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
index ba0ef446248..75fc23a031a 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
@@ -40,13 +40,10 @@
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QLabel>
-#include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSortFilterProxyModel>
-#include <QSpacerItem>
 #include <QTextBrowser>
-#include <QTextDocument>
 #include <QTreeView>
 #include <QVBoxLayout>
 
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h
index 672ddbec946..e67d2c10017 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h
@@ -32,14 +32,13 @@
 
 #include "../projectexplorer_export.h"
 
-#include <projectexplorer/kit.h>
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/devicesupport/deviceprocesslist.h>
 
 #include <QDialog>
 
 namespace ProjectExplorer {
 
+class DeviceProcess;
 class KitChooser;
 
 namespace Internal { class DeviceProcessesDialogPrivate; }
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
index 14e63f997a6..9bb129bf040 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
@@ -34,7 +34,6 @@
 
 #include <QAbstractItemModel>
 #include <QList>
-#include <QSharedPointer>
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
index c1d7a61f81d..13aa949d8fd 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
@@ -34,7 +34,6 @@
 
 #include <QCoreApplication>
 #include <QString>
-#include <QIcon>
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
index fc5e572d524..1d7469cd064 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
@@ -34,28 +34,19 @@
 #include "devicemanager.h"
 #include "devicemanagermodel.h"
 #include "deviceprocessesdialog.h"
-#include "deviceprocesslist.h"
 #include "idevice.h"
 #include "idevicefactory.h"
 #include "idevicewidget.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <extensionsystem/pluginmanager.h>
-#include <utils/portlist.h>
 #include <utils/qtcassert.h>
 
-#include <QFileInfo>
 #include <QPixmap>
-#include <QRegExp>
-#include <QSettings>
+#include <QPushButton>
 #include <QSignalMapper>
 #include <QTextStream>
 
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QIntValidator>
-
 #include <algorithm>
 
 using namespace Core;
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
index e0824037c14..d589400a43f 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
@@ -31,15 +31,14 @@
 #define DEVICESETTINGSWIDGET_H
 
 #include "devicesupport/idevice.h"
-#include <coreplugin/id.h>
 
 #include <QList>
 #include <QString>
-#include <QPushButton>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QSignalMapper;
+class QPushButton;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index ab827c7b686..aefa7cd7978 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -31,7 +31,6 @@
 #include "devicemanager.h"
 #include "deviceprocesslist.h"
 
-#include <coreplugin/id.h>
 #include <ssh/sshconnection.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/doubletabwidget.cpp b/src/plugins/projectexplorer/doubletabwidget.cpp
index d6fa8325631..0e467de3e09 100644
--- a/src/plugins/projectexplorer/doubletabwidget.cpp
+++ b/src/plugins/projectexplorer/doubletabwidget.cpp
@@ -34,7 +34,6 @@
 
 #include <QRect>
 #include <QPainter>
-#include <QFont>
 #include <QMouseEvent>
 #include <QMenu>
 #include <QToolTip>
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp
index 9285eaf1d41..0ed8e28e705 100644
--- a/src/plugins/projectexplorer/editorconfiguration.cpp
+++ b/src/plugins/projectexplorer/editorconfiguration.cpp
@@ -32,18 +32,14 @@
 #include "projectexplorer.h"
 #include "project.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-
-#include <texteditor/itexteditor.h>
+#include <coreplugin/id.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/texteditorsettings.h>
-#include <texteditor/tabsettings.h>
 #include <texteditor/simplecodestylepreferences.h>
 #include <texteditor/typingsettings.h>
 #include <texteditor/storagesettings.h>
 #include <texteditor/behaviorsettings.h>
 #include <texteditor/extraencodingsettings.h>
-#include <texteditor/icodestylepreferences.h>
 #include <texteditor/icodestylepreferencesfactory.h>
 
 #include <QLatin1String>
diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h
index a55587b6110..0caaf2f58cc 100644
--- a/src/plugins/projectexplorer/editorconfiguration.h
+++ b/src/plugins/projectexplorer/editorconfiguration.h
@@ -32,11 +32,11 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
-
 #include <QObject>
 #include <QVariantMap>
 
+namespace Core { class Id; }
+
 namespace TextEditor {
 class ITextEditor;
 class BaseTextEditorWidget;
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 41b1600a57d..0d498a4f7a1 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -28,8 +28,6 @@
 ****************************************************************************/
 
 #include "foldernavigationwidget.h"
-#include "projectexplorer.h"
-#include "projectexplorerconstants.h"
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -44,7 +42,6 @@
 #include <find/findplugin.h>
 #include <texteditor/findinfiles.h>
 
-#include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
@@ -55,8 +52,6 @@
 #include <QFileSystemModel>
 #include <QVBoxLayout>
 #include <QToolButton>
-#include <QPushButton>
-#include <QLabel>
 #include <QListView>
 #include <QSortFilterProxyModel>
 #include <QAction>
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index df8dd6de971..9dcea8f2cac 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -35,11 +35,9 @@
 #include "projectexplorerconstants.h"
 #include "toolchainmanager.h"
 
-#include <utils/detailswidget.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/synchronousprocess.h>
-#include <utils/qtcassert.h>
 #include <utils/pathchooser.h>
 
 #include <QBuffer>
@@ -48,9 +46,7 @@
 #include <QProcess>
 #include <QScopedPointer>
 
-#include <QComboBox>
 #include <QFormLayout>
-#include <QLabel>
 
 using namespace Utils;
 
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index 888ac8151e4..07a2d5c58d5 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -34,6 +34,9 @@
 
 #include "toolchain.h"
 #include "abi.h"
+#include "headerpath.h"
+
+#include <utils/fileutils.h>
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp
index c313da831aa..d21056e0596 100644
--- a/src/plugins/projectexplorer/ioutputparser.cpp
+++ b/src/plugins/projectexplorer/ioutputparser.cpp
@@ -30,8 +30,6 @@
 #include "ioutputparser.h"
 #include "task.h"
 
-#include <utils/qtcassert.h>
-
 /*!
     \class ProjectExplorer::IOutputParser
 
diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp
index a0d6571197c..b3bb27d9800 100644
--- a/src/plugins/projectexplorer/kit.cpp
+++ b/src/plugins/projectexplorer/kit.cpp
@@ -29,15 +29,9 @@
 
 #include "kit.h"
 
-#include "devicesupport/devicemanager.h"
-#include "kitinformation.h"
 #include "kitmanager.h"
-#include "project.h"
-#include "toolchainmanager.h"
 #include "ioutputparser.h"
 
-#include <utils/qtcassert.h>
-
 #include <QApplication>
 #include <QIcon>
 #include <QStyle>
diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h
index e43ee7a7cc3..c32baadfa61 100644
--- a/src/plugins/projectexplorer/kit.h
+++ b/src/plugins/projectexplorer/kit.h
@@ -33,8 +33,6 @@
 #include "projectexplorer_export.h"
 #include "task.h"
 
-#include <coreplugin/id.h>
-
 #include <QVariant>
 
 namespace Utils { class Environment; }
diff --git a/src/plugins/projectexplorer/kitchooser.cpp b/src/plugins/projectexplorer/kitchooser.cpp
index 2110d069b26..1bfe8e6f0c9 100644
--- a/src/plugins/projectexplorer/kitchooser.cpp
+++ b/src/plugins/projectexplorer/kitchooser.cpp
@@ -31,9 +31,6 @@
 
 #include "kitinformation.h"
 #include "kitmanager.h"
-#include "abi.h"
-
-#include <utils/qtcassert.h>
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index a7ff60aab9d..a87366efe1e 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -39,13 +39,8 @@
 
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/abi.h>
-#include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
 #include <QFileInfo>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h
index 6f7e8006d29..ba65e5831c4 100644
--- a/src/plugins/projectexplorer/kitinformation.h
+++ b/src/plugins/projectexplorer/kitinformation.h
@@ -34,14 +34,12 @@
 #include "kit.h"
 
 #include "devicesupport/idevice.h"
-#include "toolchain.h"
-
-#include <utils/fileutils.h>
 
 #include <QVariant>
 
 namespace ProjectExplorer {
 
+class ToolChain;
 class KitConfigWidget;
 
 // --------------------------------------------------------------------------
diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
index 82fa7d69504..b655c822aad 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
@@ -44,7 +44,6 @@
 #include <utils/fancylineedit.h>
 
 #include <QComboBox>
-#include <QLabel>
 #include <QPushButton>
 
 using namespace Core;
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 31e35e0a516..911d90fb645 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -30,27 +30,20 @@
 #include "kitmanager.h"
 
 #include "kit.h"
-#include "kitconfigwidget.h"
-#include "kitinformation.h"
+#include "task.h"
 #include "kitmanagerconfigwidget.h"
 #include "project.h"
-#include "projectexplorer.h"
 
 #include <coreplugin/icore.h>
 
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/persistentsettings.h>
-#include <utils/environment.h>
 #include <utils/qtcassert.h>
+#include <utils/environment.h>
 
-#include <QCoreApplication>
-#include <QDir>
 #include <QSettings>
 
-#include <QFormLayout>
-#include <QLabel>
-
 static const char KIT_DATA_KEY[] = "Profile.";
 static const char KIT_COUNT_KEY[] = "Profile.Count";
 static const char KIT_FILE_VERSION_KEY[] = "Version";
diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h
index c4017c8ca05..b13ef5288a0 100644
--- a/src/plugins/projectexplorer/kitmanager.h
+++ b/src/plugins/projectexplorer/kitmanager.h
@@ -32,17 +32,18 @@
 
 #include "projectexplorer_export.h"
 
-#include "task.h"
-
 #include <coreplugin/id.h>
-#include <utils/fileutils.h>
 
 #include <QObject>
 #include <QPair>
 
-namespace Utils { class Environment; }
+namespace Utils {
+class FileName;
+class Environment;
+}
 
 namespace ProjectExplorer {
+class Task;
 class IOutputParser;
 class Kit;
 class KitConfigWidget;
diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp
index c73aeaf33f5..3b49bfbcf67 100644
--- a/src/plugins/projectexplorer/kitmodel.cpp
+++ b/src/plugins/projectexplorer/kitmodel.cpp
@@ -37,7 +37,6 @@
 
 #include <QApplication>
 #include <QLayout>
-#include <QMessageBox>
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp
index 67709924e70..a39b5b70df4 100644
--- a/src/plugins/projectexplorer/kitoptionspage.cpp
+++ b/src/plugins/projectexplorer/kitoptionspage.cpp
@@ -35,10 +35,6 @@
 #include "kitmanagerconfigwidget.h"
 #include "kitmanager.h"
 
-#include <coreplugin/icore.h>
-
-#include <utils/qtcassert.h>
-
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QItemSelectionModel>
diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp
index 4dad65fe47c..bdbe37835c3 100644
--- a/src/plugins/projectexplorer/linuxiccparser.cpp
+++ b/src/plugins/projectexplorer/linuxiccparser.cpp
@@ -29,7 +29,6 @@
 
 #include "linuxiccparser.h"
 #include "ldparser.h"
-#include "taskwindow.h"
 #include "projectexplorerconstants.h"
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp
index ad8dba196f3..057f2f43a8d 100644
--- a/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp
+++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp
@@ -33,8 +33,6 @@
 
 #include <coreplugin/variablemanager.h>
 
-#include <utils/stringutils.h>
-
 namespace ProjectExplorer {
 
 /// LocalApplicationRunConfiguration
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
index e1038f5bbd8..3fc1626fad0 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
@@ -29,13 +29,10 @@
 
 #include "localapplicationruncontrol.h"
 #include "localapplicationrunconfiguration.h"
-#include "projectexplorerconstants.h"
 
-#include <utils/outputformat.h>
 #include <utils/qtcassert.h>
 #include <utils/environment.h>
 
-#include <QLabel>
 #include <QIcon>
 #include <QDir>
 
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.h b/src/plugins/projectexplorer/localapplicationruncontrol.h
index 685954a392d..4a7bbb38e23 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.h
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.h
@@ -32,7 +32,6 @@
 
 #include "runconfiguration.h"
 #include "applicationlauncher.h"
-#include "projectexplorerconstants.h"
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 301526a7508..431b65f94e2 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -30,7 +30,6 @@
 #include "miniprojecttargetselector.h"
 #include "target.h"
 
-#include <utils/qtcassert.h>
 #include <utils/styledbar.h>
 #include <utils/stylehelper.h>
 
@@ -57,7 +56,6 @@
 #include <QPainter>
 #include <QAction>
 #include <QItemDelegate>
-#include <QApplication>
 
 static QIcon createCenteredIcon(const QIcon &icon, const QIcon &overlay)
 {
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index cf2303a01b0..63a3b9bdb48 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -31,12 +31,7 @@
 
 #include "msvcparser.h"
 #include "projectexplorerconstants.h"
-#include "headerpath.h"
 
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorersettings.h>
-
-#include <utils/fileutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/winutils.h>
 #include <utils/qtcassert.h>
@@ -46,9 +41,9 @@
 #include <QFileInfo>
 #include <QProcess>
 #include <QSettings>
-#include <QUrl>
+
+#include <QLabel>
 #include <QFormLayout>
-#include <QDesktopServices>
 
 #define KEY_ROOT "ProjectExplorer.MsvcToolChain."
 static const char varsBatKeyC[] = KEY_ROOT"VarsBat";
diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index db9d532e814..92162bed49c 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/src/plugins/projectexplorer/msvctoolchain.h
@@ -34,9 +34,7 @@
 #include "abi.h"
 #include "toolchainconfigwidget.h"
 
-#include <utils/environment.h>
-
-#include <QLabel>
+QT_FORWARD_DECLARE_CLASS(QLabel)
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/pluginfilefactory.cpp b/src/plugins/projectexplorer/pluginfilefactory.cpp
index f27e4893adf..86e24a46b2a 100644
--- a/src/plugins/projectexplorer/pluginfilefactory.cpp
+++ b/src/plugins/projectexplorer/pluginfilefactory.cpp
@@ -30,15 +30,11 @@
 #include "pluginfilefactory.h"
 #include "projectexplorer.h"
 #include "project.h"
-#include "projectexplorerconstants.h"
 #include "iprojectmanager.h"
-#include "session.h"
 
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/mimedatabase.h>
-#include <coreplugin/messagemanager.h>
 
 #include <QDebug>
 #include <QMessageBox>
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 043f05fcfc0..019fbe16f05 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -29,19 +29,14 @@
 
 #include "processstep.h"
 #include "buildstep.h"
-#include "project.h"
 #include "buildconfiguration.h"
 #include "projectexplorerconstants.h"
 #include "target.h"
 #include "kit.h"
 
-#include <coreplugin/idocument.h>
 #include <coreplugin/variablemanager.h>
-#include <utils/qtcprocess.h>
-#include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QFileDialog>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h
index c5f28fe6a09..6e509577c1f 100644
--- a/src/plugins/projectexplorer/processstep.h
+++ b/src/plugins/projectexplorer/processstep.h
@@ -33,8 +33,6 @@
 #include "ui_processstep.h"
 #include "abstractprocessstep.h"
 
-#include <utils/environment.h>
-
 namespace ProjectExplorer {
 
 namespace Internal {
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index d3ca4925dce..2029211066a 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -30,24 +30,17 @@
 #include "project.h"
 
 #include "buildconfiguration.h"
-#include "deployconfiguration.h"
 #include "editorconfiguration.h"
 #include "projectexplorer.h"
-#include "projectexplorerconstants.h"
-#include "projectnodes.h"
-#include "runconfiguration.h"
 #include "target.h"
 #include "settingsaccessor.h"
 
 #include <coreplugin/idocument.h>
 #include <coreplugin/icontext.h>
-#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildmanager.h>
-#include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 #include <limits>
 #include <utils/qtcassert.h>
-#include <utils/environment.h>
 
 /*!
     \class ProjectExplorer::Project
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 2795b62d68a..a8013ad37b8 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -35,7 +35,6 @@
 #include <coreplugin/id.h>
 
 #include <QObject>
-#include <QSet>
 #include <QFileSystemModel>
 
 namespace Core {
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index f1bb00e4ece..9b58fcc0e5f 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -40,7 +40,6 @@
 #include "kitmanager.h"
 #include "kitoptionspage.h"
 #include "target.h"
-#include "targetsettingspanel.h"
 #include "toolchainmanager.h"
 #include "toolchainoptionspage.h"
 #include "copytaskhandler.h"
@@ -58,12 +57,10 @@
 #include "dependenciespanel.h"
 #include "foldernavigationwidget.h"
 #include "iprojectmanager.h"
-#include "metatypedeclarations.h"
 #include "nodesvisitor.h"
 #include "appoutputpane.h"
 #include "pluginfilefactory.h"
 #include "processstep.h"
-#include "projectexplorerconstants.h"
 #include "customwizard.h"
 #include "kitinformation.h"
 #include "projectfilewizardextension.h"
@@ -94,37 +91,27 @@
 #endif
 
 #include <extensionsystem/pluginspec.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
 #include <coreplugin/imode.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/findplaceholder.h>
-#include <coreplugin/basefilewizard.h>
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/variablemanager.h>
 #include <coreplugin/fileutils.h>
 #include <coreplugin/removefiledialog.h>
-#include <extensionsystem/pluginmanager.h>
-#include <find/searchresultwindow.h>
-#include <utils/consoleprocess.h>
 #include <utils/qtcassert.h>
 #include <utils/parameteraction.h>
-#include <utils/stringutils.h>
-#include <utils/persistentsettings.h>
 
 #include <QtPlugin>
-#include <QDateTime>
 #include <QDebug>
 #include <QFileInfo>
 #include <QSettings>
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index b8bbfee40e6..8beb263a16a 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -33,7 +33,6 @@
 #include "projectexplorer_export.h"
 #include "projectexplorerconstants.h"
 
-#include <coreplugin/id.h>
 #include <extensionsystem/iplugin.h>
 
 #include <QPair>
@@ -46,6 +45,7 @@ QT_END_NAMESPACE
 
 namespace Core {
 class IMode;
+class Id;
 }
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
index bcee2314716..1482aa86f33 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
@@ -29,16 +29,13 @@
 
 #include "projectexplorersettingspage.h"
 #include "projectexplorersettings.h"
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/variablechooser.h>
 #include <utils/hostosinfo.h>
 
-#include <QLabel>
 #include <QCoreApplication>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index c4fca9ea4e5..1f69d524760 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -38,14 +38,12 @@
 #include <utils/stringutils.h>
 
 #include <coreplugin/basefilewizard.h>
-#include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/mimedatabase.h>
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditorsettings.h>
-#include <texteditor/indenter.h>
 #include <texteditor/icodestylepreferences.h>
 #include <texteditor/icodestylepreferencesfactory.h>
 #include <texteditor/normalindenter.h>
@@ -53,7 +51,6 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/editorconfiguration.h>
 
-#include <QVariant>
 #include <QtAlgorithms>
 #include <QDebug>
 #include <QFileInfo>
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 46fd97a19f6..c37d84a9b6f 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -30,18 +30,15 @@
 #include "projectmodels.h"
 
 #include "project.h"
-#include "projectexplorerconstants.h"
 #include "projectnodes.h"
 #include "projectexplorer.h"
 
 #include <coreplugin/fileiconprovider.h>
-#include <utils/qtcassert.h>
 
 #include <QDebug>
 #include <QFileInfo>
 
 #include <QFont>
-#include <QIcon>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 008716f8460..021bbbd211b 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -41,7 +41,6 @@
 
 #include <QFileInfo>
 #include <QDir>
-#include <QApplication>
 #include <QIcon>
 #include <QStyle>
 
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 966766a5121..51f77f56d59 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -33,7 +33,6 @@
 #include "projectnodes.h"
 #include "project.h"
 #include "session.h"
-#include "projectexplorerconstants.h"
 #include "projectmodels.h"
 
 #include <coreplugin/actionmanager/command.h>
@@ -41,22 +40,16 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/icontext.h>
 
-#include <utils/qtcassert.h>
 #include <utils/navigationtreeview.h>
 
 #include <QDebug>
 #include <QSettings>
 
-#include <QHeaderView>
 #include <QStyledItemDelegate>
-#include <QTreeView>
 #include <QVBoxLayout>
 #include <QToolButton>
-#include <QFocusEvent>
 #include <QAction>
-#include <QPalette>
 #include <QMenu>
 
 using namespace Core;
diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp
index 6f74e8b4eea..7dc9d497773 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.cpp
+++ b/src/plugins/projectexplorer/projectwelcomepage.cpp
@@ -29,8 +29,6 @@
 
 #include "projectwelcomepage.h"
 
-#include "projectexplorerconstants.h"
-
 #include <utils/stringutils.h>
 
 #include <QDeclarativeEngine>
diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h
index 0918dbc2cfa..01d6693774a 100644
--- a/src/plugins/projectexplorer/projectwelcomepage.h
+++ b/src/plugins/projectexplorer/projectwelcomepage.h
@@ -31,10 +31,8 @@
 #define PROJECTWELCOMEPAGE_H
 
 #include <QAbstractListModel>
-#include <QStringList>
 
 #include <utils/iwelcomepage.h>
-#include <coreplugin/icore.h>
 
 QT_BEGIN_NAMESPACE
 class QDeclarativeEngine;
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index e84873d4f46..c4a08917690 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -34,20 +34,16 @@
 #include "kitmanager.h"
 #include "project.h"
 #include "projectexplorer.h"
-#include "projectexplorerconstants.h"
 #include "session.h"
-#include "projecttreewidget.h"
 #include "iprojectproperties.h"
 #include "targetsettingspanel.h"
 #include "target.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
 
-#include <QApplication>
 #include <QGridLayout>
 #include <QLabel>
 #include <QPainter>
diff --git a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp
index c33cdd62c8f..45c0b303540 100644
--- a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp
+++ b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp
@@ -31,9 +31,7 @@
 
 #include "ipublishingwizardfactory.h"
 
-#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/project.h>
-#include <utils/qtcassert.h>
 
 #include <QPushButton>
 
diff --git a/src/plugins/projectexplorer/removetaskhandler.cpp b/src/plugins/projectexplorer/removetaskhandler.cpp
index bf92de56b9a..3138a25885d 100644
--- a/src/plugins/projectexplorer/removetaskhandler.cpp
+++ b/src/plugins/projectexplorer/removetaskhandler.cpp
@@ -33,12 +33,7 @@
 #include "task.h"
 #include "taskhub.h"
 
-#include <coreplugin/coreconstants.h>
-
-#include <QDir>
 #include <QAction>
-#include <QApplication>
-#include <QClipboard>
 
 using namespace ProjectExplorer::Internal;
 
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 99ea22ef1fe..b23ccbd6f34 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -34,7 +34,6 @@
 #include "toolchain.h"
 #include "abi.h"
 #include "buildconfiguration.h"
-#include "projectexplorerconstants.h"
 #include "kitinformation.h"
 #include <extensionsystem/pluginmanager.h>
 
@@ -45,8 +44,6 @@
 #include <coreplugin/icore.h>
 
 #include <QTimer>
-#include <QSettings>
-#include <QMessageBox>
 #include <QPushButton>
 
 #ifdef Q_OS_MAC
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 8a9e0ca5f27..da4aab77f0c 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -36,7 +36,6 @@
 
 #include <utils/outputformat.h>
 
-#include <QMetaType>
 #include <QPointer>
 #include <QWidget>
 
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index ff390c724fa..66895367a71 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -37,19 +37,15 @@
 #include "target.h"
 #include "project.h"
 
-#include <coreplugin/coreconstants.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/buildmanager.h>
 #include <utils/qtcassert.h>
 
-#include <QPair>
 #include <QVariant>
 #include <QAction>
-#include <QButtonGroup>
 #include <QComboBox>
 #include <QGridLayout>
-#include <QHeaderView>
 #include <QInputDialog>
 #include <QLabel>
 #include <QMenu>
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h
index bdfa4ed4ce2..192091986ae 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.h
@@ -33,7 +33,6 @@
 #include "iprojectproperties.h"
 
 #include <QWidget>
-#include <QIcon>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index a8241515f89..0116f3578b1 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -31,37 +31,27 @@
 
 #include "project.h"
 #include "projectexplorer.h"
-#include "projectexplorerconstants.h"
 #include "nodesvisitor.h"
 #include "editorconfiguration.h"
 #include "projectnodes.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/imode.h>
-#include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/modemanager.h>
 
 #include <texteditor/itexteditor.h>
 
-#include <utils/listutils.h>
-#include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
 
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
-#include <QFuture>
-#include <QSettings>
-#include <QTimer>
 
-#include <QApplication>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QTextCodec>
 
 namespace {
     bool debug = false;
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index 8bdd00694f2..f9b3b46697b 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -35,7 +35,6 @@
 #include "project.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
-#include "projectexplorerconstants.h"
 #include "target.h"
 #include "toolchain.h"
 #include "toolchainmanager.h"
@@ -45,10 +44,10 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <extensionsystem/pluginmanager.h>
+#include <utils/persistentsettings.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
-#include <utils/persistentsettings.h>
 
 #include <QApplication>
 #include <QFile>
diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h
index a879cd2221c..eb043f4e975 100644
--- a/src/plugins/projectexplorer/settingsaccessor.h
+++ b/src/plugins/projectexplorer/settingsaccessor.h
@@ -31,7 +31,10 @@
 #define SETTINGSACCESSOR_H
 
 #include <utils/fileutils.h>
-#include <utils/persistentsettings.h>
+
+#include <QVariantMap>
+
+namespace Utils { class PersistentSettingsWriter; }
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/showineditortaskhandler.cpp b/src/plugins/projectexplorer/showineditortaskhandler.cpp
index aee1be4749d..f01c9e3ced5 100644
--- a/src/plugins/projectexplorer/showineditortaskhandler.cpp
+++ b/src/plugins/projectexplorer/showineditortaskhandler.cpp
@@ -29,7 +29,6 @@
 
 #include "showineditortaskhandler.h"
 
-#include "projectexplorerconstants.h"
 #include "task.h"
 
 #include <texteditor/basetexteditor.h>
diff --git a/src/plugins/projectexplorer/showoutputtaskhandler.cpp b/src/plugins/projectexplorer/showoutputtaskhandler.cpp
index 0e98e7e2009..4b1c127c95e 100644
--- a/src/plugins/projectexplorer/showoutputtaskhandler.cpp
+++ b/src/plugins/projectexplorer/showoutputtaskhandler.cpp
@@ -29,7 +29,6 @@
 
 #include "showoutputtaskhandler.h"
 
-#include "projectexplorerconstants.h"
 #include "task.h"
 
 #include "compileoutputwindow.h"
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index 922af6c690d..b0cf49affbf 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -37,7 +37,6 @@
 #include "buildconfiguration.h"
 #include "deployconfiguration.h"
 #include "project.h"
-#include "projectexplorerconstants.h"
 #include "runconfiguration.h"
 
 #include <limits>
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index c29920af64d..790704af838 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -43,13 +43,11 @@
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/buildmanager.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/runconfiguration.h>
 #include <utils/qtcassert.h>
 
-#include <QCoreApplication>
 #include <QLabel>
 #include <QMenu>
 #include <QMessageBox>
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index 58e95fb5401..7418462fcad 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -29,8 +29,6 @@
 
 #include "task.h"
 
-#include <QDir>
-
 namespace ProjectExplorer
 {
 
diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index f8fbcdfe4df..eb7272db096 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -28,11 +28,8 @@
 ****************************************************************************/
 
 #include "taskhub.h"
-#include "extensionsystem/pluginmanager.h"
 #include "projectexplorer.h"
 #include <coreplugin/ioutputpane.h>
-#include <texteditor/basetextmark.h>
-#include <QMetaType>
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp
index 2470f066327..c4234ecc90a 100644
--- a/src/plugins/projectexplorer/taskmodel.cpp
+++ b/src/plugins/projectexplorer/taskmodel.cpp
@@ -30,7 +30,6 @@
 #include "taskmodel.h"
 
 #include "task.h"
-#include "taskhub.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 67320e93c1b..1d613021cf4 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -36,22 +36,15 @@
 #include "taskmodel.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
 #include <QDir>
-#include <QFileInfo>
-#include <QApplication>
-#include <QClipboard>
-#include <QKeyEvent>
 #include <QListView>
 #include <QPainter>
 #include <QStyledItemDelegate>
-#include <QSortFilterProxyModel>
 #include <QMenu>
 #include <QToolButton>
 
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 4ee75602876..8a5a6be3558 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -30,11 +30,11 @@
 #include "toolchain.h"
 
 #include "abi.h"
+#include "headerpath.h"
 #include "toolchainmanager.h"
 #include "task.h"
 
-#include <extensionsystem/pluginmanager.h>
-#include <utils/environment.h>
+#include <utils/fileutils.h>
 
 #include <QCoreApplication>
 #include <QUuid>
@@ -124,6 +124,11 @@ QString ToolChain::id() const
     return d->m_id;
 }
 
+QList<Utils::FileName> ToolChain::suggestedMkspecList() const
+{
+    return QList<Utils::FileName>();
+}
+
 Utils::FileName ToolChain::suggestedDebugger() const
 {
     return ToolChainManager::instance()->defaultDebugger(targetAbi());
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 9a779f364bf..b45de47853c 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -31,10 +31,6 @@
 #define TOOLCHAIN_H
 
 #include "projectexplorer_export.h"
-#include "headerpath.h"
-
-#include <coreplugin/id.h>
-#include <utils/fileutils.h>
 
 #include <QObject>
 #include <QString>
@@ -42,6 +38,7 @@
 
 namespace Utils {
 class Environment;
+class FileName;
 }
 
 namespace ProjectExplorer {
@@ -51,6 +48,7 @@ class ToolChainPrivate;
 }
 
 class Abi;
+class HeaderPath;
 class IOutputParser;
 class ToolChainConfigWidget;
 class ToolChainFactory;
@@ -73,7 +71,7 @@ public:
     bool isAutoDetected() const;
     QString id() const;
 
-    virtual QList<Utils::FileName> suggestedMkspecList() const { return QList<Utils::FileName>(); }
+    virtual QList<Utils::FileName> suggestedMkspecList() const;
     virtual Utils::FileName suggestedDebugger() const;
 
     virtual QString type() const = 0;
diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp
index c41f9417243..7784d10faa3 100644
--- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp
+++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp
@@ -31,12 +31,10 @@
 #include "toolchain.h"
 
 #include <utils/qtcassert.h>
-#include <utils/pathchooser.h>
 
 #include <QString>
 
 #include <QFormLayout>
-#include <QGridLayout>
 #include <QLineEdit>
 #include <QLabel>
 
diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h
index ddfaa60dc13..3c0c02fd372 100644
--- a/src/plugins/projectexplorer/toolchainconfigwidget.h
+++ b/src/plugins/projectexplorer/toolchainconfigwidget.h
@@ -32,8 +32,6 @@
 
 #include "projectexplorer_export.h"
 
-#include <utils/fileutils.h>
-
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index e24bef00e8d..53728931de7 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -31,18 +31,16 @@
 
 #include "abi.h"
 #include "kitinformation.h"
-#include "projectexplorer.h"
 #include "toolchain.h"
 
 #include <coreplugin/icore.h>
 
 #include <extensionsystem/pluginmanager.h>
-#include <extensionsystem/pluginspec.h>
 
+#include <utils/fileutils.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
 
-#include <QCoreApplication>
 #include <QDir>
 #include <QSettings>
 
diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h
index 58a656c325c..2202643aac8 100644
--- a/src/plugins/projectexplorer/toolchainmanager.h
+++ b/src/plugins/projectexplorer/toolchainmanager.h
@@ -32,12 +32,12 @@
 
 #include "projectexplorer_export.h"
 
-#include <utils/fileutils.h>
 
 #include <QList>
 #include <QObject>
 #include <QString>
 
+namespace Utils { class FileName; }
 namespace ProjectExplorer {
 class ProjectExplorerPlugin;
 class ToolChain;
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index 5f12c1af7d6..61219d78656 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -34,7 +34,6 @@
 #include "toolchainconfigwidget.h"
 #include "toolchainmanager.h"
 
-#include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/detailswidget.h>
@@ -45,7 +44,6 @@
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QItemSelectionModel>
-#include <QLabel>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp b/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp
index d2ae52c2ec2..773b2567d1a 100644
--- a/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp
+++ b/src/plugins/projectexplorer/vcsannotatetaskhandler.cpp
@@ -30,7 +30,6 @@
 #include "vcsannotatetaskhandler.h"
 
 #include "task.h"
-#include "projectexplorerconstants.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/iversioncontrol.h>
diff --git a/src/plugins/projectexplorer/wincetoolchain.cpp b/src/plugins/projectexplorer/wincetoolchain.cpp
index 558658ded4e..cb26749fed9 100644
--- a/src/plugins/projectexplorer/wincetoolchain.cpp
+++ b/src/plugins/projectexplorer/wincetoolchain.cpp
@@ -31,10 +31,7 @@
 
 #include "msvcparser.h"
 #include "projectexplorerconstants.h"
-#include "headerpath.h"
 
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorersettings.h>
 #include <utils/qtcassert.h>
 
 #include <QDir>
diff --git a/src/plugins/projectexplorer/wincetoolchain.h b/src/plugins/projectexplorer/wincetoolchain.h
index de94a4a8ca4..152a98200d3 100644
--- a/src/plugins/projectexplorer/wincetoolchain.h
+++ b/src/plugins/projectexplorer/wincetoolchain.h
@@ -34,10 +34,6 @@
 #include "abi.h"
 #include "toolchainconfigwidget.h"
 
-#include <utils/environment.h>
-
-#include <QLabel>
-
 namespace ProjectExplorer {
 namespace Internal {
 
diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.h b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
index 25c29c3f438..dad629165b8 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationwidget.h
+++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
@@ -33,6 +33,7 @@
 #define QNX_INTERNAL_BLACKBERRYDEPLOYCONFIGURATIONWIDGET_H
 
 #include <projectexplorer/deployconfiguration.h>
+#include <projectexplorer/namedwidget.h>
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
index b6aacd77a0f..26d2e358e81 100644
--- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
@@ -35,6 +35,8 @@
 #include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <utils/fileutils.h>
+
 #include <QLineEdit>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
index 49db7a942b8..e3e6918cbe6 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
@@ -32,6 +32,7 @@
 #include "qmakekitconfigwidget.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
 #include <qtsupport/baseqtversion.h>
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
index e7772aeae06..37979089735 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
@@ -34,6 +34,7 @@
 #include "remotelinuxdeployconfiguration.h"
 
 #include <projectexplorer/abi.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
index f1554145303..13758181db0 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
@@ -32,6 +32,7 @@
 #include "remotelinux_export.h"
 
 #include <projectexplorer/deployconfiguration.h>
+#include <projectexplorer/namedwidget.h>
 
 namespace RemoteLinux {
 class RemoteLinuxDeployConfiguration;
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp
index 093a38db568..613c2a7b902 100644
--- a/src/plugins/vcsbase/baseannotationhighlighter.cpp
+++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp
@@ -29,11 +29,9 @@
 
 #include "baseannotationhighlighter.h"
 
-#include <QSet>
 #include <QDebug>
 #include <QColor>
 #include <QTextDocument>
-#include <QTextEdit>
 #include <QTextCharFormat>
 
 typedef QMap<QString, QTextCharFormat> ChangeNumberFormatMap;
diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp
index 91d9db1b061..880b1affb97 100644
--- a/src/plugins/vcsbase/basecheckoutwizard.cpp
+++ b/src/plugins/vcsbase/basecheckoutwizard.cpp
@@ -28,15 +28,12 @@
 ****************************************************************************/
 
 #include "basecheckoutwizard.h"
-#include "vcsbaseconstants.h"
 #include "checkoutwizarddialog.h"
 #include "checkoutjobs.h"
 
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QCoreApplication>
-#include <QFileInfo>
 #include <QDir>
 #include <QMessageBox>
 
diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp
index b46c321b48f..03488abe7a6 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcseditorfactory.cpp
@@ -30,12 +30,11 @@
 #include "basevcseditorfactory.h"
 #include "vcsbaseeditor.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-#include <texteditor/fontsettings.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 
 #include <QCoreApplication>
+#include <QStringList>
 
 /*!
     \class VcsBase::BaseVCSEditorFactory
diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h
index 722bcb6c268..1f0d4402009 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.h
+++ b/src/plugins/vcsbase/basevcseditorfactory.h
@@ -35,7 +35,7 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-#include <QStringList>
+QT_FORWARD_DECLARE_CLASS(QStringList)
 
 namespace VcsBase {
 namespace Internal {
diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
index 146fe25c538..b17ea6b57eb 100644
--- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
@@ -30,8 +30,6 @@
 #include "basevcssubmiteditorfactory.h"
 #include "vcsbasesubmiteditor.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-
 namespace VcsBase {
 
 namespace Internal {
diff --git a/src/plugins/vcsbase/checkoutjobs.cpp b/src/plugins/vcsbase/checkoutjobs.cpp
index d2509da6ed2..7b618ec625f 100644
--- a/src/plugins/vcsbase/checkoutjobs.cpp
+++ b/src/plugins/vcsbase/checkoutjobs.cpp
@@ -35,6 +35,7 @@
 #include <QDebug>
 #include <QQueue>
 #include <QDir>
+#include <QStringList>
 #include <utils/synchronousprocess.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/vcsbase/checkoutjobs.h b/src/plugins/vcsbase/checkoutjobs.h
index 053837244e4..ce4c9a01129 100644
--- a/src/plugins/vcsbase/checkoutjobs.h
+++ b/src/plugins/vcsbase/checkoutjobs.h
@@ -33,10 +33,11 @@
 #include "vcsbase_global.h"
 
 #include <QObject>
-#include <QStringList>
 #include <QProcess>
 #include <QProcessEnvironment>
 
+QT_FORWARD_DECLARE_CLASS(QStringList)
+
 namespace VcsBase {
 
 namespace Internal { class ProcessCheckoutJobPrivate; }
diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
index a914c8b92d8..4b44a905da7 100644
--- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
+++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
@@ -34,7 +34,6 @@
 #include <utils/qtcassert.h>
 
 #include <QApplication>
-#include <QCursor>
 
 /*!
     \class VcsBase::CheckoutProgressWizardPage
diff --git a/src/plugins/vcsbase/command.cpp b/src/plugins/vcsbase/command.cpp
index 70856bf9b1f..556f86515f6 100644
--- a/src/plugins/vcsbase/command.cpp
+++ b/src/plugins/vcsbase/command.cpp
@@ -28,19 +28,20 @@
 ****************************************************************************/
 
 #include "command.h"
-#include "vcsbaseconstants.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/synchronousprocess.h>
 
 #include <QDebug>
 #include <QProcess>
+#include <QProcessEnvironment>
 #include <QFuture>
 #include <QtConcurrentRun>
 #include <QFileInfo>
 #include <QCoreApplication>
+#include <QVariant>
+#include <QStringList>
 
 Q_DECLARE_METATYPE(QVariant)
 
diff --git a/src/plugins/vcsbase/command.h b/src/plugins/vcsbase/command.h
index 8a7a0cee71e..5619d702c44 100644
--- a/src/plugins/vcsbase/command.h
+++ b/src/plugins/vcsbase/command.h
@@ -33,9 +33,10 @@
 #include "vcsbase_global.h"
 
 #include <QObject>
-#include <QStringList>
-#include <QVariant>
-#include <QProcessEnvironment>
+
+QT_FORWARD_DECLARE_CLASS(QStringList)
+QT_FORWARD_DECLARE_CLASS(QVariant)
+QT_FORWARD_DECLARE_CLASS(QProcessEnvironment)
 
 namespace VcsBase {
 
diff --git a/src/plugins/vcsbase/commonsettingspage.cpp b/src/plugins/vcsbase/commonsettingspage.cpp
index 7bcc354d4ed..16ac3600cdd 100644
--- a/src/plugins/vcsbase/commonsettingspage.cpp
+++ b/src/plugins/vcsbase/commonsettingspage.cpp
@@ -29,16 +29,13 @@
 
 #include "commonsettingspage.h"
 #include "vcsbaseconstants.h"
-#include "nicknamedialog.h"
 
 #include "ui_commonsettingspage.h"
 
 #include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
 
 #include <QDebug>
 #include <QCoreApplication>
-#include <QMessageBox>
 
 namespace VcsBase {
 namespace Internal {
diff --git a/src/plugins/vcsbase/commonsettingspage.h b/src/plugins/vcsbase/commonsettingspage.h
index cbbe05a670f..e0d0b1e45bd 100644
--- a/src/plugins/vcsbase/commonsettingspage.h
+++ b/src/plugins/vcsbase/commonsettingspage.h
@@ -34,7 +34,6 @@
 
 #include "vcsbaseoptionspage.h"
 
-#include <QPointer>
 #include <QWidget>
 
 namespace VcsBase {
diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp
index 85052ddcbca..464f399c397 100644
--- a/src/plugins/vcsbase/diffhighlighter.cpp
+++ b/src/plugins/vcsbase/diffhighlighter.cpp
@@ -36,7 +36,6 @@
 #include <QDebug>
 #include <QtAlgorithms>
 #include <QRegExp>
-#include <QBrush>
 
 /*!
     \class VcsBase::DiffHighlighter
diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp
index 9d645262912..6630da56218 100644
--- a/src/plugins/vcsbase/nicknamedialog.cpp
+++ b/src/plugins/vcsbase/nicknamedialog.cpp
@@ -33,7 +33,6 @@
 #include <utils/fileutils.h>
 
 #include <QDebug>
-#include <QFile>
 #include <QDir>
 #include <QPushButton>
 #include <QStandardItemModel>
diff --git a/src/plugins/vcsbase/submitfilemodel.cpp b/src/plugins/vcsbase/submitfilemodel.cpp
index f5d4a4212a4..89555876acb 100644
--- a/src/plugins/vcsbase/submitfilemodel.cpp
+++ b/src/plugins/vcsbase/submitfilemodel.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "submitfilemodel.h"
-#include "vcsbaseconstants.h"
 
 #include <coreplugin/fileiconprovider.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index b778149ae3b..059dff26c0f 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -29,12 +29,10 @@
 
 #include "vcsbaseclient.h"
 #include "command.h"
-#include "vcsbaseconstants.h"
 #include "vcsbaseclientsettings.h"
 #include "vcsbaseeditorparameterwidget.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/vcsmanager.h>
 
 #include <utils/qtcassert.h>
@@ -44,7 +42,6 @@
 #include <vcsbase/vcsbaseplugin.h>
 
 #include <QStringList>
-#include <QSharedPointer>
 #include <QDir>
 #include <QProcess>
 #include <QSignalMapper>
@@ -52,7 +49,8 @@
 #include <QDebug>
 #include <QFileInfo>
 #include <QByteArray>
-#include <QMetaType>
+#include <QVariant>
+#include <QProcessEnvironment>
 
 /*!
     \class VcsBase::VcsBaseClient
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index 08659977abd..114fcd8e055 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -35,12 +35,11 @@
 
 #include <QObject>
 #include <QStringList>
-#include <QSharedPointer>
-#include <QVariant>
-#include <QProcessEnvironment>
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;
+class QVariant;
+class QProcessEnvironment;
 QT_END_NAMESPACE
 
 namespace Utils {
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
index 683312696b2..5e56da91f58 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
@@ -31,9 +31,9 @@
 
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
-#include <utils/synchronousprocess.h>
 
 #include <QSettings>
+#include <QVariant>
 
 namespace {
 
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 05d1e56e87b..59541e6b9ac 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -30,16 +30,9 @@
 #include "vcsbaseeditor.h"
 #include "diffhighlighter.h"
 #include "baseannotationhighlighter.h"
-#include "vcsbaseconstants.h"
-#include "vcsbaseoutputwindow.h"
 #include "vcsbaseplugin.h"
 
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
-#include <coreplugin/iversioncontrol.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/modemanager.h>
 #include <coreplugin/vcsmanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/editorconfiguration.h>
@@ -49,30 +42,24 @@
 #include <texteditor/basetextdocument.h>
 #include <texteditor/basetextdocumentlayout.h>
 #include <texteditor/fontsettings.h>
-#include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditorsettings.h>
 #include <utils/qtcassert.h>
-#include <extensionsystem/invoker.h>
 
 #include <QDebug>
 #include <QFileInfo>
 #include <QFile>
-#include <QProcess>
 #include <QRegExp>
 #include <QSet>
 #include <QTextCodec>
-#include <QTextStream>
 #include <QUrl>
 #include <QTextBlock>
 #include <QDesktopServices>
 #include <QAction>
 #include <QKeyEvent>
-#include <QLayout>
 #include <QMenu>
 #include <QTextCursor>
 #include <QTextEdit>
 #include <QComboBox>
-#include <QToolBar>
 #include <QClipboard>
 #include <QApplication>
 #include <QMessageBox>
diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
index 2bb2c57deb5..8eec2807a19 100644
--- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
@@ -33,6 +33,7 @@
 #include <QToolButton>
 #include <QHBoxLayout>
 
+#include <QStringList>
 #include <QDebug>
 
 namespace VcsBase {
diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h
index 9d781d458eb..79f2f862e1c 100644
--- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h
+++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h
@@ -32,13 +32,13 @@
 
 #include "vcsbase_global.h"
 
-#include <QStringList>
 #include <QVariant>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
 class QToolButton;
+class QStringList;
 QT_END_NAMESPACE
 
 namespace VcsBase {
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
index d81b7e386e3..3728253f556 100644
--- a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
@@ -29,7 +29,6 @@
 
 #include "vcsbaseoutputwindow.h"
 
-#include <utils/qtcassert.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <QPlainTextEdit>
@@ -38,7 +37,6 @@
 #include <QTextBlock>
 #include <QMenu>
 #include <QAction>
-#include <QTextDocument>
 #include <QTextBlockUserData>
 
 #include <QPointer>
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 4af135df64b..11991ac5753 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -35,17 +35,14 @@
 #include "corelistener.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
+#include <coreplugin/id.h>
 #include <coreplugin/iversioncontrol.h>
-#include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/vcsmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
 #include <utils/qtcassert.h>
 #include <utils/synchronousprocess.h>
-#include <utils/environment.h>
 
 #include <QDebug>
 #include <QDir>
@@ -53,7 +50,6 @@
 #include <QScopedPointer>
 #include <QSharedPointer>
 #include <QProcessEnvironment>
-#include <QTextStream>
 #include <QTextCodec>
 
 #include <QAction>
diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h
index c27b68a5b6d..ae018d9933a 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.h
+++ b/src/plugins/vcsbase/vcsbaseplugin.h
@@ -32,7 +32,6 @@
 
 #include "vcsbase_global.h"
 
-#include <coreplugin/id.h>
 #include <extensionsystem/iplugin.h>
 
 #include <QSharedDataPointer>
@@ -46,7 +45,10 @@ QT_END_NAMESPACE
 
 namespace Utils { struct SynchronousProcessResponse; }
 
-namespace Core { class IVersionControl; }
+namespace Core {
+class IVersionControl;
+class Id;
+}
 
 namespace VcsBase {
 
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 3bb4c8ed181..8c708ac6701 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -39,21 +39,9 @@
 #include "vcsplugin.h"
 
 #include <aggregation/aggregate.h>
-#include <cplusplus/Control.h>
-#include <cplusplus/CoreTypes.h>
-#include <cplusplus/FullySpecifiedType.h>
-#include <cplusplus/Literals.h>
 #include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/Symbol.h>
-#include <cplusplus/Symbols.h>
-#include <cplusplus/TranslationUnit.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
-#include <coreplugin/idocument.h>
-#include <coreplugin/mainwindow.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <utils/completingtextedit.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/synchronousprocess.h>
 #include <utils/fileutils.h>
@@ -63,25 +51,21 @@
 #include <texteditor/texteditorsettings.h>
 
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/session.h>
 #include <projectexplorer/project.h>
 
 #include <QDebug>
 #include <QDir>
 #include <QProcess>
-#include <QFile>
 #include <QFileInfo>
 #include <QPointer>
 #include <QStringListModel>
-#include <QTextStream>
 #include <QStyle>
 #include <QToolBar>
 #include <QAction>
 #include <QApplication>
 #include <QMessageBox>
 #include <QCompleter>
-#include <QLineEdit>
-#include <QTextEdit>
+
 #include <cstring>
 
 enum { debug = 0 };
diff --git a/src/plugins/vcsbase/vcsconfigurationpage.cpp b/src/plugins/vcsbase/vcsconfigurationpage.cpp
index a9f1552b4fc..eff1dee121f 100644
--- a/src/plugins/vcsbase/vcsconfigurationpage.cpp
+++ b/src/plugins/vcsbase/vcsconfigurationpage.cpp
@@ -31,7 +31,6 @@
 
 #include "vcsbaseconstants.h"
 
-#include <coreplugin/dialogs/iwizard.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/iversioncontrol.h>
 
diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp
index ee080fcd640..23d87fad909 100644
--- a/src/plugins/vcsbase/vcsplugin.cpp
+++ b/src/plugins/vcsbase/vcsplugin.cpp
@@ -28,15 +28,12 @@
 ****************************************************************************/
 
 #include "vcsplugin.h"
-#include "diffhighlighter.h"
 #include "commonsettingspage.h"
 #include "nicknamedialog.h"
 #include "vcsbaseoutputwindow.h"
 #include "corelistener.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/id.h>
 #include <coreplugin/mimedatabase.h>
 
 #include <QtPlugin>
diff --git a/src/plugins/vcsbase/vcsplugin.h b/src/plugins/vcsbase/vcsplugin.h
index 8eb0d7c0c25..a111f27b1c2 100644
--- a/src/plugins/vcsbase/vcsplugin.h
+++ b/src/plugins/vcsbase/vcsplugin.h
@@ -32,8 +32,6 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <QObject>
-
 QT_BEGIN_NAMESPACE
 class QStandardItemModel;
 QT_END_NAMESPACE