Toolchains: Header cleanup.

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -43,6 +43,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/headerpath.h>
 #include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/buildmanager.h>

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -41,8 +41,13 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/helpmanager.h>
 #include <projectexplorer/debugginghelper.h>
+#include <projectexplorer/environmentwidget.h>
+
+#include <utils/pathchooser.h>
+#include <utils/detailswidget.h>
 #include <utils/qtcassert.h>
 #include <utils/debuggerlanguagechooser.h>
+
 #include <QtGui/QFormLayout>
 #include <QtGui/QLineEdit>
 #include <QtGui/QGroupBox>

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -35,12 +35,7 @@
 #define CMAKERUNCONFIGURATION_H
 
 #include <projectexplorer/applicationrunconfiguration.h>
-#include <projectexplorer/persistentsettings.h>
-#include <projectexplorer/environmentwidget.h>
-#include <projectexplorer/toolchain.h>
 #include <utils/environment.h>
-#include <utils/pathchooser.h>
-#include <utils/detailswidget.h>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
@@ -48,6 +43,12 @@ QT_END_NAMESPACE
 
 namespace Utils {
 class DebuggerLanguageChooser;
+class PathChooser;
+class DetailsWidget;
+}
+
+namespace ProjectExplorer {
+class EnvironmentWidget;
 }
 
 namespace CMakeProjectManager {