Cleanup includes

Change-Id: I3b6e524ca3fdafb792f7047eae3114dd0a0e3a49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/vcprojectmanager/interfaces/iattributecontainer.h

@@ -31,7 +31,10 @@
 #define VCPROJECTMANAGER_INTERNAL_IATTRIBUTEHANDLER_H
 
 #include <QString>
-#include <QDomElement>
+
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/iattributedescriptiondataitem.h

@@ -27,10 +27,10 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#ifndef VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTESETTINGSDATAITEM_H
+#ifndef VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTEDESCRIPTIONDATAITEM_H
-#define VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTESETTINGSDATAITEM_H
+#define VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTEDESCRIPTIONDATAITEM_H
 
-class QString;
+#include <QString>
 
 namespace VcProjectManager {
 namespace Internal {
@@ -58,4 +58,4 @@ public:
 } // namespace Internal
 } // namespace VcProjectManager
 
-#endif // VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTESETTINGSDATAITEM_H
+#endif // VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTEDESCRIPTIONDATAITEM_H

src/plugins/vcprojectmanager/interfaces/iconfiguration.h

@@ -30,10 +30,10 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ICONFIGURATION_H
 #define VCPROJECTMANAGER_INTERNAL_ICONFIGURATION_H
 
-#include <QString>
-#include <QObject>
 #include "ivcprojectnodemodel.h"
 
+#include <QObject>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h

@@ -30,7 +30,6 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONBUILDTOOL_H
 #define VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONBUILDTOOL_H
 
-#include <QString>
 #include "ivcprojectnodemodel.h"
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtools.h

@@ -31,7 +31,11 @@
 #define VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONBUILDTOOLS_H
 
 #include <QString>
-#include <QDomElement>
+
+QT_BEGIN_NAMESPACE
+class QDomElement;
+class QDomDocument;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/iconfigurations.h

@@ -30,8 +30,6 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONHANDLER_H
 #define VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONHANDLER_H
 
-#include <QString>
-
 #include "ivcprojectnodemodel.h"
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/interfaces/idebuggertools.h

@@ -30,8 +30,12 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_IDEBUGGERTOOLS_H
 #define VCPROJECTMANAGER_INTERNAL_IDEBUGGERTOOLS_H
 
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
 class QDomElement;
 class QDomDocument;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/ideploymenttools.h

@@ -30,8 +30,12 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_IDEPLOYMENTTOOLS_H
 #define VCPROJECTMANAGER_INTERNAL_IDEPLOYMENTTOOLS_H
 
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
 class QDomElement;
 class QDomDocument;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/ifile.h

@@ -30,11 +30,10 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_IFILE_H
 #define VCPROJECTMANAGER_INTERNAL_IFILE_H
 
-#include <QString>
-#include <projectexplorer/projectnodes.h>
-
 #include "ivcprojectnodemodel.h"
 
+#include <projectexplorer/projectnodes.h>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/interfaces/ifilecontainer.h

@@ -32,6 +32,8 @@
 
 #include "ivcprojectnodemodel.h"
 
+QT_FORWARD_DECLARE_CLASS(QStringList)
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/interfaces/iglobal.h

@@ -31,7 +31,6 @@
 #define VCPROJECTMANAGER_INTERNAL_IGLOBAL_H
 
 #include "ivcprojectnodemodel.h"
-#include <QString>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/iplatform.h

@@ -32,8 +32,6 @@
 
 #include "ivcprojectnodemodel.h"
 
-#include <QString>
-
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/interfaces/ireference.h

@@ -30,8 +30,6 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_IREFERENCE_H
 #define VCPROJECTMANAGER_INTERNAL_IREFERENCE_H
 
-#include <QString>
-
 #include "ivcprojectnodemodel.h"
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/interfaces/isectioncontainer.h

@@ -31,7 +31,10 @@
 #define VCPROJECTMANAGER_INTERNAL_ISECTIONCONTAINER_H
 
 #include <QString>
-#include <QDomElement>
+
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/itoolattribute.h

@@ -30,9 +30,7 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTE_H
 #define VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTE_H
 
-#include <QStringList>
+#include <QString>
-
-class QWidget;
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/itoolfile.h

@@ -30,7 +30,6 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ITOOLFILE_H
 #define VCPROJECTMANAGER_INTERNAL_ITOOLFILE_H
 
-#include <QString>
 #include "ivcprojectnodemodel.h"
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/interfaces/itools.h

@@ -30,8 +30,8 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ITOOLHANDLER_H
 #define VCPROJECTMANAGER_INTERNAL_ITOOLHANDLER_H
 
-#include <QString>
 #include <QDomElement>
