Cleanup includes

Change-Id: I3b6e524ca3fdafb792f7047eae3114dd0a0e3a49 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
author: Radovan Zivkovic <pivonroll@gmail.com> 2014-05-22 02:42:30 +0200
committer: Radovan Zivkovic <pivonroll@gmail.com> 2014-05-25 10:25:41 +0200
commit: 5232f29157513ff2cb5b0fb0b6179604650053f2 (patch)
tree: 0b75b5d6f9abd21295c0e3a93dee988644c19f78
parent: 88c3d00e01cb52b3075b510ee240afe6b76e1615 (diff)
download: qt-creator-5232f29157513ff2cb5b0fb0b6179604650053f2.tar.gz
149 files changed, 495 insertions, 410 deletions
diff --git a/src/plugins/vcprojectmanager/interfaces/iattributecontainer.h b/src/plugins/vcprojectmanager/interfaces/iattributecontainer.h
index 853f98b3b1..03a415477b 100644
--- a/src/plugins/vcprojectmanager/interfaces/iattributecontainer.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/iattributedescriptiondataitem.h b/src/plugins/vcprojectmanager/interfaces/iattributedescriptiondataitem.h
index 894987327d..beba16296a 100644
--- a/src/plugins/vcprojectmanager/interfaces/iattributedescriptiondataitem.h
+++ b/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
-#define VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTESETTINGSDATAITEM_H
+#ifndef VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTEDESCRIPTIONDATAITEM_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
diff --git a/src/plugins/vcprojectmanager/interfaces/iconfiguration.h b/src/plugins/vcprojectmanager/interfaces/iconfiguration.h
index 688fdae1d3..2c41231ac2 100644
--- a/src/plugins/vcprojectmanager/interfaces/iconfiguration.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h b/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h
index a7fd1acadb..b142e53220 100644
--- a/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtools.h b/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtools.h
index 0edb0dc311..1188ae5fa9 100644
--- a/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtools.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/iconfigurations.h b/src/plugins/vcprojectmanager/interfaces/iconfigurations.h
index 83b6948055..67bc2b6902 100644
--- a/src/plugins/vcprojectmanager/interfaces/iconfigurations.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/idebuggertools.h b/src/plugins/vcprojectmanager/interfaces/idebuggertools.h
index b88931fa4c..b5d0959f65 100644
--- a/src/plugins/vcprojectmanager/interfaces/idebuggertools.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/ideploymenttools.h b/src/plugins/vcprojectmanager/interfaces/ideploymenttools.h
index e94f3b1f73..d53ba981ef 100644
--- a/src/plugins/vcprojectmanager/interfaces/ideploymenttools.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/ifile.h b/src/plugins/vcprojectmanager/interfaces/ifile.h
index 197180c96c..bcd23ad951 100644
--- a/src/plugins/vcprojectmanager/interfaces/ifile.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h b/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h
index 95d03a5ce3..d09fe8b632 100644
--- a/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h
+++ b/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h
@@ -32,6 +32,8 @@
 
 #include "ivcprojectnodemodel.h"
 
+QT_FORWARD_DECLARE_CLASS(QStringList)
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/interfaces/iglobal.h b/src/plugins/vcprojectmanager/interfaces/iglobal.h
index f3adf618e5..72958a3471 100644
--- a/src/plugins/vcprojectmanager/interfaces/iglobal.h
+++ b/src/plugins/vcprojectmanager/interfaces/iglobal.h
@@ -31,7 +31,6 @@
 #define VCPROJECTMANAGER_INTERNAL_IGLOBAL_H
 
 #include "ivcprojectnodemodel.h"
-#include <QString>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/interfaces/iplatform.h b/src/plugins/vcprojectmanager/interfaces/iplatform.h
index 90206794b1..fdff9bbd5b 100644
--- a/src/plugins/vcprojectmanager/interfaces/iplatform.h
+++ b/src/plugins/vcprojectmanager/interfaces/iplatform.h
@@ -32,8 +32,6 @@
 
 #include "ivcprojectnodemodel.h"
 
-#include <QString>
-
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/interfaces/ireference.h b/src/plugins/vcprojectmanager/interfaces/ireference.h
index 54dde429d8..3f49442d54 100644
--- a/src/plugins/vcprojectmanager/interfaces/ireference.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/isectioncontainer.h b/src/plugins/vcprojectmanager/interfaces/isectioncontainer.h
index 89afce4524..a0772b57a8 100644
--- a/src/plugins/vcprojectmanager/interfaces/isectioncontainer.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/itoolattribute.h b/src/plugins/vcprojectmanager/interfaces/itoolattribute.h
index e3711c9232..a442ba9040 100644
--- a/src/plugins/vcprojectmanager/interfaces/itoolattribute.h
+++ b/src/plugins/vcprojectmanager/interfaces/itoolattribute.h
@@ -30,9 +30,7 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTE_H
 #define VCPROJECTMANAGER_INTERNAL_ITOOLATTRIBUTE_H
 
