Header cleanup in ProjectExplorer.

Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

45 files changed, 125 insertions, 93 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 24c0502e9b..96ae62afda 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -38,6 +38,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/buildsteplist.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index c816a16ce1..1f436272e9 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -44,6 +44,8 @@
 
 #include <utils/pathchooser.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
+#include <projectexplorer/abi.h>
 #include <texteditor/fontsettings.h>
 
 #include <QtGui/QVBoxLayout>
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index c86c696eae..485ce0652d 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -46,6 +46,8 @@
 #include <utils/detailswidget.h>
 #include <utils/qtcassert.h>
 #include <utils/debuggerlanguagechooser.h>
+#include <utils/qtcprocess.h>
+#include <utils/stringutils.h>
 
 #include <QtGui/QFormLayout>
 #include <QtGui/QLineEdit>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 32d57cfa1a..5effd300f2 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -92,6 +92,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/abi.h>
diff --git a/src/plugins/debugger/debuggertoolchaincombobox.cpp b/src/plugins/debugger/debuggertoolchaincombobox.cpp
index 2592ca685a..7642041f64 100644
--- a/src/plugins/debugger/debuggertoolchaincombobox.cpp
+++ b/src/plugins/debugger/debuggertoolchaincombobox.cpp
@@ -33,6 +33,8 @@
 #include "debuggertoolchaincombobox.h"
 
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
+#include <projectexplorer/abi.h>
 #include <utils/qtcassert.h>
 
 #include <QtCore/QFileInfo>
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index ba647f9f7b..e626457b31 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -36,6 +36,7 @@
 #include "genericprojectconstants.h"
 #include "generictarget.h"
 
+#include <projectexplorer/abi.h>
 #include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/headerpath.h>
 #include <projectexplorer/customexecutablerunconfiguration.h>
diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp
index 796b0823f5..a98d8a6a97 100644
--- a/src/plugins/projectexplorer/abiwidget.cpp
+++ b/src/plugins/projectexplorer/abiwidget.cpp
@@ -31,6 +31,7 @@
 **************************************************************************/
 
 #include "abiwidget.h"
+#include "abi.h"
 
 #include <QtGui/QComboBox>
 #include <QtGui/QHBoxLayout>
diff --git a/src/plugins/projectexplorer/abiwidget.h b/src/plugins/projectexplorer/abiwidget.h
index 2ca76e2d8d..a1f6925ca2 100644
--- a/src/plugins/projectexplorer/abiwidget.h
+++ b/src/plugins/projectexplorer/abiwidget.h
@@ -35,11 +35,10 @@
 
 #include "projectexplorer_export.h"
 