+#include <QString>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/itoolsection.h

@@ -33,7 +33,6 @@
 namespace VcProjectManager {
 namespace Internal {
 
-class IToolAttribute;
 class IToolSectionDescription;
 class VcNodeWidget;
 class IToolAttributeContainer;

src/plugins/vcprojectmanager/interfaces/ivcprojectnodemodel.h

@@ -30,7 +30,12 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_VCPROJECTNODE_H
 #define VCPROJECTMANAGER_INTERNAL_VCPROJECTNODE_H
 
-#include <QDomNode>
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+class QDomNode;
+class QDomDocument;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h

@@ -30,10 +30,11 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_IVISUALSTUDIOPROJECT_H
 #define VCPROJECTMANAGER_INTERNAL_IVISUALSTUDIOPROJECT_H
 
-#include <QString>
 #include "ivcprojectnodemodel.h"
 #include "../vcprojectmodel/vcprojectdocument_constants.h"
 
+#include <QString>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/menuhandler.cpp

@@ -28,22 +28,15 @@
 **
 ****************************************************************************/
 #include "menuhandler.h"
+#include "vcprojectmanagerconstants.h"
+#include "vcprojectmodel/vcdocprojectnodes.h"
+#include "widgets/vcenternamedialog.h"
 
-#include <QAction>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <projectexplorer/projectexplorerconstants.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <projectexplorer/projectexplorer.h>
 
-#include "vcprojectmanagerconstants.h"
+#include <QAction>
-#include "vcproject.h"
-#include "vcprojectmodel/vcdocprojectnodes.h"
-#include "vcprojectfile.h"
-#include "vcprojectmodel/vcprojectdocument.h"
-#include "vcprojectmodel/vcdocumentmodel.h"
-#include "widgets/vcenternamedialog.h"
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/menuhandler.h

@@ -32,7 +32,9 @@
 
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
 class QAction;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/msbuildoutputparser.cpp

@@ -28,6 +28,7 @@
 **
 ****************************************************************************/
 #include "msbuildoutputparser.h"
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/msbuildoutputparser.h

@@ -32,6 +32,7 @@
 
 #include <projectexplorer/ioutputparser.h>
 #include <projectexplorer/task.h>
+
 #include <QRegExp>
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/msbuildversionmanager.cpp

@@ -28,11 +28,9 @@
 **
 ****************************************************************************/
 #include "msbuildversionmanager.h"
-
 #include "vcprojectmanagerconstants.h"
 
 #include <coreplugin/icore.h>
-#include <QStringList>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/msbuildversionmanager.h

@@ -30,11 +30,11 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_MSBUILDVERSIONMANAGER_H
 #define VCPROJECTMANAGER_INTERNAL_MSBUILDVERSIONMANAGER_H
 
+#include <coreplugin/id.h>
+
+#include <QList>
 #include <QObject>
 #include <QString>
-#include <QList>
-
-#include <coreplugin/id.h>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcmakestep.cpp

@@ -27,30 +27,19 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "vcmakestep.h"
-
 #include "msbuildoutputparser.h"
+#include "vcmakestep.h"
 #include "vcprojectbuildconfiguration.h"
-#include "vcprojectbuildoptionspage.h"
 #include "vcprojectfile.h"
 #include "vcprojectkitinformation.h"
-#include "vcprojectmanager.h"
 #include "vcprojectmanagerconstants.h"
-#include "msbuildversionmanager.h"
 
-#include <coreplugin/icore.h>
 #include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/kit.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/task.h>
 
-#include <QComboBox>
 #include <QFormLayout>
 #include <QLabel>
-#include <QSettings>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcmakestep.h

@@ -32,8 +32,9 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 
-class QComboBox;
+QT_BEGIN_NAMESPACE
 class QLabel;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcproject.cpp

@@ -28,47 +28,38 @@
 **
 ****************************************************************************/
 #include "vcproject.h"
-
-#include "vcprojectfile.h"
-#include "vcmakestep.h"
-#include "vcprojectmanager.h"
-#include "vcprojectkitinformation.h"
-#include "vcprojectmanagerconstants.h"
 #include "vcprojectbuildconfiguration.h"
-#include <vcprojectmodel/configurationcontainer.h>
+#include "vcprojectfile.h"
-#include "vcprojectmodel/vcdocumentmodel.h"
+#include "vcprojectkitinformation.h"
-#include "vcprojectmodel/vcprojectdocument.h"
+#include "vcprojectmanager.h"
-#include "vcprojectmodel/configurations.h"
+#include "vcprojectmanagerconstants.h"
+#include "interfaces/iattributedescriptiondataitem.h"
+#include "interfaces/iconfigurationbuildtool.h"
+#include "interfaces/iconfigurationbuildtools.h"
+#include "interfaces/iconfigurations.h"
+#include "interfaces/ifile.h"
+#include "interfaces/ifilecontainer.h"
+#include "interfaces/ifiles.h"
+#include "interfaces/isectioncontainer.h"
+#include "interfaces/itoolattribute.h"
+#include "interfaces/itoolattributecontainer.h"
+#include "interfaces/itools.h"
+#include "interfaces/itoolsection.h"
+#include "interfaces/ivisualstudioproject.h"
+#include "vcprojectmodel/configurationcontainer.h"
 #include "vcprojectmodel/tools/tool_constants.h"
 #include "vcprojectmodel/vcdocprojectnodes.h"
-#include "vcprojectmodel/tools/configurationtool.h"
+#include "vcprojectmodel/vcdocumentmodel.h"
-#include "vcprojectmodel/tools/toolsection.h"
-#include "vcprojectmodel/tools/toolattributes/stringlisttoolattribute.h"
-#include "interfaces/iattributedescriptiondataitem.h"
-#include "interfaces/isectioncontainer.h"
-#include "interfaces/itools.h"
-#include "interfaces/iconfigurationbuildtools.h"
-#include "interfaces/itoolattributecontainer.h"
 
 #include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
 #include <cpptools/cppmodelmanagerinterface.h>
-#include <cpptools/cppprojectfile.h>
-#include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/buildenvironmentwidget.h>
-#include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/headerpath.h>
-#include <projectexplorer/kit.h>
-#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
+
-#include <utils/filesystemwatcher.h>
 #include <utils/qtcassert.h>
 
 #include <QFileInfo>
-#include <QFileSystemWatcher>
 #include <QFormLayout>
 #include <QLabel>
 

src/plugins/vcprojectmanager/vcproject.h

@@ -30,16 +30,14 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_VCPROJECT_H
 #define VCPROJECTMANAGER_INTERNAL_VCPROJECT_H
 
-#include "vcprojectmodel/vcprojectdocument_constants.h"
 #include "msbuildversionmanager.h"
+#include "vcprojectmodel/vcprojectdocument_constants.h"
 
 #include <projectexplorer/namedwidget.h>
 #include <projectexplorer/project.h>
 
 #include <QFuture>
 
-class QFileSystemWatcher;
-
 namespace ProjectExplorer {
 class FolderNode;
 }
@@ -50,10 +48,7 @@ namespace Internal {
 class VcProjectFile;
 class VcDocProjectNode;
 class VcManager;
-class Configuration;
 class VcProjectBuildConfiguration;
-class IConfiguration;
-class IFile;
 
 class VcProject : public ProjectExplorer::Project
 {

src/plugins/vcprojectmanager/vcprojectbuildconfiguration.cpp

@@ -27,23 +27,25 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "vcmakestep.h"
 #include "vcprojectbuildconfiguration.h"
 #include "vcprojectmanagerconstants.h"
-#include "vcmakestep.h"
 
+#include <coreplugin/mimedatabase.h>
+#include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtkitinformation.h>
-#include <utils/qtcassert.h>
-#include <projectexplorer/target.h>
 
-#include <QFormLayout>
+#include <utils/fileutils.h>
-#include <QLabel>
+#include <utils/qtcassert.h>
-#include <QInputDialog>
+
+#include <QFileInfo>
 
 using namespace ProjectExplorer;
 using namespace VcProjectManager::Constants;

src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp

@@ -27,27 +27,23 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "vcprojectbuildoptionspage.h"
-
-#include "widgets/schemaoptionswidget.h"
 #include "msbuildversionmanager.h"
+#include "vcprojectbuildoptionspage.h"
 #include "vcschemamanager.h"
+#include "widgets/schemaoptionswidget.h"
 #include "widgets/toolschemawidget.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <QDialogButtonBox>
 #include <QCoreApplication>
+#include <QDialogButtonBox>
 #include <QFileDialog>
-#include <QFormLayout>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QProcess>
 #include <QPushButton>
-#include <QSettings>
 #include <QTableWidget>
 #include <QVBoxLayout>
 

src/plugins/vcprojectmanager/vcprojectbuildoptionspage.h

@@ -30,18 +30,19 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_VCPROJECTBUILDOPTIONSPAGE_H
 #define VCPROJECTMANAGER_INTERNAL_VCPROJECTBUILDOPTIONSPAGE_H
 
+#include "vcprojectmanagerconstants.h"
+
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <QDialog>
 #include <QTableWidgetItem>
 
-#include "vcprojectmanagerconstants.h"
+QT_BEGIN_NAMESPACE
-
-class QLabel;
 class QLineEdit;
 class QProcess;
 class QPushButton;
 class QTableWidget;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectfile.cpp

@@ -28,11 +28,10 @@
 **
 ****************************************************************************/
 #include "vcprojectfile.h"
-
 #include "vcprojectmanagerconstants.h"
+#include "vcprojectmodel/vcdocprojectnodes.h"
 #include "vcprojectmodel/vcdocumentmodel.h"
 #include "vcprojectmodel/vcprojectdocument.h"
-#include "vcprojectmodel/vcdocprojectnodes.h"
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectfile.h

@@ -30,10 +30,10 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_VCPROJECTFILE_H
 #define VCPROJECTMANAGER_INTERNAL_VCPROJECTFILE_H
 
-#include <coreplugin/idocument.h>
-
 #include "vcprojectmodel/vcprojectdocument_constants.h"
 
+#include <coreplugin/idocument.h>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectkitinformation.cpp

@@ -27,14 +27,15 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "msbuildversionmanager.h"
 #include "vcprojectkitinformation.h"
 #include "vcprojectmanagerconstants.h"
-#include "msbuildversionmanager.h"
 #include "widgets/vcprojectkitconfigwidget.h"
 
-#include <utils/qtcassert.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
+#include <utils/qtcassert.h>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmanager.cpp

@@ -27,23 +27,13 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "vcprojectmanager.h"
-
 #include "vcproject.h"
 #include "vcprojectbuildoptionspage.h"
+#include "vcprojectmanager.h"
 #include "vcprojectmanagerconstants.h"
-#include "vcprojectmodel/vcprojectdocument_constants.h"
 #include "vcschemamanager.h"
+#include "vcprojectmodel/vcprojectdocument_constants.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
-#include <coreplugin/idocument.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/session.h>
-
-#include <QAction>
 #include <QtXmlPatterns/QXmlSchema>
 #include <QtXmlPatterns/QXmlSchemaValidator>
 

src/plugins/vcprojectmanager/vcprojectmanager.h

@@ -33,8 +33,6 @@
 #include <projectexplorer/iprojectmanager.h>
 #include <projectexplorer/projectnodes.h>
 
-class QAction;
-
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmanagerconstants.h

@@ -30,7 +30,7 @@
 #ifndef VCPROJECTMANAGERCONSTANTS_H
 #define VCPROJECTMANAGERCONSTANTS_H
 
-#include <qglobal.h>
+#include <QtGlobal>
 
 namespace VcProjectManager {
 namespace Constants {

src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp

@@ -27,31 +27,20 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "vcprojectmanagerplugin.h"
+#include "menuhandler.h"
-
 #include "msbuildversionmanager.h"
-#include "vcprojectmanager.h"
+#include "vcmakestep.h"
-#include "vcprojectmanagerconstants.h"
 #include "vcprojectbuildconfiguration.h"
 #include "vcprojectbuildoptionspage.h"
-#include "vcmakestep.h"
 #include "vcprojectkitinformation.h"
+#include "vcprojectmanager.h"
+#include "vcprojectmanagerplugin.h"
 #include "vcschemamanager.h"
-#include "menuhandler.h"
 #include "vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
 
-// TODO: clean up
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 #include <projectexplorer/kitmanager.h>
 
-#include <QAction>
-#include <QMessageBox>
-#include <QMainWindow>
-#include <QMenu>
-
 #include <QtPlugin>
 
 using namespace VcProjectManager::Internal;

src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp

@@ -28,10 +28,13 @@
 **
 ****************************************************************************/
 #include "activexreference.h"
-
+#include "configuration.h"
-#include <QVariant>
-#include "generalattributecontainer.h"
 #include "configurationcontainer.h"
+#include "generalattributecontainer.h"
+#include "vcprojectdocument_constants.h"
+
+#include <QDomNode>
+#include <QVariant>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h

@@ -30,11 +30,12 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ACTIVEXREFERENCE_H
 #define VCPROJECTMANAGER_INTERNAL_ACTIVEXREFERENCE_H
 
-#include "../interfaces/ivcprojectnodemodel.h"
-#include "vcprojectdocument_constants.h"
-#include "configuration.h"
 #include "../interfaces/ireference.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp

@@ -28,11 +28,13 @@
 **
 ****************************************************************************/
 #include "assemblyreference.h"
-
+#include "configuration.h"
-#include <QVariant>
-
 #include "configurationcontainer.h"
 #include "generalattributecontainer.h"
+#include "vcprojectdocument_constants.h"
+
+#include <QDomNode>
+#include <QVariant>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h

@@ -32,8 +32,9 @@
 
 #include "../interfaces/ireference.h"
 
-#include "configuration.h"
+QT_BEGIN_NAMESPACE
-#include "vcprojectdocument_constants.h"
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp

@@ -28,19 +28,20 @@
 **
 ****************************************************************************/
 #include "configuration.h"
-
-#include "debuggertool.h"
-#include "deploymenttool.h"
-#include "tools/tool_constants.h"
-#include "../widgets/configurationbasewidget.h"
-#include "tools/toolattributes/tooldescriptiondatamanager.h"
-#include "tools/toolattributes/tooldescription.h"
-#include "tools/configurationtool.h"
-#include "generalattributecontainer.h"
 #include "configurationbuildtools.h"
-#include "tools.h"
+#include "debuggertool.h"
-#include "deploymenttools.h"
 #include "debuggertools.h"
+#include "deploymenttool.h"
+#include "deploymenttools.h"
+#include "generalattributecontainer.h"
+#include "tools.h"
+#include "../widgets/configurationbasewidget.h"
+#include "tools/configurationtool.h"
+#include "tools/tool_constants.h"
+#include "tools/toolattributes/tooldescription.h"
+#include "tools/toolattributes/tooldescriptiondatamanager.h"
+
+#include <QDomNode>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/configuration.h

@@ -30,19 +30,17 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_CONFIGURATION_H
 #define VCPROJECTMANAGER_INTERNAL_CONFIGURATION_H
 
-#include "../interfaces/ivcprojectnodemodel.h"
-
-#include "deploymenttool.h"
-#include "debuggertool.h"
 #include "../interfaces/iconfiguration.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 
-class ConfigurationTool;
 class GeneralAttributeContainer;
 class Tools;
-class GeneralAttributeContainer;
 
 class Configuration : public IConfiguration
 {

src/plugins/vcprojectmanager/vcprojectmodel/configurationbuildtools.cpp

@@ -31,6 +31,8 @@
 #include "../interfaces/iconfigurationbuildtool.h"
 #include "../interfaces/itooldescription.h"
 
+#include <QDomElement>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.cpp

@@ -30,6 +30,8 @@
 #include "configurationcontainer.h"
 #include "../interfaces/iconfiguration.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.h

@@ -30,9 +30,13 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_CONFIGURATIONCONTAINER_H
 #define VCPROJECTMANAGER_INTERNAL_CONFIGURATIONCONTAINER_H
 
-#include <QObject>
 #include <QList>
-#include <QDomElement>
+#include <QObject>
+
+QT_BEGIN_NAMESPACE
+class QDomDocument;
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp

@@ -27,12 +27,14 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "configurations.h"
+#include "configuration.h"
-
-#include "vcprojectdocument.h"
-#include "../widgets/configurationseditwidget.h"
-#include "../interfaces/iconfiguration.h"
 #include "configurationcontainer.h"
+#include "configurations.h"
+#include "vcprojectdocument.h"
+#include "vcprojectdocument_constants.h"
+#include "../widgets/configurationseditwidget.h"
+
+#include <QDomNode>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/configurations.h

@@ -30,10 +30,6 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_CONFIGURATIONS_H
 #define VCPROJECTMANAGER_INTERNAL_CONFIGURATIONS_H
 
-#include "../interfaces/ivcprojectnodemodel.h"
-
-#include "configuration.h"
-#include "vcprojectdocument_constants.h"
 #include "../interfaces/iconfigurations.h"
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp

@@ -30,6 +30,8 @@
 #include "debuggertool.h"
 #include "generalattributecontainer.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h

@@ -32,6 +32,10 @@
 
 #include "../interfaces/idebuggertool.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.cpp

@@ -29,8 +29,11 @@
 ****************************************************************************/
 #include "debuggertools.h"
 #include "../interfaces/idebuggertool.h"
+
 #include <utils/qtcassert.h>
 
+#include <QDomElement>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h

@@ -31,6 +31,7 @@
 #define VCPROJECTMANAGER_INTERNAL_DEBUGGERTOOLS_H
 
 #include "../interfaces/idebuggertools.h"
+
 #include <QList>
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp

@@ -28,8 +28,10 @@
 **
 ****************************************************************************/
 #include "defaulttoolfile.h"
-#include "vcprojectdocument_constants.h"
 #include "generalattributecontainer.h"
+#include "vcprojectdocument_constants.h"
+
+#include <QDomNode>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h

@@ -32,6 +32,10 @@
 
 #include "../interfaces/itoolfile.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp

@@ -30,6 +30,8 @@
 #include "deploymenttool.h"
 #include "generalattributecontainer.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h

@@ -32,6 +32,10 @@
 
 #include "../interfaces/ideploymenttool.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.cpp

@@ -32,6 +32,8 @@
 
 #include <utils/qtcassert.h>
 
+#include <QDomElement>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h

@@ -31,6 +31,7 @@
 #define VCPROJECTMANAGER_INTERNAL_DEPLOYMENTTOOLS_H
 
 #include "../interfaces/ideploymenttools.h"
+
 #include <QList>
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/vcprojectmodel/file.cpp

@@ -27,23 +27,30 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "file.h"
-
-#include "vcprojectdocument.h"
 #include "configurationcontainer.h"
-#include "generalattributecontainer.h"
+#include "file.h"
-#include "../widgets/configurationseditwidget.h"
 #include "filebuildconfiguration.h"
-#include "tools/toolattributes/tooldescriptiondatamanager.h"
+#include "generalattributecontainer.h"
-#include "tools/tool_constants.h"
+#include "vcprojectdocument.h"
-#include "../interfaces/itooldescription.h"
+#include "../interfaces/iattributedescriptiondataitem.h"
-#include "../interfaces/itools.h"
 #include "../interfaces/iconfigurationbuildtool.h"
 #include "../interfaces/iconfigurationbuildtools.h"
+#include "../interfaces/isectioncontainer.h"
+#include "../interfaces/itoolattribute.h"
+#include "../interfaces/itoolattributecontainer.h"
+#include "../interfaces/itooldescription.h"
+#include "../interfaces/itools.h"
+#include "../interfaces/itoolsection.h"
+#include "../interfaces/itoolsectiondescription.h"
+#include "../widgets/fileconfigurationseditwidget.h"
+#include "tools/tool_constants.h"
+#include "tools/toolattributes/tooldescriptiondatamanager.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/mimedatabase.h>
+#include <projectexplorer/projectexplorerconstants.h>
+
+#include <QDomNode>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/file.h

@@ -30,15 +30,18 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_FILE_H
 #define VCPROJECTMANAGER_INTERNAL_FILE_H
 
-#include "configuration.h"
 #include "../interfaces/ifile.h"
 
-#include <projectexplorer/projectnodes.h>
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
 
 class IVisualStudioProject;
+class GeneralAttributeContainer;
+class IToolSection;
 
 class File : public IFile
 {

src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.cpp

@@ -27,15 +27,32 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "configurationcontainer.h"
+#include "debuggertool.h"
+#include "deploymenttool.h"
 #include "filebuildconfiguration.h"
-#include "tools/toolattributes/tooldescriptiondatamanager.h"
+#include "generalattributecontainer.h"
+#include "tools.h"
+#include "../interfaces/iattributedescriptiondataitem.h"
+#include "../interfaces/iconfiguration.h"
 #include "../interfaces/iconfigurationbuildtool.h"
 #include "../interfaces/iconfigurationbuildtools.h"
+#include "../interfaces/iconfigurations.h"
 #include "../interfaces/idebuggertools.h"
 #include "../interfaces/ideploymenttools.h"
-#include "tools.h"
+#include "../interfaces/isectioncontainer.h"
-#include "tools/toolattributes/tooldescription.h"
+#include "../interfaces/itoolattribute.h"
+#include "../interfaces/itoolattributecontainer.h"
+#include "../interfaces/itoolsection.h"
+#include "../interfaces/itoolsectiondescription.h"
+#include "../interfaces/ivisualstudioproject.h"
 #include "../widgets/fileconfigurationsettingswidget.h"
+#include "tools/toolattributes/tooldescription.h"
+#include "tools/toolattributes/tooldescriptiondatamanager.h"
+
+#include <utils/qtcassert.h>
+
+#include <QDomElement>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.h

@@ -35,6 +35,10 @@
 namespace VcProjectManager {
 namespace Internal {
 
+class IVisualStudioProject;
+class IConfigurationBuildTool;
+class IToolSection;
+
 class FileBuildConfiguration : public Configuration
 {
 public:

src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.cpp

@@ -1,11 +1,14 @@
+#include "file.h"
 #include "filecontainer.h"
+#include "generalattributecontainer.h"
+#include "vcprojectdocument.h"
+#include "../vcprojectmanagerconstants.h"
 
-#include <QFileInfo>
 #include <utils/qtcassert.h>
 
-#include "vcprojectdocument.h"
+#include <QDomNode>
-#include "generalattributecontainer.h"
+#include <QFileInfo>
-#include "../vcprojectmanagerconstants.h"
+#include <QStringList>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.h

@@ -30,14 +30,17 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_FILECONTAINER_H
 #define VCPROJECTMANAGER_INTERNAL_FILECONTAINER_H
 
-#include "../interfaces/ivcprojectnodemodel.h"
-#include "file.h"
-#include "filter.h"
 #include "../interfaces/ifilecontainer.h"
 
+#include <QList>
+#include <QString>
+
 namespace VcProjectManager {
 namespace Internal {
 
+class IVisualStudioProject;
+class GeneralAttributeContainer;
+
 class FileContainer : public IFileContainer
 {
 public:

src/plugins/vcprojectmanager/vcprojectmodel/files.cpp

@@ -27,11 +27,14 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "file.h"
+#include "filecontainer.h"
 #include "files.h"
-
 #include "vcprojectdocument.h"
 #include "../vcprojectmanagerconstants.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/files.h

@@ -30,15 +30,18 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_FILES_H
 #define VCPROJECTMANAGER_INTERNAL_FILES_H
 
-#include "../interfaces/ivcprojectnodemodel.h"
-#include "../interfaces/ifiles.h"
-
 #include "file.h"
 #include "filecontainer.h"
+#include "../interfaces/ifiles.h"
+#include "../interfaces/ivcprojectnodemodel.h"
+
+#include <QList>
 
 namespace VcProjectManager {
 namespace Internal {
 
+class IVisualStudioProject;
+
 class Files : public IFiles
 {
 public:

src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.cpp

@@ -29,6 +29,8 @@
 ****************************************************************************/
 #include "generalattributecontainer.h"
 
+#include <QDomElement>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/global.cpp

@@ -29,6 +29,8 @@
 ****************************************************************************/
 #include "global.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/global.h

@@ -32,6 +32,12 @@
 
 #include "../interfaces/iglobal.h"
 
+#include <QString>
+
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp

@@ -28,9 +28,12 @@
 **
 ****************************************************************************/
 #include "globals.h"
+#include "global.h"
 
 #include <utils/qtcassert.h>
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/globals.h

@@ -34,13 +34,9 @@
 
 #include <QList>
 
-#include "global.h"
-
 namespace VcProjectManager {
 namespace Internal {
 
-class Global;
-
 class Globals : public IGlobals
 {
 public:

src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp

@@ -29,6 +29,8 @@
 ****************************************************************************/
 #include "platform.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/platform.h

@@ -32,6 +32,12 @@
 
 #include "../interfaces/iplatform.h"
 
+#include <QString>
+
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp

@@ -27,10 +27,13 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "platform.h"
 #include "platforms.h"
 
 #include <utils/qtcassert.h>
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/platforms.h

@@ -34,13 +34,9 @@
 
 #include <QList>
 
-#include "platform.h"
-
 namespace VcProjectManager {
 namespace Internal {
 
-class Platform;
-
 class Platforms : public IPlatforms
 {
 public:

src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp

@@ -27,11 +27,13 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "projectreference.h"
+#include "configuration.h"
 #include "configurationcontainer.h"
 #include "generalattributecontainer.h"
+#include "projectreference.h"
 #include "vcprojectdocument_constants.h"
-#include "configuration.h"
+
+#include <QDomNode>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h

@@ -32,6 +32,10 @@
 
 #include "../interfaces/ireference.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp

@@ -27,11 +27,14 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "publishingdata.h"
 #include "generalattributecontainer.h"
+#include "publishingdata.h"
+#include "publishingitem.h"
 
 #include <utils/qtcassert.h>
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h

@@ -32,7 +32,11 @@
 
 #include "../interfaces/ipublishingdata.h"
 
-#include "publishingitem.h"
+#include <QList>
+
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp

@@ -27,8 +27,10 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "publishingitem.h"
 #include "generalattributecontainer.h"
+#include "publishingitem.h"
+
+#include <QDomNode>
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h

@@ -32,6 +32,10 @@
 
 #include "../interfaces/ipublishingitem.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/references.cpp

@@ -27,11 +27,17 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "references.h"
+#include "activexreference.h"
+#include "assemblyreference.h"
 #include "generalattributecontainer.h"
+#include "generalattributecontainer.h"
+#include "projectreference.h"
+#include "references.h"
 
 #include <utils/qtcassert.h>
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/references.h

@@ -32,9 +32,7 @@
 
 #include "../interfaces/ireferences.h"
 
-#include "activexreference.h"
+#include <QList>
-#include "assemblyreference.h"
-#include "projectreference.h"
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp

@@ -27,10 +27,12 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "toolfile.h"
 #include "generalattributecontainer.h"
+#include "toolfile.h"
 #include "vcprojectdocument_constants.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h

@@ -32,6 +32,10 @@
 
 #include "../interfaces/itoolfile.h"
 
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp

@@ -27,12 +27,16 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "defaulttoolfile.h"
+#include "toolfile.h"
 #include "toolfiles.h"
-#include "../interfaces/iattributecontainer.h"
 #include "vcprojectdocument_constants.h"
+#include "../interfaces/iattributecontainer.h"
 
 #include <utils/qtcassert.h>
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h

@@ -32,8 +32,7 @@
 
 #include "../interfaces/itoolfiles.h"
 
-#include "defaulttoolfile.h"
+#include <QList>
-#include "toolfile.h"
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/tools.cpp

@@ -27,10 +27,10 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "tools.h"
-#include "deploymenttools.h"
 #include "configurationbuildtools.h"
 #include "debuggertools.h"
+#include "deploymenttools.h"
+#include "tools.h"
 
 namespace VcProjectManager {
 namespace Internal {

src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.cpp

@@ -28,15 +28,17 @@
 **
 ****************************************************************************/
 #include "configurationtool.h"
-#include "../../interfaces/itoolattribute.h"
-#include "../../interfaces/iattributedescriptiondataitem.h"
-#include "../../interfaces/itoolattributecontainer.h"
-#include "toolattributes/tooldescriptiondatamanager.h"
-#include "toolattributes/tooldescription.h"
-#include "toolsectiondescription.h"
 #include "toolsection.h"
+#include "toolsectiondescription.h"
+#include "../../interfaces/iattributedescriptiondataitem.h"
+#include "../../interfaces/itoolattribute.h"
+#include "../../interfaces/itoolattributecontainer.h"
+#include "toolattributes/tooldescription.h"
+#include "toolattributes/tooldescriptiondatamanager.h"
 #include "toolattributes/toolsectioncontainer.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h

@@ -30,20 +30,17 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONTOOL_H
 #define VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONTOOL_H
 
+#include "../../interfaces/iconfigurationbuildtool.h"
 #include "../../interfaces/ivcprojectnodemodel.h"
 #include "../../widgets/toolwidgets/toolsettingswidget.h"
-#include "../../interfaces/iconfigurationbuildtool.h"
 
-#include <QList>
+QT_BEGIN_NAMESPACE
-#include <QString>
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
 
-class IToolAttribute;
-class ToolDescription;
-class ToolSection;
-
 class ConfigurationTool : public IConfigurationBuildTool
 {
 public:

src/plugins/vcprojectmanager/vcprojectmodel/tools/generaltoolattributecontainer.h

@@ -30,9 +30,10 @@
 #ifndef GENERALTOOLATTRIBUTECONTAINER_H
 #define GENERALTOOLATTRIBUTECONTAINER_H
 
-#include <QList>
 #include "../../interfaces/itoolattributecontainer.h"
 
+#include <QList>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/tools/prebuildeventtool.cpp

@@ -28,15 +28,14 @@
 **
 ****************************************************************************/
 #include "prebuildeventtool.h"
-
-#include <QComboBox>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QHBoxLayout>
-
 #include "../../widgets/basicconfigurationwidget.h"
 #include "../../widgets/lineedit.h"
 
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QPushButton>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.cpp

@@ -28,9 +28,9 @@
 **
 ****************************************************************************/
 #include "attributedescriptiondataitem.h"
-#include "stringlisttoolattribute.h"
 #include "booltoolattribute.h"
 #include "integertoolattribute.h"
+#include "stringlisttoolattribute.h"
 #include "stringtoolattribute.h"
 #include "toolattributeoption.h"
 

src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h

@@ -30,10 +30,11 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ATTRIBUTEDESCRIPTIONDATAITEM_H
 #define VCPROJECTMANAGER_INTERNAL_ATTRIBUTEDESCRIPTIONDATAITEM_H
 
-#include <QHash>
-
 #include "../../../interfaces/iattributedescriptiondataitem.h"
 
+#include <QHash>
+#include <QString>
+
 namespace VcProjectManager {
 namespace Internal {
 

src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/booltoolattribute.cpp

@@ -27,8 +27,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "booltoolattribute.h"
 #include "attributedescriptiondataitem.h"
+#include "booltoolattribute.h"
 #include "../../../widgets/toolwidgets/booltoolattributesettingsitem.h"
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/integertoolattribute.cpp

@@ -27,8 +27,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "integertoolattribute.h"
 #include "attributedescriptiondataitem.h"
+#include "integertoolattribute.h"
 #include "../../../widgets/toolwidgets/integertoolattributesettingsitem.h"
 
 namespace VcProjectManager {

src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.cpp

@@ -27,8 +27,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "stringlisttoolattribute.h"
 #include "attributedescriptiondataitem.h"
+#include "stringlisttoolattribute.h"
 #include "../../../widgets/toolwidgets/stringlisttoolattributesettingsitem.h"
 
 namespace VcProjectManager {