Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

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;

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>

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>

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>

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>

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>

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>

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>

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 {

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>
 

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>

src/plugins/projectexplorer/abi.cpp

@@ -29,7 +29,8 @@
 
 #include "abi.h"
 
-#include <QCoreApplication>
+#include <utils/fileutils.h>
+
 #include <QDebug>
 #include <QtEndian>
 #include <QFile>

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 {
 
 // --------------------------------------------------------------------------

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>
 

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 {

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>
 

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;

src/plugins/projectexplorer/allprojectsfilter.h

@@ -33,7 +33,6 @@
 #include <locator/basefilefilter.h>
 
 #include <QFutureInterface>
-#include <QString>
 
 namespace ProjectExplorer {
 

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;

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"
 

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>

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;

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>
 

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;
 }

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";

src/plugins/projectexplorer/buildconfiguration.h

@@ -35,8 +35,6 @@
 
 #include <utils/environment.h>
 
-#include <QStringList>
-
 namespace Utils {
 class AbstractMacroExpander;
 }

src/plugins/projectexplorer/buildenvironmentwidget.cpp

@@ -33,7 +33,6 @@
 #include "environmentwidget.h"
 
 #include <projectexplorer/target.h>
-#include <utils/qtcassert.h>
 
 #include <QVBoxLayout>
 #include <QCheckBox>

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

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>

src/plugins/projectexplorer/buildprogress.cpp

@@ -34,6 +34,7 @@
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <QFont>
 #include <QPixmap>
 #include <QDebug>

src/plugins/projectexplorer/buildprogress.h

@@ -34,7 +34,8 @@
 
 #include <QPointer>
 #include <QWidget>
-#include <QLabel>
+
+QT_FORWARD_DECLARE_CLASS(QLabel)
 
 namespace ProjectExplorer {
 namespace Internal {

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>

src/plugins/projectexplorer/buildsettingspropertiespage.h

@@ -33,7 +33,6 @@
 #include "iprojectproperties.h"
 
 #include <QWidget>
-#include <QIcon>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;

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;

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>
 

src/plugins/projectexplorer/cesdkhandler.cpp

@@ -31,8 +31,8 @@
 
 #include <utils/environment.h>
 
-#include <QFile>
 #include <QDebug>
+#include <QFile>
 #include <QXmlStreamReader>
 
 using namespace ProjectExplorer;

src/plugins/projectexplorer/cesdkhandler.h

@@ -32,7 +32,6 @@
 
 #include <projectexplorer/projectexplorer.h>
 
-#include <QStringList>
 #include <QDir>
 
 namespace Utils {

src/plugins/projectexplorer/clangparser.cpp

@@ -29,7 +29,6 @@
 
 #include "clangparser.h"
 #include "ldparser.h"
-#include "taskwindow.h"
 #include "projectexplorerconstants.h"
 
 using namespace ProjectExplorer;

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;

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>
 

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>

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>

src/plugins/projectexplorer/currentprojectfind.cpp

@@ -38,8 +38,6 @@
 
 #include <QDebug>
 #include <QSettings>
-#include <QLabel>
-#include <QHBoxLayout>
 
 using namespace Find;
 using namespace ProjectExplorer;

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;

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>
 

src/plugins/projectexplorer/customwizard/customwizardparameters.cpp

@@ -39,7 +39,6 @@
 
 #include <QDebug>
 #include <QCoreApplication>
-#include <QLocale>
 #include <QFile>
 #include <QDir>
 #include <QFileInfo>

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>

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 {

src/plugins/projectexplorer/deployablefile.cpp

@@ -31,7 +31,6 @@
 
 #include <QFileInfo>
 #include <QHash>
-#include <QPair>
 
 using namespace Utils;
 

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 {

src/plugins/projectexplorer/deployconfiguration.h

@@ -33,7 +33,6 @@
 #include "projectexplorer_export.h"
 
 #include "projectconfiguration.h"
-#include "namedwidget.h"
 
 #include <QString>
 

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>
 

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;
 

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>

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;

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>

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 {

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>
 

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; }

src/plugins/projectexplorer/devicesupport/deviceprocesslist.h

@@ -34,7 +34,6 @@
 
 #include <QAbstractItemModel>
 #include <QList>
-#include <QSharedPointer>
 
 namespace ProjectExplorer {
 

src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp

@@ -34,7 +34,6 @@
 
 #include <QCoreApplication>
 #include <QString>
-#include <QIcon>
 
 namespace ProjectExplorer {
 namespace Internal {

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;

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 {

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>

src/plugins/projectexplorer/doubletabwidget.cpp

@@ -34,7 +34,6 @@
 
 #include <QRect>
 #include <QPainter>
-#include <QFont>
 #include <QMouseEvent>
 #include <QMenu>
 #include <QToolTip>

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>

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;

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>

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;
 

src/plugins/projectexplorer/gcctoolchain.h

@@ -34,6 +34,9 @@
 
 #include "toolchain.h"
 #include "abi.h"
+#include "headerpath.h"
+
+#include <utils/fileutils.h>
 
 namespace ProjectExplorer {
 

src/plugins/projectexplorer/ioutputparser.cpp

@@ -30,8 +30,6 @@
 #include "ioutputparser.h"
 #include "task.h"
 
-#include <utils/qtcassert.h>
-
 /*!
     \class ProjectExplorer::IOutputParser
 

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>

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; }

src/plugins/projectexplorer/kitchooser.cpp

@@ -31,9 +31,6 @@
 
 #include "kitinformation.h"
 #include "kitmanager.h"
-#include "abi.h"
-
-#include <utils/qtcassert.h>
 
 namespace ProjectExplorer {
 

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 {

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;
 
 // --------------------------------------------------------------------------

src/plugins/projectexplorer/kitinformationconfigwidget.cpp

@@ -44,7 +44,6 @@
 #include <utils/fancylineedit.h>
 
 #include <QComboBox>
-#include <QLabel>
 #include <QPushButton>
 
 using namespace Core;

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";

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;

src/plugins/projectexplorer/kitmodel.cpp

@@ -37,7 +37,6 @@
 
 #include <QApplication>
 #include <QLayout>
-#include <QMessageBox>
 
 namespace ProjectExplorer {
 namespace Internal {

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>

src/plugins/projectexplorer/linuxiccparser.cpp

@@ -29,7 +29,6 @@
 
 #include "linuxiccparser.h"
 #include "ldparser.h"
-#include "taskwindow.h"
 #include "projectexplorerconstants.h"
 
 using namespace ProjectExplorer;

src/plugins/projectexplorer/localapplicationrunconfiguration.cpp

@@ -33,8 +33,6 @@
 
 #include <coreplugin/variablemanager.h>
 
-#include <utils/stringutils.h>
-
 namespace ProjectExplorer {
 
 /// LocalApplicationRunConfiguration

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>
 

src/plugins/projectexplorer/localapplicationruncontrol.h

@@ -32,7 +32,6 @@
 
 #include "runconfiguration.h"
 #include "applicationlauncher.h"
-#include "projectexplorerconstants.h"
 
 namespace ProjectExplorer {
 

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)
 {

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";

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 {

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>

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;

src/plugins/projectexplorer/processstep.h

@@ -33,8 +33,6 @@
 #include "ui_processstep.h"
 #include "abstractprocessstep.h"
 
-#include <utils/environment.h>
-
 namespace ProjectExplorer {
 
 namespace Internal {

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

src/plugins/projectexplorer/project.h

@@ -35,7 +35,6 @@
 #include <coreplugin/id.h>
 
 #include <QObject>
-#include <QSet>
 #include <QFileSystemModel>
 
 namespace Core {

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>

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 {

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 {

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>

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;

src/plugins/projectexplorer/projectnodes.cpp

@@ -41,7 +41,6 @@
 
 #include <QFileInfo>
 #include <QDir>
-#include <QApplication>
 #include <QIcon>
 #include <QStyle>
 

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;