-#include <QStringList>
-
-class QWidget;
+#include <QString>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/interfaces/itoolfile.h b/src/plugins/vcprojectmanager/interfaces/itoolfile.h
index c0bc6a9429..20d11d5a9b 100644
--- a/src/plugins/vcprojectmanager/interfaces/itoolfile.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/itools.h b/src/plugins/vcprojectmanager/interfaces/itools.h
index 26dd15ef98..55afe79d92 100644
--- a/src/plugins/vcprojectmanager/interfaces/itools.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/itoolsection.h b/src/plugins/vcprojectmanager/interfaces/itoolsection.h
index 38e786eec8..bfdf814515 100644
--- a/src/plugins/vcprojectmanager/interfaces/itoolsection.h
+++ b/src/plugins/vcprojectmanager/interfaces/itoolsection.h
@@ -33,7 +33,6 @@
 namespace VcProjectManager {
 namespace Internal {
 
-class IToolAttribute;
 class IToolSectionDescription;
 class VcNodeWidget;
 class IToolAttributeContainer;
diff --git a/src/plugins/vcprojectmanager/interfaces/ivcprojectnodemodel.h b/src/plugins/vcprojectmanager/interfaces/ivcprojectnodemodel.h
index 0eaaeb1fd3..bd2cfeb6bb 100644
--- a/src/plugins/vcprojectmanager/interfaces/ivcprojectnodemodel.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h b/src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h
index 2581ffc598..ed6461908c 100644
--- a/src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/menuhandler.cpp b/src/plugins/vcprojectmanager/menuhandler.cpp
index 4fa6b160df..ee5094e9f1 100644
--- a/src/plugins/vcprojectmanager/menuhandler.cpp
+++ b/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 "vcproject.h"
-#include "vcprojectmodel/vcdocprojectnodes.h"
-#include "vcprojectfile.h"
-#include "vcprojectmodel/vcprojectdocument.h"
-#include "vcprojectmodel/vcdocumentmodel.h"
-#include "widgets/vcenternamedialog.h"
+#include <QAction>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/menuhandler.h b/src/plugins/vcprojectmanager/menuhandler.h
index 07bd8a7ccf..aa3be69df0 100644
--- a/src/plugins/vcprojectmanager/menuhandler.h
+++ b/src/plugins/vcprojectmanager/menuhandler.h
@@ -32,7 +32,9 @@
 
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
 class QAction;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/msbuildoutputparser.cpp b/src/plugins/vcprojectmanager/msbuildoutputparser.cpp
index e64c7a4020..d2cf88091f 100644
--- a/src/plugins/vcprojectmanager/msbuildoutputparser.cpp
+++ b/src/plugins/vcprojectmanager/msbuildoutputparser.cpp
@@ -28,6 +28,7 @@
 **
 ****************************************************************************/
 #include "msbuildoutputparser.h"
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/msbuildoutputparser.h b/src/plugins/vcprojectmanager/msbuildoutputparser.h
index dc1d4573c8..ccfb435363 100644
--- a/src/plugins/vcprojectmanager/msbuildoutputparser.h
+++ b/src/plugins/vcprojectmanager/msbuildoutputparser.h
@@ -32,6 +32,7 @@
 
 #include <projectexplorer/ioutputparser.h>
 #include <projectexplorer/task.h>
+
 #include <QRegExp>
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/msbuildversionmanager.cpp b/src/plugins/vcprojectmanager/msbuildversionmanager.cpp
index c0180e10a8..ae6f62ddd5 100644
--- a/src/plugins/vcprojectmanager/msbuildversionmanager.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/msbuildversionmanager.h b/src/plugins/vcprojectmanager/msbuildversionmanager.h
index a26206bc5b..4fbc5b7550 100644
--- a/src/plugins/vcprojectmanager/msbuildversionmanager.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcmakestep.cpp b/src/plugins/vcprojectmanager/vcmakestep.cpp
index 1f495e5b5e..c9ce7bcfeb 100644
--- a/src/plugins/vcprojectmanager/vcmakestep.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcmakestep.h b/src/plugins/vcprojectmanager/vcmakestep.h
index 9a5ec32f27..5e09730a32 100644
--- a/src/plugins/vcprojectmanager/vcmakestep.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcproject.cpp b/src/plugins/vcprojectmanager/vcproject.cpp
index 51eed20650..e4a9492482 100644
--- a/src/plugins/vcprojectmanager/vcproject.cpp
+++ b/src/plugins/vcprojectmanager/vcproject.cpp
@@ -28,47 +28,38 @@
 **
 ****************************************************************************/
 #include "vcproject.h"
-
+#include "vcprojectbuildconfiguration.h"
 #include "vcprojectfile.h"
-#include "vcmakestep.h"
-#include "vcprojectmanager.h"
 #include "vcprojectkitinformation.h"
+#include "vcprojectmanager.h"
 #include "vcprojectmanagerconstants.h"
-#include "vcprojectbuildconfiguration.h"
-#include <vcprojectmodel/configurationcontainer.h>
-#include "vcprojectmodel/vcdocumentmodel.h"
-#include "vcprojectmodel/vcprojectdocument.h"
-#include "vcprojectmodel/configurations.h"
-#include "vcprojectmodel/tools/tool_constants.h"
-#include "vcprojectmodel/vcdocprojectnodes.h"
-#include "vcprojectmodel/tools/configurationtool.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/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/vcdocumentmodel.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>
 
diff --git a/src/plugins/vcprojectmanager/vcproject.h b/src/plugins/vcprojectmanager/vcproject.h
index ac0266de70..1adba040cb 100644
--- a/src/plugins/vcprojectmanager/vcproject.h
+++ b/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
 {
diff --git a/src/plugins/vcprojectmanager/vcprojectbuildconfiguration.cpp b/src/plugins/vcprojectmanager/vcprojectbuildconfiguration.cpp
index 02ea366587..5c86c0b64a 100644
--- a/src/plugins/vcprojectmanager/vcprojectbuildconfiguration.cpp
+++ b/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/fileutils.h>
 #include <utils/qtcassert.h>
-#include <projectexplorer/target.h>
 
-#include <QFormLayout>
-#include <QLabel>
-#include <QInputDialog>
+#include <QFileInfo>
 
 using namespace ProjectExplorer;
 using namespace VcProjectManager::Constants;
diff --git a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp b/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp
index 4cf997427e..9ad55c280f 100644
--- a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp
+++ b/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>
 
diff --git a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.h b/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.h
index 4b024ca6ab..2d99ae5a18 100644
--- a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.h
+++ b/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"
-
-class QLabel;
+QT_BEGIN_NAMESPACE
 class QLineEdit;
 class QProcess;
 class QPushButton;
 class QTableWidget;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectfile.cpp b/src/plugins/vcprojectmanager/vcprojectfile.cpp
index 0480dc3541..9b49feddde 100644
--- a/src/plugins/vcprojectmanager/vcprojectfile.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectfile.h b/src/plugins/vcprojectmanager/vcprojectfile.h
index 887719c5fd..6e0ddae901 100644
--- a/src/plugins/vcprojectmanager/vcprojectfile.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectkitinformation.cpp b/src/plugins/vcprojectmanager/vcprojectkitinformation.cpp
index d28445af51..682cd166ba 100644
--- a/src/plugins/vcprojectmanager/vcprojectkitinformation.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmanager.cpp b/src/plugins/vcprojectmanager/vcprojectmanager.cpp
index 127f145c50..4e5b53c700 100644
--- a/src/plugins/vcprojectmanager/vcprojectmanager.cpp
+++ b/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>
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmanager.h b/src/plugins/vcprojectmanager/vcprojectmanager.h
index 8650c73f97..6b098e72d8 100644
--- a/src/plugins/vcprojectmanager/vcprojectmanager.h
+++ b/src/plugins/vcprojectmanager/vcprojectmanager.h
@@ -33,8 +33,6 @@
 #include <projectexplorer/iprojectmanager.h>
 #include <projectexplorer/projectnodes.h>
 
-class QAction;
-
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmanagerconstants.h b/src/plugins/vcprojectmanager/vcprojectmanagerconstants.h
index 7f59043fda..09542e935d 100644
--- a/src/plugins/vcprojectmanager/vcprojectmanagerconstants.h
+++ b/src/plugins/vcprojectmanager/vcprojectmanagerconstants.h
@@ -30,7 +30,7 @@
 #ifndef VCPROJECTMANAGERCONSTANTS_H
 #define VCPROJECTMANAGERCONSTANTS_H
 
-#include <qglobal.h>
+#include <QtGlobal>
 
 namespace VcProjectManager {
 namespace Constants {
diff --git a/src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp b/src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp
index 837b9a6888..1f7f397c3b 100644
--- a/src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp
+++ b/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 "vcprojectmanagerconstants.h"
+#include "vcmakestep.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;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp
index 0d9f22adff..3a66a96630 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp
@@ -28,10 +28,13 @@
 **
 ****************************************************************************/
 #include "activexreference.h"
+#include "configuration.h"
+#include "configurationcontainer.h"
+#include "generalattributecontainer.h"
+#include "vcprojectdocument_constants.h"
 
+#include <QDomNode>
 #include <QVariant>
-#include "generalattributecontainer.h"
-#include "configurationcontainer.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
index 560fc23523..70decbf24a 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp
index d4373e51ea..3b0616101d 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp
@@ -28,11 +28,13 @@
 **
 ****************************************************************************/
 #include "assemblyreference.h"
-
-#include <QVariant>
-
+#include "configuration.h"
 #include "configurationcontainer.h"
 #include "generalattributecontainer.h"
+#include "vcprojectdocument_constants.h"
+
+#include <QDomNode>
+#include <QVariant>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
index 92ed91af8a..96e8593b34 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
@@ -32,8 +32,9 @@
 
 #include "../interfaces/ireference.h"
 
-#include "configuration.h"
-#include "vcprojectdocument_constants.h"
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp
index 62c8e2b96e..246351e0dc 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp
@@ -28,19 +28,20 @@
 **
 ****************************************************************************/
 #include "configuration.h"
-
+#include "configurationbuildtools.h"
 #include "debuggertool.h"
+#include "debuggertools.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 "deploymenttools.h"
 #include "generalattributecontainer.h"
-#include "configurationbuildtools.h"
 #include "tools.h"
-#include "deploymenttools.h"
-#include "debuggertools.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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
index 818b0c1a51..faceb5ca0a 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
+++ b/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
 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurationbuildtools.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurationbuildtools.cpp
index d27cda435a..e703d01ee9 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurationbuildtools.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurationbuildtools.cpp
@@ -31,6 +31,8 @@
 #include "../interfaces/iconfigurationbuildtool.h"
 #include "../interfaces/itooldescription.h"
 
+#include <QDomElement>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.cpp
index b4a7e481ac..f1a30e1c7d 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.cpp
@@ -30,6 +30,8 @@
 #include "configurationcontainer.h"
 #include "../interfaces/iconfiguration.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.h b/src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.h
index 13b06a6ae2..832d6cb63c 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurationcontainer.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
index 131d911246..2b479e28e8 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
@@ -27,12 +27,14 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "configuration.h"
+#include "configurationcontainer.h"
 #include "configurations.h"
-
 #include "vcprojectdocument.h"
+#include "vcprojectdocument_constants.h"
 #include "../widgets/configurationseditwidget.h"
-#include "../interfaces/iconfiguration.h"
-#include "configurationcontainer.h"
+
+#include <QDomNode>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h
index f1c75fd3d3..8e25f28966 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp
index 0b63ba8038..a1eeaf70d6 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp
@@ -30,6 +30,8 @@
 #include "debuggertool.h"
 #include "generalattributecontainer.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h
index 06e01bdd1e..7ce3990acb 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.cpp
index 29e434eee0..54dfc09fbf 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h
index aad0637d34..7dc2f8d5bb 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h
@@ -31,6 +31,7 @@
 #define VCPROJECTMANAGER_INTERNAL_DEBUGGERTOOLS_H
 
 #include "../interfaces/idebuggertools.h"
+
 #include <QList>
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp
index 4df8586462..d477ded683 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h b/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h
index 6525d41d2f..00824e84e9 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp
index 2647b5c4b9..d1815ce3bd 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp
@@ -30,6 +30,8 @@
 #include "deploymenttool.h"
 #include "generalattributecontainer.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h
index 41b0315432..98cac2d367 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.cpp
index 4963f3f6e8..c0c1373459 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.cpp
@@ -32,6 +32,8 @@
 
 #include <utils/qtcassert.h>
 
+#include <QDomElement>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h
index a4e6f0b55f..8155340b8f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h
@@ -31,6 +31,7 @@
 #define VCPROJECTMANAGER_INTERNAL_DEPLOYMENTTOOLS_H
 
 #include "../interfaces/ideploymenttools.h"
+
 #include <QList>
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
index 58d53c93d4..9dbd83985c 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
+++ b/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 "../widgets/configurationseditwidget.h"
+#include "file.h"
 #include "filebuildconfiguration.h"
-#include "tools/toolattributes/tooldescriptiondatamanager.h"
-#include "tools/tool_constants.h"
-#include "../interfaces/itooldescription.h"
-#include "../interfaces/itools.h"
+#include "generalattributecontainer.h"
+#include "vcprojectdocument.h"
+#include "../interfaces/iattributedescriptiondataitem.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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/file.h b/src/plugins/vcprojectmanager/vcprojectmodel/file.h
index 76c1bbc4c6..e9a4758974 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/file.h
+++ b/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
 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.cpp
index 077350aa30..d81e9d2627 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.cpp
+++ b/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 "tools/toolattributes/tooldescription.h"
+#include "../interfaces/isectioncontainer.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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.h b/src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.h
index 373cb979be..888653f6e8 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/filebuildconfiguration.h
+++ b/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:
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.cpp
index bda9444af8..4392181d4f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.cpp
+++ b/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 "generalattributecontainer.h"
-#include "../vcprojectmanagerconstants.h"
+#include <QDomNode>
+#include <QFileInfo>
+#include <QStringList>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.h b/src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.h
index 96dedb7624..9550129e89 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/filecontainer.h
+++ b/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:
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp
index 72f62a2c97..cb7de1e435 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files.h b/src/plugins/vcprojectmanager/vcprojectmodel/files.h
index f353744018..d5715d01d4 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/files.h
+++ b/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:
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.cpp
index 5fc7742a87..15362fb1a8 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.cpp
@@ -29,6 +29,8 @@
 ****************************************************************************/
 #include "generalattributecontainer.h"
 
+#include <QDomElement>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp
index e26e9ceced..933e422515 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp
@@ -29,6 +29,8 @@
 ****************************************************************************/
 #include "global.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/global.h b/src/plugins/vcprojectmanager/vcprojectmodel/global.h
index 98c0ef23e7..4c0e521cd2 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/global.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp
index d1356c850a..7192917e40 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/globals.h b/src/plugins/vcprojectmanager/vcprojectmodel/globals.h
index fe2985dbad..c55a78be98 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/globals.h
+++ b/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:
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp
index 324a6477c7..5f1d718c1f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp
@@ -29,6 +29,8 @@
 ****************************************************************************/
 #include "platform.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platform.h b/src/plugins/vcprojectmanager/vcprojectmodel/platform.h
index a7d180d1a3..dd9d9b5425 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platform.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp
index 538d32e70e..02c29b34bc 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.h b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.h
index 60cdc47296..2486cafef7 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.h
+++ b/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:
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp
index d5a3cd635f..1f7f363276 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h
index 71949988af..bc3121a3d0 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp
index d3c2e6a3e0..f0c98920fb 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h
index 1a3595956b..4309cb3cb5 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp
index 5bbb51973d..492c1c8d53 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h b/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h
index e8e9dc7c12..6289c776ff 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp
index 3b3b89c2b9..9e719cf03b 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/references.h b/src/plugins/vcprojectmanager/vcprojectmodel/references.h
index 74df61c936..2b9392528f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/references.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/references.h
@@ -32,9 +32,7 @@
 
 #include "../interfaces/ireferences.h"
 
-#include "activexreference.h"
-#include "assemblyreference.h"
-#include "projectreference.h"
+#include <QList>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp
index 635978c1f4..b69ce0b4ab 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h b/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h
index fa4fbc13d7..7c0c9d80a5 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp
index 06bccc5baa..0b98316390 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h
index a6c56fcd4b..d238ec0e8c 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h
@@ -32,8 +32,7 @@
 
 #include "../interfaces/itoolfiles.h"
 
-#include "defaulttoolfile.h"
-#include "toolfile.h"
+#include <QList>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools.cpp
index 638466bf76..4b0fd09ae8 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.cpp
index 7dbed53480..ed3c70cb56 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.cpp
@@ -28,15 +28,17 @@
 **
 ****************************************************************************/
 #include "configurationtool.h"
-#include "../../interfaces/itoolattribute.h"
+#include "toolsection.h"
+#include "toolsectiondescription.h"
 #include "../../interfaces/iattributedescriptiondataitem.h"
+#include "../../interfaces/itoolattribute.h"
 #include "../../interfaces/itoolattributecontainer.h"
-#include "toolattributes/tooldescriptiondatamanager.h"
 #include "toolattributes/tooldescription.h"
-#include "toolsectiondescription.h"
-#include "toolsection.h"
+#include "toolattributes/tooldescriptiondatamanager.h"
 #include "toolattributes/toolsectioncontainer.h"
 
+#include <QDomNode>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h
index 591683ce0b..f552b32c3a 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h
+++ b/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>
-#include <QString>
+QT_BEGIN_NAMESPACE
+class QDomElement;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
 
-class IToolAttribute;
-class ToolDescription;
-class ToolSection;
-
 class ConfigurationTool : public IConfigurationBuildTool
 {
 public:
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/generaltoolattributecontainer.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/generaltoolattributecontainer.h
index 807fedbb46..ce493636b6 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/generaltoolattributecontainer.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/prebuildeventtool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/prebuildeventtool.cpp
index 1f96c5c71a..3c34ef1c48 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/prebuildeventtool.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/prebuildeventtool.cpp
@@ -28,14 +28,13 @@
 **
 ****************************************************************************/
 #include "prebuildeventtool.h"
+#include "../../widgets/basicconfigurationwidget.h"
+#include "../../widgets/lineedit.h"
 
 #include <QComboBox>
+#include <QHBoxLayout>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QHBoxLayout>
-
-#include "../../widgets/basicconfigurationwidget.h"
-#include "../../widgets/lineedit.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.cpp
index 383f8a8081..fcd4a509a9 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.cpp
+++ b/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"
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h
index bd96656e6e..486a971547 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h
+++ b/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 {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/booltoolattribute.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/booltoolattribute.cpp
index 4b47b54bbe..cc410d365f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/booltoolattribute.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/integertoolattribute.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/integertoolattribute.cpp
index 497c3af8e5..e6a96d5132 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/integertoolattribute.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.cpp
index e4c6e6a82f..f427fa3aa4 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.cpp
+++ b/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 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.h
index 83e7cb1e5c..ca6d547df9 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringlisttoolattribute.h
@@ -32,6 +32,8 @@
 
 #include "../../../interfaces/itoolattribute.h"
 
+#include <QStringList>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringtoolattribute.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringtoolattribute.cpp
index d48551f917..567d58d707 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringtoolattribute.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/stringtoolattribute.cpp
@@ -27,8 +27,8 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "stringtoolattribute.h"
 #include "attributedescriptiondataitem.h"
+#include "stringtoolattribute.h"
 #include "../../../widgets/toolwidgets/stringtoolattributesettingsitem.h"
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp
index 4cb9d63886..c088f1e4f6 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 #include "tooldescription.h"
-#include "../../../interfaces/itoolattribute.h"
 #include "../../../interfaces/iattributedescriptiondataitem.h"
+#include "../../../interfaces/itoolattribute.h"
 #include "../configurationtool.h"
 #include "../toolsectiondescription.h"
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h
index 9288b031a1..f16a0cc127 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h
@@ -30,16 +30,15 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_TOOLDESCRIPTION_H
 #define VCPROJECTMANAGER_INTERNAL_TOOLDESCRIPTION_H
 
+#include "../../../interfaces/itooldescription.h"
+
 #include <QList>
 #include <QString>
-#include "../../../interfaces/itooldescription.h"
 
 namespace VcProjectManager {
 namespace Internal {
 
 class IAttributeDescriptionDataItem;
-class ConfigurationTool;
-class ToolSectionDescription;
 
 class ToolDescription : public IToolDescription
 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp
index 7539df13cc..2aa5fbe49f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp
@@ -27,18 +27,18 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "tooldescriptiondatamanager.h"
-
 #include "attributedescriptiondataitem.h"
-#include "toolattributeoption.h"
-#include "tooldescription.h"
 #include "booltoolattribute.h"
 #include "integertoolattribute.h"
-#include "stringtoolattribute.h"
 #include "stringlisttoolattribute.h"
-#include "vcschemamanager.h"
+#include "stringtoolattribute.h"
+#include "toolattributeoption.h"
+#include "tooldescription.h"
+#include "tooldescriptiondatamanager.h"
+#include "../../../vcschemamanager.h"
 #include "../toolsectiondescription.h"
 
+#include <QDomNode>
 #include <QFile>
 #include <QMessageBox>
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h
index d9b6b51e84..9de5382ac9 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h
@@ -30,16 +30,18 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_TOOLDESCRIPTIONDATAMANAGER_H
 #define VCPROJECTMANAGER_INTERNAL_TOOLDESCRIPTIONDATAMANAGER_H
 
-#include <QString>
-#include <QHash>
-#include <QDomNode>
-#include <QDomDocument>
 #include <QList>
+#include <QObject>
+#include <QString>
+
+QT_BEGIN_NAMESPACE
+class QDomNode;
+class QDomDocument;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
 
-class IAttributeDescriptionDataItem;
 class IToolDescription;
 class ToolSectionDescription;
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp
index 126739e838..c07cad9abb 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp
@@ -28,11 +28,13 @@
 **
 ****************************************************************************/
 #include "toolsectioncontainer.h"
-#include "../../../interfaces/itoolsection.h"
-#include "../../../interfaces/itoolsectiondescription.h"
-#include "../../../interfaces/itoolattribute.h"
 #include "../../../interfaces/iattributedescriptiondataitem.h"
+#include "../../../interfaces/itoolattribute.h"
 #include "../../../interfaces/itoolattributecontainer.h"
+#include "../../../interfaces/itoolsection.h"
+#include "../../../interfaces/itoolsectiondescription.h"
+
+#include <QDomElement>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.h
index 01aaec37de..77e71c087f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.h
@@ -31,6 +31,7 @@
 #define VCPROJECTMANAGER_INTERNAL_TOOLSECTIONCONTAINER_H
 
 #include "../../../interfaces/isectioncontainer.h"
+
 #include <QList>
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.cpp
index beb417d933..ccb903f947 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.cpp
@@ -27,12 +27,12 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "generaltoolattributecontainer.h"
 #include "toolsection.h"
-#include "../../interfaces/itoolattribute.h"
+#include "toolsectiondescription.h"
 #include "../../interfaces/iattributedescriptiondataitem.h"
+#include "../../interfaces/itoolattribute.h"
 #include "../../widgets/toolwidgets/toolsectionsettingswidget.h"
-#include "toolsectiondescription.h"
-#include "generaltoolattributecontainer.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.h
index 4486d80b88..260f374927 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsection.h
@@ -30,17 +30,18 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_TOOLSECTION_H
 #define VCPROJECTMANAGER_INTERNAL_TOOLSECTION_H
 
-#include <QList>
 #include "../../interfaces/itoolsection.h"
 
+#include <QList>
+
+QT_BEGIN_NAMESPACE
 class QWidget;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
 
 class ToolSectionDescription;
-class IToolAttribute;
-class ToolSectionSettingsWidget;
 class GeneralToolAttributeContainer;
 
 class ToolSection : public IToolSection
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp
index dcb05ae1da..eab7f0350a 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp
@@ -27,9 +27,9 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "toolsection.h"
 #include "toolsectiondescription.h"
 #include "../../interfaces/iattributedescriptiondataitem.h"
-#include "toolsection.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h
index d4548666e2..a19e55d5cc 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h
@@ -30,16 +30,15 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_TOOLSECTIONDESCRIPTION_H
 #define VCPROJECTMANAGER_INTERNAL_TOOLSECTIONDESCRIPTION_H
 
-#include <QString>
-#include <QList>
-
 #include "../../interfaces/itoolsectiondescription.h"
 
+#include <QList>
+#include <QString>
+
 namespace VcProjectManager {
 namespace Internal {
 
 class IAttributeDescriptionDataItem;
-class ToolSection;
 
 class ToolSectionDescription : public IToolSectionDescription
 {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp
index afa5beb3ee..2285e09220 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp
@@ -27,18 +27,18 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "vcdocprojectnodes.h"
-
-#include "vcprojectdocument.h"
 #include "file.h"
-#include "files.h"
 #include "filecontainer.h"
+#include "files.h"
+#include "vcdocprojectnodes.h"
+#include "vcprojectdocument.h"
 #include "../vcprojectmanagerconstants.h"
-#include "widgets/filesettingswidget.h"
+#include "../widgets/filesettingswidget.h"
 
-#include <QFileInfo>
 #include <projectexplorer/projectexplorer.h>
+
 #include <QDir>
+#include <QFileInfo>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.cpp
index 3903ad3cf6..ce1c02a63f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.cpp
@@ -28,14 +28,13 @@
 **
 ****************************************************************************/
 #include "vcdocumentmodel.h"
+#include "vcprojectdocument.h"
 
 #include <QDomDocument>
 #include <QFile>
 #include <QtXmlPatterns/QXmlSchema>
 #include <QtXmlPatterns/QXmlSchemaValidator>
 
-#include "vcprojectdocument.h"
-
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.h b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.h
index c2d25fb697..1b8f3f3daa 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocumentmodel.h
@@ -30,12 +30,14 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_VCDOCUMENTMODEL_H
 #define VCPROJECTMANAGER_INTERNAL_VCDOCUMENTMODEL_H
 
-#include <QString>
-
 #include "vcprojectdocument_constants.h"
 
+#include <QString>
+
+QT_BEGIN_NAMESPACE
 class QFile;
 class QDomDocument;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp
index fa1adfeada..1ad143f09e 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp
@@ -27,28 +27,29 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "configuration.h"
+#include "configurationcontainer.h"
+#include "generalattributecontainer.h"
 #include "vcprojectdocument.h"
+#include "../interfaces/iattributecontainer.h"
+#include "../interfaces/iconfigurationbuildtool.h"
+#include "../interfaces/iconfigurationbuildtools.h"
+#include "../interfaces/itooldescription.h"
+#include "../interfaces/itools.h"
+#include "../widgets/configurationseditwidget.h"
+#include "../widgets/projectsettingswidget.h"
+#include "tools/tool_constants.h"
+#include "tools/toolattributes/tooldescriptiondatamanager.h"
+
+#include <coreplugin/mainwindow.h>
 
 #include <QDomElement>
 #include <QFile>
+#include <QMessageBox>
+#include <QPair>
 #include <QStringList>
 #include <QTextStream>
 #include <QVBoxLayout>
-#include <QMessageBox>
-
-#include <coreplugin/mainwindow.h>
-
-#include "../widgets/projectsettingswidget.h"
-#include "../widgets/configurationseditwidget.h"
-#include "configurationcontainer.h"
-#include "../interfaces/iattributecontainer.h"
-#include "generalattributecontainer.h"
-#include "tools/tool_constants.h"
-#include "tools/toolattributes/tooldescriptiondatamanager.h"
-#include "../interfaces/itooldescription.h"
-#include "../interfaces/iconfigurationbuildtool.h"
-#include "../interfaces/iconfigurationbuildtools.h"
-#include "../interfaces/itools.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
index 8248835631..868e749548 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
@@ -31,18 +31,23 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_VCPROJECTDOCUMENT_H
 #define VCPROJECTMANAGER_INTERNAL_VCPROJECTDOCUMENT_H
 
-#include "../interfaces/ivisualstudioproject.h"
-
 #include "configurations.h"
 #include "files.h"
 #include "globals.h"
-#include "../msbuildversionmanager.h"
 #include "platforms.h"
 #include "publishingdata.h"
 #include "references.h"
 #include "toolfiles.h"
+#include "../interfaces/ivisualstudioproject.h"
+#include "../msbuildversionmanager.h"
 #include "../widgets/vcnodewidget.h"
 
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+class QDomProcessingInstruction;
+QT_END_NAMESPACE
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcschemamanager.cpp b/src/plugins/vcprojectmanager/vcschemamanager.cpp
index a2265c4173..8637df50ce 100644
--- a/src/plugins/vcprojectmanager/vcschemamanager.cpp
+++ b/src/plugins/vcprojectmanager/vcschemamanager.cpp
@@ -27,17 +27,16 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "vcprojectmanagerconstants.h"
 #include "vcschemamanager.h"
+#include "vcprojectmodel/tools/tool_constants.h"
+#include "vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
 
 #include <coreplugin/icore.h>
 
 #include <QSettings>
 #include <QStringList>
 
-#include "vcprojectmanagerconstants.h"
-#include "vcprojectmodel/tools/tool_constants.h"
-#include "vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
-
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/vcschemamanager.h b/src/plugins/vcprojectmanager/vcschemamanager.h
index af886b4d93..5f11f431d8 100644
--- a/src/plugins/vcprojectmanager/vcschemamanager.h
+++ b/src/plugins/vcprojectmanager/vcschemamanager.h
@@ -31,8 +31,9 @@
 #define VCPROJECTMANAGER_INTERNAL_VCSCHEMAMANAGER_H
 
 #include "vcprojectmanagerconstants.h"
-#include <QMap>
+
 #include <QHash>
+#include <QMap>
 #include <QObject>
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.cpp b/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.cpp
index 87f2bb3838..a64b41c7d4 100644
--- a/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.cpp
@@ -28,12 +28,13 @@
 **
 ****************************************************************************/
 #include "basicconfigurationwidget.h"
-#include <QTableWidget>
-#include <QTableWidgetItem>
+
+#include <QHeaderView>
 #include <QLabel>
 #include <QSplitter>
+#include <QTableWidget>
+#include <QTableWidgetItem>
 #include <QVBoxLayout>
-#include <QHeaderView>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.h b/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.h
index 8184be4c9a..9b51d46ac5 100644
--- a/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.h
+++ b/src/plugins/vcprojectmanager/widgets/basicconfigurationwidget.h
@@ -30,12 +30,14 @@
 #ifndef BASICCONFIGURATIONWIDGET_H
 #define BASICCONFIGURATIONWIDGET_H
 
-#include <QWidget>
 #include <QHash>
+#include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QTableWidget;
 class QLabel;
 class QTableWidgetItem;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/configurationbasewidget.cpp b/src/plugins/vcprojectmanager/widgets/configurationbasewidget.cpp
index 27a3efc488..c1417a022e 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationbasewidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/configurationbasewidget.cpp
@@ -28,17 +28,15 @@
 **
 ****************************************************************************/
 #include "configurationbasewidget.h"
+#include "../interfaces/iconfigurationbuildtool.h"
+#include "../interfaces/iconfigurationbuildtools.h"
+#include "../interfaces/itooldescription.h"
+#include "../interfaces/itools.h"
 
-#include <QSplitter>
+#include <QHBoxLayout>
 #include <QListWidget>
+#include <QSplitter>
 #include <QStackedWidget>
-#include <QHBoxLayout>
-
-#include "../vcprojectmodel/tools/tool_constants.h"
-#include "../vcprojectmodel/tools/configurationtool.h"
-#include "../vcprojectmodel/tools/toolattributes/tooldescription.h"
-#include "../interfaces/iconfigurationbuildtools.h"
-#include "../interfaces/itools.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h b/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h
index 305ea2d986..ab4841acc4 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h
+++ b/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h
@@ -30,17 +30,17 @@
 #ifndef CONFIGURATIONWIDGETS_H
 #define CONFIGURATIONWIDGETS_H
 
-#include "../widgets/vcnodewidget.h"
 #include "../vcprojectmodel/configuration.h"
+#include "../widgets/vcnodewidget.h"
 
+QT_BEGIN_NAMESPACE
 class QListWidget;
 class QStackedWidget;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
 
-class Configuration;
-
 class ConfigurationBaseWidget : public VcNodeWidget
 {
     Q_OBJECT
diff --git a/src/plugins/vcprojectmanager/widgets/configurationseditwidget.cpp b/src/plugins/vcprojectmanager/widgets/configurationseditwidget.cpp
index 8ef238bfe9..938dac4476 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationseditwidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/configurationseditwidget.cpp
@@ -28,29 +28,28 @@
 **
 ****************************************************************************/
 #include "configurationseditwidget.h"
-
-#include <QVBoxLayout>
-
-#include "../vcprojectmodel/configurationcontainer.h"
-#include "../interfaces/iconfigurationbuildtools.h"
-#include "../interfaces/iconfigurationbuildtool.h"
-#include "../interfaces/itools.h"
+#include "configurationswidget.h"
+#include "../interfaces/iattributecontainer.h"
 #include "../interfaces/iconfiguration.h"
+#include "../interfaces/iconfigurationbuildtool.h"
+#include "../interfaces/iconfigurationbuildtools.h"
 #include "../interfaces/iconfigurations.h"
-#include "../interfaces/iattributecontainer.h"
-#include "../interfaces/iplatform.h"
-#include "../interfaces/iplatforms.h"
 #include "../interfaces/ifile.h"
-#include "../interfaces/ifiles.h"
 #include "../interfaces/ifilecontainer.h"
-#include "../interfaces/ivisualstudioproject.h"
+#include "../interfaces/ifiles.h"
+#include "../interfaces/iplatform.h"
+#include "../interfaces/iplatforms.h"
 #include "../interfaces/itooldescription.h"
-#include "../vcprojectmodel/configuration.h"
+#include "../interfaces/itools.h"
+#include "../interfaces/ivisualstudioproject.h"
+#include "../vcprojectmodel/configurationcontainer.h"
 #include "../vcprojectmodel/tools/tool_constants.h"
-
-#include "configurationswidget.h"
 #include "../vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
 
+#include <utils/qtcassert.h>
+
+#include <QVBoxLayout>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h b/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h
index 49c61b9c88..ae7b78bc4c 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h
+++ b/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h
@@ -31,17 +31,18 @@
 #define VCPROJECTMANAGER_INTERNAL_CONFIGURATIONSEDITWIDGET_H
 
 #include "vcnodewidget.h"
+
 #include <QMap>
 
 namespace VcProjectManager {
 namespace Internal {
 
-class IVisualStudioProject;
+class ConfigurationContainer;
 class ConfigurationsWidget;
 class IConfiguration;
-class ConfigurationContainer;
 class IFile;
 class IFileContainer;
+class IVisualStudioProject;
 
 class ConfigurationsEditWidget : public VcNodeWidget
 {
diff --git a/src/plugins/vcprojectmanager/widgets/configurationswidget.cpp b/src/plugins/vcprojectmanager/widgets/configurationswidget.cpp
index 6ea9b058a4..acd4d42660 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationswidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/configurationswidget.cpp
@@ -27,12 +27,11 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "configurationbasewidget.h"
 #include "configurationswidget.h"
-#include "ui_configurationswidget.h"
-
 #include "newconfigitemdialog.h"
+#include "ui_configurationswidget.h"
 #include "vcenternamedialog.h"
-#include "configurationbasewidget.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/configurationswidget.h b/src/plugins/vcprojectmanager/widgets/configurationswidget.h
index a892d1a082..b30a7f67e9 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/configurationswidget.h
@@ -39,7 +39,7 @@ namespace Ui {
 class ConfigurationsWidget;
 }
 
-class ConfigurationBaseWidget;
+class VcNodeWidget;
 
 class ConfigurationsWidget : public QWidget
 {
diff --git a/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.cpp b/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.cpp
index 6c3ec3823f..9e0a06444c 100644
--- a/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.cpp
@@ -27,11 +27,9 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "configurationbasewidget.h"
+#include "configurationswidget.h"
 #include "fileconfigurationseditwidget.h"
-
-#include <QVBoxLayout>
-#include <utils/qtcassert.h>
-
 #include "../interfaces/iattributecontainer.h"
 #include "../interfaces/iattributedescriptiondataitem.h"
 #include "../interfaces/iconfiguration.h"
@@ -39,24 +37,24 @@
 #include "../interfaces/iconfigurationbuildtools.h"
 #include "../interfaces/iconfigurations.h"
 #include "../interfaces/ifile.h"
-#include "../interfaces/ifiles.h"
 #include "../interfaces/ifilecontainer.h"
+#include "../interfaces/ifiles.h"
 #include "../interfaces/iplatform.h"
 #include "../interfaces/iplatforms.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 "../interfaces/isectioncontainer.h"
 #include "../interfaces/ivisualstudioproject.h"
-
 #include "../vcprojectmodel/configurationcontainer.h"
 #include "../vcprojectmodel/tools/tool_constants.h"
 
-#include "configurationswidget.h"
-#include "configurationbasewidget.h"
+#include <utils/qtcassert.h>
+
+#include <QVBoxLayout>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.h b/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.h
index 651d8f7c10..77106ffaf5 100644
--- a/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.h
+++ b/src/plugins/vcprojectmanager/widgets/fileconfigurationseditwidget.h
@@ -30,10 +30,10 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_FILECONFIGURATIONSEDITWIDGET_H
 #define VCPROJECTMANAGER_INTERNAL_FILECONFIGURATIONSEDITWIDGET_H
 
-#include <QMap>
-
 #include "vcnodewidget.h"
 
+#include <QMap>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.cpp b/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.cpp
index b9272d0c2e..e16ea36e13 100644
--- a/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.cpp
@@ -29,13 +29,16 @@
 ****************************************************************************/
 #include "fileconfigurationsettingswidget.h"
 #include "ui_fileconfigurationsettingswidget.h"
-#include "../vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
-#include "../interfaces/itooldescription.h"
+#include "../interfaces/iattributecontainer.h"
+#include "../interfaces/iconfiguration.h"
 #include "../interfaces/iconfigurationbuildtool.h"
 #include "../interfaces/iconfigurationbuildtools.h"
-#include "../interfaces/iconfiguration.h"
+#include "../interfaces/iconfigurations.h"
+#include "../interfaces/itooldescription.h"
 #include "../interfaces/itools.h"
-#include "../interfaces/iattributecontainer.h"
+#include "../interfaces/ivisualstudioproject.h"
+#include "../vcprojectmodel/configurationcontainer.h"
+#include "../vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
 #include "../vcprojectmodel/vcprojectdocument_constants.h"
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.h b/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.h
index ba7708d213..f136609527 100644
--- a/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/fileconfigurationsettingswidget.h
@@ -30,9 +30,10 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_FILECONFIGURATIONSETTINGSWIDGET_H
 #define VCPROJECTMANAGER_INTERNAL_FILECONFIGURATIONSETTINGSWIDGET_H
 
-#include <QWidget>
 #include "vcnodewidget.h"
 
+#include <QMap>
+
 namespace VcProjectManager {
 namespace Internal {
 
@@ -41,8 +42,8 @@ class FileConfigurationSettingsWidget;
 }
 
 class IConfiguration;
-class IConfigurationBuildTool;
 class IVisualStudioProject;
+class IConfigurationBuildTool;
 
 class FileConfigurationSettingsWidget : public VcNodeWidget
 {
diff --git a/src/plugins/vcprojectmanager/widgets/projectsettingswidget.cpp b/src/plugins/vcprojectmanager/widgets/projectsettingswidget.cpp
index 2a95fc4ce6..35f00be743 100644
--- a/src/plugins/vcprojectmanager/widgets/projectsettingswidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/projectsettingswidget.cpp
@@ -30,11 +30,10 @@
 #include "projectsettingswidget.h"
 #include "ui_projectsettingswidget.h"
 
-#include <QSplitter>
 #include <QHBoxLayout>
 #include <QListWidget>
+#include <QSplitter>
 #include <QStackedWidget>
-#include <QPushButton>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/projectsettingswidget.h b/src/plugins/vcprojectmanager/widgets/projectsettingswidget.h
index 6cc89b845e..766242fb69 100644
--- a/src/plugins/vcprojectmanager/widgets/projectsettingswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/projectsettingswidget.h
@@ -30,11 +30,13 @@
 #ifndef PROJECTSETTINGSWIDGET_H
 #define PROJECTSETTINGSWIDGET_H
 
-#include <QWidget>
 #include <QIcon>
+#include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QStackedWidget;
 class QListWidget;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/schemaoptionswidget.h b/src/plugins/vcprojectmanager/widgets/schemaoptionswidget.h
index 86b03dfd39..7e909af2ff 100644
--- a/src/plugins/vcprojectmanager/widgets/schemaoptionswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/schemaoptionswidget.h
@@ -31,7 +31,6 @@
 #define VCPROJECTMANAGER_INTERNAL_SCHEMAOPTIONSWIDGET_H
 
 #include <QWidget>
-#include "vcprojectmanagerconstants.h"
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/toolschemawidget.cpp b/src/plugins/vcprojectmanager/widgets/toolschemawidget.cpp
index 2c6729d309..3ff6ba9a6e 100644
--- a/src/plugins/vcprojectmanager/widgets/toolschemawidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/toolschemawidget.cpp
@@ -29,17 +29,12 @@
 ****************************************************************************/
 #include "toolschemawidget.h"
 #include "ui_toolschemawidget.h"
+#include "../vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
+#include "../vcschemamanager.h"
 
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
 #include <QFileDialog>
-#include <QStringList>
 #include <QMessageBox>
-
-#include "../vcschemamanager.h"
-#include "../vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.h"
+#include <QStringList>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/toolschemawidget.h b/src/plugins/vcprojectmanager/widgets/toolschemawidget.h
index 2936e598ca..f30dcfdefe 100644
--- a/src/plugins/vcprojectmanager/widgets/toolschemawidget.h
+++ b/src/plugins/vcprojectmanager/widgets/toolschemawidget.h
@@ -30,14 +30,8 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_TOOLSCHEMAWIDGET_H
 #define VCPROJECTMANAGER_INTERNAL_TOOLSCHEMAWIDGET_H
 
-#include <QWidget>
 #include <QTableWidgetItem>
 
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QVBoxLayout;
-
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.cpp b/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.cpp
index 6b5c13dca6..086799d7d8 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.cpp
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.cpp
@@ -28,14 +28,13 @@
 **
 ****************************************************************************/
 #include "booltoolattributesettingsitem.h"
+#include "../../interfaces/iattributedescriptiondataitem.h"
+#include "../../vcprojectmodel/tools/toolattributes/booltoolattribute.h"
+#include "../../vcprojectmodel/tools/toolattributes/toolattributeoption.h"
 
 #include <QComboBox>
 #include <QVBoxLayout>
 
-#include "../../vcprojectmodel/tools/toolattributes/booltoolattribute.h"
-#include "../../vcprojectmodel/tools/toolattributes/toolattributeoption.h"
-#include "interfaces/iattributedescriptiondataitem.h"
-
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.h b/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.h
index 50292990d8..a1bb8ca511 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.h
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/booltoolattributesettingsitem.h
@@ -32,7 +32,9 @@
 
 #include "itoolattributesettingswidget.h"
 
+QT_BEGIN_NAMESPACE
 class QComboBox;
+QT_END_NAMESPACE
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/integertoolattributesettingsitem.cpp b/src/plugins/vcprojectmanager/widgets/toolwidgets/integertoolattributesettingsitem.cpp
index 6a2759e9b2..f310ac93ab 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/integertoolattributesettingsitem.cpp
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/integertoolattributesettingsitem.cpp
@@ -28,11 +28,12 @@
 **
 ****************************************************************************/
 #include "integertoolattributesettingsitem.h"
+#include "../../interfaces/iattributedescriptiondataitem.h"
 #include "../../vcprojectmodel/tools/toolattributes/integertoolattribute.h"
 #include "../../vcprojectmodel/tools/toolattributes/toolattributeoption.h"
-#include "interfaces/iattributedescriptiondataitem.h"
 
 #include <QComboBox>
+#include <QSpinBox>
 #include <QVBoxLayout>
 
 namespace VcProjectManager {
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.cpp b/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.cpp
index 0972743596..3ad96cfc0b 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.cpp
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.cpp
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 #include "stringlisttoolattributesettingsitem.h"
-#include "../lineedit.h"
 #include "../../vcprojectmodel/tools/toolattributes/stringlisttoolattribute.h"
+#include "../lineedit.h"
 
 #include <QVBoxLayout>
 
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.h b/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.h
index 2cc4e7848a..850b89afd3 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.h
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/stringlisttoolattributesettingsitem.h
@@ -31,7 +31,6 @@
 #define VCPROJECTMANAGER_INTERNAL_STRINGLISTTOOLATTRIBUTEWIDGET_H
 
 #include "itoolattributesettingswidget.h"
-#include <QString>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/stringtoolattributesettingsitem.cpp b/src/plugins/vcprojectmanager/widgets/toolwidgets/stringtoolattributesettingsitem.cpp
index 1580a5dc0e..3b9d5c0c06 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/stringtoolattributesettingsitem.cpp
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/stringtoolattributesettingsitem.cpp
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 #include "stringtoolattributesettingsitem.h"
-#include "../lineedit.h"
 #include "../../vcprojectmodel/tools/toolattributes/stringtoolattribute.h"
+#include "../lineedit.h"
 
 #include <QVBoxLayout>
 
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.cpp b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.cpp
index 04f8bbc86b..ae3d2f08ba 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.cpp
@@ -27,12 +27,12 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "toolsectionsettingswidget.h"
 #include "itoolattributesettingswidget.h"
-#include "../../vcprojectmodel/tools/toolsection.h"
-#include "../../interfaces/itoolattribute.h"
+#include "toolsectionsettingswidget.h"
 #include "../../interfaces/iattributedescriptiondataitem.h"
+#include "../../interfaces/itoolattribute.h"
 #include "../../interfaces/itoolattributecontainer.h"
+#include "../../vcprojectmodel/tools/toolsection.h"
 #include "../basicconfigurationwidget.h"
 
 #include <QVBoxLayout>
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h
index a54a86524f..0770dea695 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h
@@ -30,11 +30,10 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_TOOLSECTIONSETTINGSWIDGET_H
 #define VCPROJECTMANAGER_INTERNAL_TOOLSECTIONSETTINGSWIDGET_H
 
-#include <QList>
-#include <QWidget>
-
 #include "../vcnodewidget.h"
 
+#include <QList>
+
 namespace VcProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp
index 5971401013..29bdd6a571 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp
@@ -27,13 +27,12 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+#include "toolsectionsettingswidget.h"
 #include "toolsettingswidget.h"
-
+#include "../../interfaces/isectioncontainer.h"
+#include "../../interfaces/itoolsection.h"
 #include "../../vcprojectmodel/tools/configurationtool.h"
 #include "../../vcprojectmodel/tools/toolsectiondescription.h"
-#include "../../interfaces/itoolsection.h"
-#include "../../interfaces/isectioncontainer.h"
-#include "toolsectionsettingswidget.h"
 
 #include <QTableWidget>
 #include <QVBoxLayout>
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h
index e05a28f5eb..8a3caf0055 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h
@@ -30,14 +30,12 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_TOOLSETTINGSWIDGET_H
 #define VCPROJECTMANAGER_INTERNAL_TOOLSETTINGSWIDGET_H
 
-#include <QWidget>
 #include "../vcnodewidget.h"
 
 namespace VcProjectManager {
 namespace Internal {
 
 class ConfigurationTool;
-class ToolSectionSettingsWidget;
 
 class ToolSettingsWidget : public VcNodeWidget
 {
diff --git a/src/plugins/vcprojectmanager/widgets/vcenternamedialog.cpp b/src/plugins/vcprojectmanager/widgets/vcenternamedialog.cpp
index 05c7db35fc..dde66f6003 100644
--- a/src/plugins/vcprojectmanager/widgets/vcenternamedialog.cpp
+++ b/src/plugins/vcprojectmanager/widgets/vcenternamedialog.cpp
@@ -27,11 +27,10 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
-#include "vcenternamedialog.h"
 #include "ui_vcenternamewidget.h"
+#include "vcenternamedialog.h"
 
 #include <QMessageBox>
-#include <QPushButton>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp
index ebf2a2ef2a..1e32ab5ab2 100644
--- a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp
@@ -28,13 +28,10 @@
 **
 ****************************************************************************/
 #include "vcprojectkitconfigwidget.h"
-
-#include <QComboBox>
-#include <projectexplorer/kit.h>
-
 #include "../msbuildversionmanager.h"
 #include "../vcprojectkitinformation.h"
-#include "../vcprojectmanagerconstants.h"
+
+#include <QComboBox>
 
 namespace VcProjectManager {
 namespace Internal {
diff --git a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h
index 9c0f641a18..cc292a9b6c 100644
--- a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h
+++ b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h
@@ -30,8 +30,8 @@
 #ifndef VCPROJECTMANAGER_INTERNAL_VCPROJECTKITCONFIGWIDGET_H
 #define VCPROJECTMANAGER_INTERNAL_VCPROJECTKITCONFIGWIDGET_H
 
-#include <projectexplorer/kitconfigwidget.h>
 #include <coreplugin/id.h>
+#include <projectexplorer/kitconfigwidget.h>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
author	Radovan Zivkovic <pivonroll@gmail.com>	2014-05-22 02:42:30 +0200
committer	Radovan Zivkovic <pivonroll@gmail.com>	2014-05-25 10:25:41 +0200
commit	5232f29157513ff2cb5b0fb0b6179604650053f2 (patch)
tree	0b75b5d6f9abd21295c0e3a93dee988644c19f78
parent	88c3d00e01cb52b3075b510ee240afe6b76e1615 (diff)
download	qt-creator-5232f29157513ff2cb5b0fb0b6179604650053f2.tar.gz