-#include "abi.h"
-
 #include <QtGui/QWidget>
 
 namespace ProjectExplorer {
+class Abi;
 
 namespace Internal {
 class AbiWidgetPrivate;
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 86caa8a1a2..ad136b76e7 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -36,6 +36,7 @@
 #include "ioutputparser.h"
 #include "project.h"
 #include "target.h"
+#include "task.h"
 
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index 16852e0846..cc6177dc00 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -36,17 +36,17 @@
 #include "buildstep.h"
 #include "processparameters.h"
 
-#include <utils/environment.h>
-
-#include <utils/qtcprocess.h>
-
 #include <QtCore/QString>
+#include <QtCore/QProcess>
 
 QT_BEGIN_NAMESPACE
 class QEventLoop;
 class QTimer;
 QT_END_NAMESPACE
 
+namespace Utils {
+class QtcProcess;
+}
 namespace ProjectExplorer {
 
 class IOutputParser;
diff --git a/src/plugins/projectexplorer/applicationrunconfiguration.h b/src/plugins/projectexplorer/applicationrunconfiguration.h
index 4bc79d80b8..bc34166de4 100644
--- a/src/plugins/projectexplorer/applicationrunconfiguration.h
+++ b/src/plugins/projectexplorer/applicationrunconfiguration.h
@@ -36,8 +36,6 @@
 #include "runconfiguration.h"
 #include "applicationlauncher.h"
 
-#include "abi.h"
-
 namespace Utils {
 class AbstractMacroExpander;
 class Environment;
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 43fdefdfb0..608e7b7ad7 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -32,6 +32,7 @@
 
 #include "buildconfiguration.h"
 
+#include "toolchain.h"
 #include "buildmanager.h"
 #include "buildsteplist.h"
 #include "projectexplorer.h"
@@ -42,25 +43,47 @@
 
 #include <coreplugin/variablemanager.h>
 
+#include <utils/stringutils.h>
+
 #include <QtCore/QProcess>
 
-using namespace ProjectExplorer;
+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";
+static const char USER_ENVIRONMENT_CHANGES_KEY[] = "ProjectExplorer.BuildConfiguration.UserEnvironmentChanges";
+static const char TOOLCHAIN_KEY[] = "ProjectExplorer.BuildCOnfiguration.ToolChain";
 
-namespace {
+namespace ProjectExplorer {
+namespace Internal {
 
-const char * const BUILD_STEP_LIST_COUNT("ProjectExplorer.BuildConfiguration.BuildStepListCount");
-const char * const BUILD_STEP_LIST_PREFIX("ProjectExplorer.BuildConfiguration.BuildStepList.");
-const char * const CLEAR_SYSTEM_ENVIRONMENT_KEY("ProjectExplorer.BuildConfiguration.ClearSystemEnvironment");
-const char * const USER_ENVIRONMENT_CHANGES_KEY("ProjectExplorer.BuildConfiguration.UserEnvironmentChanges");
-const char * const TOOLCHAIN_KEY("ProjectExplorer.BuildCOnfiguration.ToolChain");
+class BuildConfigMacroExpander : public Utils::AbstractQtcMacroExpander {
+public:
+    explicit BuildConfigMacroExpander(const BuildConfiguration *bc) : m_bc(bc) {}
+    virtual bool resolveMacro(const QString &name, QString *ret);
+private:
+    const BuildConfiguration *m_bc;
+};
 
-} // namespace
+bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret)
+{
+    if (name == QLatin1String("sourceDir")) {
+        *ret = QDir::toNativeSeparators(m_bc->target()->project()->projectDirectory());
+        return true;
+    }
+    if (name == QLatin1String("buildDir")) {
+        *ret = QDir::toNativeSeparators(m_bc->buildDirectory());
+        return true;
+    }
+    *ret = Core::VariableManager::instance()->value(name);
+    return !ret->isEmpty();
+}
+} // namespace Internal
 
 BuildConfiguration::BuildConfiguration(Target *target, const QString &id) :
     ProjectConfiguration(target, id),
     m_clearSystemEnvironment(false),
-    m_macroExpander(this),
-    m_toolChain(0)
+    m_toolChain(0),
+    m_macroExpander(0)
 {
     Q_ASSERT(target);
     BuildStepList *bsl = new BuildStepList(this, QLatin1String(Constants::BUILDSTEPS_BUILD));
@@ -84,8 +107,8 @@ BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *sourc
     ProjectConfiguration(target, source),
     m_clearSystemEnvironment(source->m_clearSystemEnvironment),
     m_userEnvironmentChanges(source->m_userEnvironmentChanges),
-    m_macroExpander(this),
-    m_toolChain(source->m_toolChain)
+    m_toolChain(source->m_toolChain),
+    m_macroExpander(0)
 {
     Q_ASSERT(target);
     // Do not clone stepLists here, do that in the derived constructor instead
@@ -101,7 +124,16 @@ BuildConfiguration::BuildConfiguration(Target *target, BuildConfiguration *sourc
 }
 
 BuildConfiguration::~BuildConfiguration()
-{ }
+{
+    delete m_macroExpander;
+}
+
+Utils::AbstractMacroExpander *BuildConfiguration::macroExpander()
+{
+    if (!m_macroExpander)
+        m_macroExpander = new Internal::BuildConfigMacroExpander(this);
+    return m_macroExpander;
+}
 
 QStringList BuildConfiguration::knownStepLists() const
 {
@@ -284,20 +316,6 @@ QString BuildConfiguration::disabledReason() const
     return QString();
 }
 
-bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret)
-{
-    if (name == QLatin1String("sourceDir")) {
-        *ret = QDir::toNativeSeparators(m_bc->target()->project()->projectDirectory());
-        return true;
-    }
-    if (name == QLatin1String("buildDir")) {
-        *ret = QDir::toNativeSeparators(m_bc->buildDirectory());
-        return true;
-    }
-    *ret = Core::VariableManager::instance()->value(name);
-    return !ret->isEmpty();
-}
-
 ///
 // IBuildConfigurationFactory
 ///
@@ -308,3 +326,5 @@ IBuildConfigurationFactory::IBuildConfigurationFactory(QObject *parent) :
 
 IBuildConfigurationFactory::~IBuildConfigurationFactory()
 { }
+
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index b7cada3afb..54fa99335f 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -36,12 +36,14 @@
 #include "projectexplorer_export.h"
 #include "projectconfiguration.h"
 
-#include <utils/stringutils.h>
 #include <utils/environment.h>
 
-#include <QtCore/QString>
 #include <QtCore/QStringList>
 
+namespace Utils {
+class AbstractMacroExpander;
+}
+
 namespace ProjectExplorer {
 
 class BuildConfiguration;
@@ -50,14 +52,6 @@ class Target;
 class ToolChain;
 class IOutputParser;
 
-class BuildConfigMacroExpander : public Utils::AbstractQtcMacroExpander {
-public:
-    BuildConfigMacroExpander(BuildConfiguration *bc) : m_bc(bc) {}
-    virtual bool resolveMacro(const QString &name, QString *ret);
-private:
-    BuildConfiguration *m_bc;
-};
-
 class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
 {
     Q_OBJECT
@@ -94,7 +88,7 @@ public:
     virtual bool isEnabled() const;
     virtual QString disabledReason() const;
 
-    Utils::AbstractMacroExpander *macroExpander() { return &m_macroExpander; }
+    Utils::AbstractMacroExpander *macroExpander();
 
     virtual ProjectExplorer::ToolChain *toolChain() const;
     virtual void setToolChain(ProjectExplorer::ToolChain *tc);
@@ -129,8 +123,8 @@ private:
     bool m_clearSystemEnvironment;
     QList<Utils::EnvironmentItem> m_userEnvironmentChanges;
     QList<BuildStepList *> m_stepLists;
-    BuildConfigMacroExpander m_macroExpander;
     ToolChain *m_toolChain;
+    Utils::AbstractMacroExpander *m_macroExpander;
 };
 
 class PROJECTEXPLORER_EXPORT IBuildConfigurationFactory :
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index 886f6c048f..0da0279603 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -35,13 +35,12 @@
 
 #include "projectconfiguration.h"
 #include "projectexplorer_export.h"
-#include "task.h"
 
 #include <QtCore/QFutureInterface>
 #include <QtGui/QWidget>
 
 namespace ProjectExplorer {
-
+class Task;
 class BuildConfiguration;
 class BuildStepList;
 class DeployConfiguration;
diff --git a/src/plugins/projectexplorer/clangparser.h b/src/plugins/projectexplorer/clangparser.h
index 6b624b33da..6434ebd154 100644
--- a/src/plugins/projectexplorer/clangparser.h
+++ b/src/plugins/projectexplorer/clangparser.h
@@ -34,6 +34,7 @@
 #define CLANGPARSER_H
 
 #include "ioutputparser.h"
+#include "task.h"
 
 #include <QtCore/QRegExp>
 
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index a6ce74df44..8305b1e293 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -37,10 +37,12 @@
 #include "debugginghelper.h"
 #include "projectexplorerconstants.h"
 #include "target.h"
+#include "abi.h"
 
 #include <coreplugin/icore.h>
 
 #include <utils/qtcprocess.h>
+#include <utils/stringutils.h>
 
 #include <QtGui/QDialog>
 #include <QtGui/QDialogButtonBox>
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 860c78aa0f..bc790cacbd 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -32,16 +32,14 @@
 
 #include "gccparser.h"
 #include "ldparser.h"
-#include "taskwindow.h"
+#include "task.h"
 #include "projectexplorerconstants.h"
 
 using namespace ProjectExplorer;
 
-namespace {
-    // opt. drive letter + filename: (2 brackets)
-    const char * const FILE_PATTERN = "(<command[ -]line>|([A-Za-z]:)?[^:]+\\.[^:]+):";
-    const char * const COMMAND_PATTERN = "^(.*[\\\\/])?([a-z0-9]+-[a-z0-9]+-[a-z0-9]+-)?(gcc|g\\+\\+)(-[0-9\\.]+)?(\\.exe)?: ";
-}
+// opt. drive letter + filename: (2 brackets)
+static const char FILE_PATTERN[] = "(<command[ -]line>|([A-Za-z]:)?[^:]+\\.[^:]+):";
+static const char COMMAND_PATTERN[] = "^(.*[\\\\/])?([a-z0-9]+-[a-z0-9]+-[a-z0-9]+-)?(gcc|g\\+\\+)(-[0-9\\.]+)?(\\.exe)?: ";
 
 GccParser::GccParser()
 {
diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp
index ca81054127..9ddf7afe5d 100644
--- a/src/plugins/projectexplorer/gnumakeparser.cpp
+++ b/src/plugins/projectexplorer/gnumakeparser.cpp
@@ -33,7 +33,7 @@
 #include "gnumakeparser.h"
 
 #include "projectexplorerconstants.h"
-#include "taskwindow.h"
+#include "task.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
diff --git a/src/plugins/projectexplorer/ldparser.cpp b/src/plugins/projectexplorer/ldparser.cpp
index a3272b0f16..7819dab9de 100644
--- a/src/plugins/projectexplorer/ldparser.cpp
+++ b/src/plugins/projectexplorer/ldparser.cpp
@@ -32,7 +32,7 @@
 
 #include "ldparser.h"
 #include "projectexplorerconstants.h"
-#include "taskwindow.h"
+#include "task.h"
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/projectexplorer/linuxiccparser.h b/src/plugins/projectexplorer/linuxiccparser.h
index d9b62e2683..4937f8ebd3 100644
--- a/src/plugins/projectexplorer/linuxiccparser.h
+++ b/src/plugins/projectexplorer/linuxiccparser.h
@@ -34,6 +34,7 @@
 #define LINUXICCPARSER_H
 
 #include "ioutputparser.h"
+#include "task.h"
 
 #include <QtCore/QRegExp>
 
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
index b1ca9cb635..2260c6e2b1 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
@@ -39,6 +39,7 @@
 #include <utils/environment.h>
 
 #include <QtGui/QLabel>
+#include <QtGui/QIcon>
 #include <QtCore/QDir>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/nodesvisitor.h b/src/plugins/projectexplorer/nodesvisitor.h
index 0a3d867123..b4aa19ad00 100644
--- a/src/plugins/projectexplorer/nodesvisitor.h
+++ b/src/plugins/projectexplorer/nodesvisitor.h
@@ -35,7 +35,6 @@
 
 #include "projectexplorer_export.h"
 
-#include <QtCore/QString>
 #include <QtCore/QStringList>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp
index 0758c92e2b..d9ff74c9b8 100644
--- a/src/plugins/projectexplorer/outputparser_test.cpp
+++ b/src/plugins/projectexplorer/outputparser_test.cpp
@@ -31,6 +31,7 @@
 **************************************************************************/
 
 #include "outputparser_test.h"
+#include "task.h"
 
 #if defined(WITH_TESTS)
 
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 127b173d45..06044ca197 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -33,11 +33,10 @@
 #ifndef PROJECTEXPLORER_H
 #define PROJECTEXPLORER_H
 
-#include <QtCore/QPair>
-
 #include "projectexplorer_export.h"
 
 #include <extensionsystem/iplugin.h>
+
 #include <QtCore/QPair>
 
 QT_BEGIN_NAMESPACE
@@ -50,10 +49,6 @@ namespace Core {
 class IMode;
 }
 
-namespace Utils {
-class ParameterAction;
-}
-
 namespace ProjectExplorer {
 class BuildManager;
 class RunControl;
@@ -66,7 +61,6 @@ class BuildConfiguration;
 class ProjectNode;
 
 namespace Internal {
-class ProjectFileFactory;
 struct ProjectExplorerSettings;
 }
 
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index 0e0fbafbe1..7dbcd89379 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -33,24 +33,23 @@
 #ifndef PROJECTNODES_H
 #define PROJECTNODES_H
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtGui/QIcon>
-
-#include "runconfiguration.h"
 #include "projectexplorer_export.h"
 
+#include <QtGui/QIcon>
+
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;
 QT_END_NAMESPACE
 
-
 namespace Core {
     class MimeDatabase;
 }
 
 namespace ProjectExplorer {
+class RunConfiguration;
 
 enum NodeType {
     FileNodeType = 1,
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 6d66a03bca..1708865590 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -35,11 +35,13 @@
 #include "project.h"
 #include "target.h"
 #include "toolchain.h"
+#include "abi.h"
 #include "buildconfiguration.h"
 #include "projectexplorerconstants.h"
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/qtcassert.h>
+#include <utils/outputformatter.h>
 #include <utils/checkablemessagebox.h>
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index ec1de471ba..4c963a599e 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -33,19 +33,23 @@
 #ifndef RUNCONFIGURATION_H
 #define RUNCONFIGURATION_H
 
-#include "abi.h"
 #include "projectconfiguration.h"
 #include "projectexplorer_export.h"
 
-#include <utils/outputformatter.h>
+#include <utils/outputformat.h>
 
 #include <QtCore/QMetaType>
 #include <QtCore/QWeakPointer>
 #include <QtGui/QWidget>
-#include <QtGui/QIcon>
 
-namespace ProjectExplorer {
+QT_FORWARD_DECLARE_CLASS(QIcon)
+
+namespace Utils {
+class OutputFormatter;
+}
 
+namespace ProjectExplorer {
+class Abi;
 class BuildConfiguration;
 class IRunConfigurationAspect;
 class RunControl;
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index 66f0f8413c..31ae861397 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -32,6 +32,7 @@
 
 #include "target.h"
 
+#include "toolchain.h"
 #include "buildconfiguration.h"
 #include "deployconfiguration.h"
 #include "project.h"
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 4bceb30954..7d0f2eefd8 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -51,7 +51,6 @@ class ToolChainPrivate;
 }
 
 class Abi;
-class HeaderPath;
 class IOutputParser;
 class ToolChainConfigWidget;
 class ToolChainFactory;
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index 7d18ace153..c61de00f50 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 #include "toolchainmanager.h"
-
+#include "abi.h"
 #include "toolchain.h"
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h
index 441292a6ea..04acb59a4b 100644
--- a/src/plugins/projectexplorer/toolchainmanager.h
+++ b/src/plugins/projectexplorer/toolchainmanager.h
@@ -35,9 +35,6 @@
 
 #include "projectexplorer_export.h"
 
-#include "abi.h"
-#include "toolchain.h"
-
 #include <QtCore/QList>
 #include <QtCore/QObject>
 #include <QtCore/QString>
@@ -46,6 +43,7 @@ namespace ProjectExplorer {
 class ProjectExplorerPlugin;
 class ToolChain;
 class ToolChainFactory;
+class Abi;
 
 namespace Internal {
 class ToolChainManagerPrivate;
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index f54b8500f0..b2bf43d9bc 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -31,7 +31,8 @@
 **************************************************************************/
 
 #include "toolchainoptionspage.h"
-
+#include "toolchain.h"
+#include "abi.h"
 #include "projectexplorerconstants.h"
 #include "toolchainconfigwidget.h"
 #include "toolchainmanager.h"
diff --git a/src/plugins/qt4projectmanager/qmakeparser.cpp b/src/plugins/qt4projectmanager/qmakeparser.cpp
index dfc2514547..d2ef87fff0 100644
--- a/src/plugins/qt4projectmanager/qmakeparser.cpp
+++ b/src/plugins/qt4projectmanager/qmakeparser.cpp
@@ -33,7 +33,7 @@
 #include "qmakeparser.h"
 #include "qt4projectmanagerconstants.h"
 
-#include <projectexplorer/taskwindow.h>
+#include <projectexplorer/task.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
 
@@ -41,11 +41,9 @@ using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 using ProjectExplorer::Task;
 
-QMakeParser::QMakeParser()
+QMakeParser::QMakeParser() : m_error(QLatin1String("^(.+):(\\d+):\\s(.+)$"))
 {
     setObjectName(QLatin1String("QMakeParser"));
-
-    m_error.setPattern("^(.+):(\\d+):\\s(.+)$");
     m_error.setMinimal(true);
 }
 
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index 25048dea33..e9d0eb4437 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -54,6 +54,7 @@
 #include <utils/qtcprocess.h>
 #include <utils/pathchooser.h>
 #include <utils/detailswidget.h>
+#include <utils/stringutils.h>
 #include <utils/debuggerlanguagechooser.h>
 #include <qtsupport/qtoutputformatter.h>
 #include <qtsupport/baseqtversion.h>
diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
index 504ac65200..7e8e53b485 100644
--- a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp
@@ -33,7 +33,7 @@
 #include "abldparser.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/taskwindow.h>
+#include <projectexplorer/task.h>
 
 using namespace Qt4ProjectManager;
 using namespace ProjectExplorer;
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp
index 5c5ad17f82..28ead6c187 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp
@@ -41,6 +41,7 @@
 #include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <symbianutils/symbiandevicemanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <QtGui/QPainter>
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp b/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp
index c783b4abc2..61b58c89f4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp
@@ -32,7 +32,7 @@
 
 #include "rvctparser.h"
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/taskwindow.h>
+#include <projectexplorer/task.h>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Constants;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp
index 5dfea8114e..f4319b1080 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp
@@ -33,7 +33,7 @@
 #include "s60createpackageparser.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/taskwindow.h>
+#include <projectexplorer/task.h>
 
 using namespace Qt4ProjectManager::Internal;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
index b2f2c8d962..61b11fe6c8 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
@@ -33,6 +33,7 @@
 #include "winscwparser.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/task.h>
 
 using namespace Qt4ProjectManager;
 using namespace ProjectExplorer;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 2e310ac6ab..59c1992adb 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -45,6 +45,8 @@
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
+#include <projectexplorer/task.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <qtsupport/qtversionfactory.h>
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 2ec2103cc6..ff32dc9355 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -46,12 +46,14 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/task.h>
 #include <qtsupport/qtversionfactory.h>
 #include <qtsupport/baseqtversion.h>
 #include <utils/pathchooser.h>
 #include <utils/detailswidget.h>
+#include <utils/qtcprocess.h>
 
 #include <QtCore/QCoreApplication>
 #include <QtGui/QPushButton>
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 0f5d84801c..ddf6ba6cf0 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -38,6 +38,7 @@
 #include "qtversionmanager.h"
 #include "profilereader.h"
 #include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/debugginghelper.h>
 #include <projectexplorer/gnumakeparser.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp
index 9d11f5298f..9d67772ca5 100644
--- a/src/plugins/qtsupport/qtparser.cpp
+++ b/src/plugins/qtsupport/qtparser.cpp
@@ -32,20 +32,21 @@
 
 #include "qtparser.h"
 
-#include <projectexplorer/taskwindow.h>
+#include <projectexplorer/task.h>
 #include <projectexplorer/projectexplorerconstants.h>
+
 #include <utils/qtcassert.h>
 
 using namespace QtSupport;
 using ProjectExplorer::Task;
 
 // opt. drive letter + filename: (2 brackets)
-static const char FILE_PATTERN[] = "^(([A-Za-z]:)?[^:]+\\.[^:]+)";
+#define FILE_PATTERN "^(([A-Za-z]:)?[^:]+\\.[^:]+)"
 
-QtParser::QtParser()
+QtParser::QtParser() :
+    m_mocRegExp(QLatin1String(FILE_PATTERN"[:\\(](\\d+)\\)?:\\s(Warning|Error):\\s(.+)$"))
 {
     setObjectName(QLatin1String("QtParser"));
-    m_mocRegExp.setPattern(QString::fromLatin1(FILE_PATTERN) + "[:\\(](\\d+)\\)?:\\s(Warning|Error):\\s(.+)$");
     m_mocRegExp.setMinimal(true);
 }
 
diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp
index d83539cdfd..e4b92a7595 100644
--- a/src/plugins/remotelinux/abstractpackagingstep.cpp
+++ b/src/plugins/remotelinux/abstractpackagingstep.cpp
@@ -37,6 +37,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/task.h>
 #include <utils/fileutils.h>
 
 #include <QtCore/QDateTime>
diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
index 2935a369aa..f0e441178c 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
@@ -37,9 +37,11 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QString>
+#include <QtGui/QIcon>
 #include <QtGui/QMessageBox>
 
+#include <QtCore/QString>
+
 using namespace ProjectExplorer;
 
 namespace RemoteLinux {