diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
index e182b5db9cfc2b5f2c678df91727a753909caf1d..0ed61fcf9c1321203ddb9a919141da0a3413ba5a 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
@@ -29,7 +29,6 @@
 
 #include "abstractformeditortool.h"
 #include "formeditorview.h"
-#include "formeditorview.h"
 
 #include <modelnodecontextmenu.h>
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
index 4d0c919fe019061329e3da351f57fef07c226bb0..0d2fafc4e600854b8e05e87a9faf12c44aa30dcc 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
@@ -51,7 +51,6 @@
 #include "formeditornodeinstanceview.h"
 
 #include "resizehandleitem.h"
-#include <QDebug>
 
 
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index d7559a898235fda67b237a9ac3322b18d18059e9..699df557eb1eae36bf9216e5112055ed76b86d17 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 
+#include "formeditorview.h"
 #include "selectiontool.h"
 #include "movetool.h"
 #include "resizetool.h"
 #include "dragtool.h"
-#include "formeditorview.h"
 #include "formeditorwidget.h"
 #include "formeditornodeinstanceview.h"
 #include "formeditoritem.h"
diff --git a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp
index 38b8c58e217a7c314cce3f0417aa62b0245f6bbf..c1857a28c1a0d960ca0bdf7a2d21aef97583447d 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp
@@ -33,7 +33,6 @@
 #include <QGraphicsScene>
 #include <QDebug>
 #include <cmath>
-#include <QGraphicsScene>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index a1c7db09729a17cd8244ffcf5d3923647a2baa8a..0f3e84f7c74b10bf4519759c472bded10867fd52 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -43,7 +43,6 @@
 #include <rewritingexception.h>
 #include <nodelistproperty.h>
 #include <variantproperty.h>
-#include <rewritingexception.h>
 #include <modelnodeoperations.h>
 #include <qmldesignerplugin.h>
 #include <viewmanager.h>
diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
index 6d86f46685753e8d0a43d9fff15f72bc2a698b35..a6d66434a92b24e71f9b38901bc1be7811f78d49 100644
--- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
@@ -27,10 +27,11 @@
 **
 ****************************************************************************/
 
+#include "stackedutilitypanelcontroller.h"
+#include "designdocument.h"
+
 #include <QStackedWidget>
 
-#include "designdocument.h"
-#include "stackedutilitypanelcontroller.h"
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
index 969532fa9fc1685ec67d4ad4699b9a2e13006004..25a27f32222fe96de18bc4e830b72a798cca9da1 100644
--- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
@@ -32,6 +32,8 @@
 
 #include "utilitypanelcontroller.h"
 
+class QStackedWidget;
+
 namespace QmlDesigner {
 
 class DesignDocument;
diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
index 3e1c43e7e9f8ce04e4f5630c42e572884357e4ae..b898473f1432ac6c2fc23c39ac7ae264e1bf4395 100644
--- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
@@ -27,14 +27,14 @@
 **
 ****************************************************************************/
 
+#include "utilitypanelcontroller.h"
+
 #include <QDebug>
 #include <QEvent>
 #include <QDockWidget>
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "utilitypanelcontroller.h"
-
 namespace QmlDesigner {
 
 UtilityPanelController::UtilityPanelController(QObject* parent):
diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
index 3fed00cd855cc701b19ae6b861d3958dba9a0aa6..f761c9e9ffb17133825d02694ea66979caa123e8 100644
--- a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
+++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
@@ -27,6 +27,7 @@
 **
 ****************************************************************************/
 
+#include "xuifiledialog.h"
 #include <utils/hostosinfo.h>
 
 #include <QDebug>
@@ -34,8 +35,6 @@
 #include <QObject>
 #include <QCoreApplication>
 
-#include "xuifiledialog.h"
-
 namespace QmlDesigner {
 
 void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObject* receiver, const char* member)
diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
index b178ee218c79c2f8a0c259ec58db3ae3a41bc4a0..6666c99ee265f5afe3a37d109ed167f7e31bfb63 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
@@ -27,6 +27,9 @@
 **
 ****************************************************************************/
 
+#ifndef CUSTOMDRAGANDDROP_H
+#define CUSTOMDRAGANDDROP_H
+
 #include <QPixmap>
 #include <QLabel>
 #include <QTimeLine>
@@ -140,3 +143,5 @@ private:
     };
 
 } //namespave QmlDesigner
+
+#endif // CUSTOMDRAGANDDROP_H
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
index dda1e02bce9c6460cbb8ae0dcbe6afda843c4b14..8990ddd131d7eaae77419524a15c393a2ae483eb 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ITEMLIBRARYTREEVIEW_H
-#define ITEMLIBRARYTREEVIEW_H
+#ifndef ITEMLIBRARYCOMPONENTS_H
+#define ITEMLIBRARYCOMPONENTS_H
 
 #include <QTreeView>
 #include <QStandardItemModel>
@@ -90,5 +90,5 @@ private:
 
 } // namespace QmlDesigner
 
-#endif // ITEMLIBRARYTREEVIEW_H
+#endif // ITEMLIBRARYCOMPONENTS_H
 
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 266e9f1b07076db128c443d82de873cca395b213..3f74c08aa43ddfec008d7f4513aecc52ad76c380 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -27,14 +27,14 @@
 **
 ****************************************************************************/
 
+#include "navigatorwidget.h"
+#include "navigatorview.h"
+
 #include <QBoxLayout>
 #include <QTreeView>
 #include <QHeaderView>
 #include <model.h>
 
-#include "navigatorwidget.h"
-#include "navigatorview.h"
-
 #include <utils/fileutils.h>
 
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 0b4e1ad60c9784328838deaa9e901519be26f036..8edda671603f3eb33cd98ad9c1a98d6e6855ea9e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -41,7 +41,6 @@
 #include <QMenu>
 #include <QAction>
 #include <QListView>
-#include <QDebug>
 #include <QApplication>
 #include <QGraphicsOpacityEffect>
 #include <QStyleFactory>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
index b85e7958c23e16b3211c65f136e168d853b1ba8e..2a8e706160c6d7287002b1a667ae99065cd97acc 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
@@ -33,7 +33,6 @@
 #include <nodeproperty.h>
 #include <variantproperty.h>
 #include <bindingproperty.h>
-#include <nodeproperty.h>
 
 #include <QLineEdit>
 #include <QSpinBox>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
index d83561c38e8887e81d614d59e40c42ad5ac7c60b..e3daa1981ab30c91da75a9046d1eee0d03dc6f54 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
@@ -34,7 +34,6 @@
 #include <QFontDialog>
 #include <QApplication>
 #include <QComboBox>
-#include <QLabel>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp
index 5f54b981cdd93756b10fe412e91dd8c6cee1cfb6..d965619416769a3b2bdf0fd728ff392a7e7f990f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "genericpropertieswidget.h"
+
 #include <QSet>
 #include <QDebug>
 #include <QWidget>
@@ -37,7 +39,6 @@
 #include "qttreepropertybrowser.h"
 #include "qtvariantproperty.h"
 
-#include "genericpropertieswidget.h"
 #include "nodemetainfo.h"
 #include "propertymetainfo.h"
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h
index add3e3b67b0698de47cf138af604ef4d20fc76cd..2b7de840e74d243749c58656c1dda82d1f076738 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/genericpropertieswidget.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef PropertyView_h
-#define PropertyView_h
+#ifndef GENERICPROPERTIESWIDGET_H
+#define GENERICPROPERTIESWIDGET_H
 
 #include <QTabWidget>
 
@@ -93,4 +93,4 @@ private:
 
 }
 
-#endif // PropertyView_h
+#endif // GENERICPROPERTIESWIDGET_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 899346e59d2445dcde6c450e7f94265527f4f655..bbda3db6a56b443331095993eb8b6b97812be403 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QmlPropertyView_h
-#define QmlPropertyView_h
+#ifndef PROPERTYEDITOR_H
+#define PROPERTYEDITOR_H
 
 #include <qmlmodelview.h>
 #include <declarativewidgetview.h>
@@ -167,4 +167,4 @@ protected:
 };
 }
 
-#endif // QmlPropertyView_h
+#endif // PROPERTYEDITOR_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 92d9fe1b617efc24b7ac3f61049fcf59c939006d..a4adf32240f452ea0dd1ab6f0f0783adfe6511ed 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -36,7 +36,6 @@
 #include <model.h>
 #include <nodemetainfo.h>
 #include <metainfo.h>
-#include <nodeproperty.h>
 #include <qmlobjectnode.h>
 
 //using namespace QmlDesigner;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
index 857c3ccb97e43e0aa2d989cb5d8eb122e2e350ae..56f9e96017e125003765c663c987a793e962277e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 
-#include "qdeclarative.h"
 #include "resetwidget.h"
+#include "qdeclarative.h"
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QStringList>
diff --git a/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp b/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp
index 9fe318cb44d3098be433dd0dbd5ba13037f3775d..264016ffd683e4290a34b61e1fa92c8ebd338949 100644
--- a/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp
+++ b/src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp
@@ -27,9 +27,10 @@
 **
 ****************************************************************************/
 
-#include <QCoreApplication>
 #include "invalididexception.h"
 
+#include <QCoreApplication>
+
 namespace QmlDesigner {
 
 InvalidIdException::InvalidIdException(int line,
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
index 74bf4ba42a23e533b65b17bae281ecd7882dac31..f7fa85301e743615c57e95f5a04cff76838d7fac 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
@@ -27,10 +27,11 @@
 **
 ****************************************************************************/
 
+#include "changeimportsvisitor.h"
+
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljsengine_p.h>
 
-#include "changeimportsvisitor.h"
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp
index 0c35d008d9a6ea5c0de82fc82869415fac5d06ce..a5646cdd02d4a1f0c3084d1252cc65776e6841c1 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "qmlrefactoring.h"
+
 #include <QDebug>
 
 #include "addarraymembervisitor.h"
@@ -37,7 +39,6 @@
 #include "changepropertyvisitor.h"
 #include "moveobjectvisitor.h"
 #include "moveobjectbeforeobjectvisitor.h"
-#include "qmlrefactoring.h"
 #include "removepropertyvisitor.h"
 #include "removeuiobjectmembervisitor.h"
 
diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
index b26f07e82997bc04c616817f4df2b0eae90e308b..36a993d538f8ec504d07101204ceb1e635921db2 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ABSTRACTROPERTY_H
-#define ABSTRACTROPERTY_H
+#ifndef ABSTRACTPROPERTY_H
+#define ABSTRACTPROPERTY_H
 
 #include <QVariant>
 #include <QWeakPointer>
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index a2a3ff645e0cde5da5f6c14671b8c828c70c0d87..ed322f49d9229315b1303723a0b27c8e5fc58da0 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DESIGNERNODE_H
-#define DESIGNERNODE_H
+#ifndef MODELNODE_H
+#define MODELNODE_H
 
 #include "qmldesignercorelib_global.h"
 #include <QWeakPointer>
@@ -203,4 +203,4 @@ QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const ModelN
 Q_DECLARE_METATYPE(QmlDesigner::ModelNode)
 Q_DECLARE_METATYPE(QList<QmlDesigner::ModelNode>)
 
-#endif // DESIGNERNODE_H
+#endif // MODELNODE_H
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
index 5576c291c69d467c57a2c51e75b1064ced5698b0..6c40a452b09ddeb85a26dbe70ff7fb690683b5ce 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FXMODELNODEFACADE_H
-#define FXMODELNODEFACADE_H
+#ifndef QMLMODELNODEFACADE_H
+#define QMLMODELNODEFACADE_H
 
 #include <qmldesignercorelib_global.h>
 #include <modelnode.h>
@@ -58,4 +58,4 @@ private:
 
 } //QmlDesigner
 
-#endif // FXMODELNODEFACADE_H
+#endif // QMLMODELNODEFACADE_H
diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
index 694e91eb0381d2731ac705a2497b889529973647..552b5b1fb2eded067c2876e99d97e141701a39af 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FXOBJECTNODE_H
-#define FXOBJECTNODE_H
+#ifndef QMLOBJECTNODE_H
+#define QMLOBJECTNODE_H
 
 #include <qmldesignercorelib_global.h>
 #include "qmlmodelnodefacade.h"
@@ -111,4 +111,4 @@ QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlObjectNod
 QMLDESIGNERCORE_EXPORT QList<QmlObjectNode> toQmlObjectNodeList(const QList<ModelNode> &modelNodeList);
 }// QmlDesigner
 
-#endif // FXOBJECTNODE_H
+#endif // QMLOBJECTNODE_H
diff --git a/src/plugins/qmldesigner/designercore/include/qmlstate.h b/src/plugins/qmldesigner/designercore/include/qmlstate.h
index f66087593ba31091f6ab9cac06ef412de2a294c3..2831011c42d08f525dfa612331de5c2079e146b9 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlstate.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlstate.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FXSTATE_H
-#define FXSTATE_H
+#ifndef QMLSTATE_H
+#define QMLSTATE_H
 
 #include <qmldesignercorelib_global.h>
 #include "qmlmodelnodefacade.h"
@@ -79,4 +79,4 @@ protected:
 } //QmlDesigner
 
 
-#endif // FXSTATE_H
+#endif // QMLSTATE_H
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index d437e81fb751cea522bce0c62c8ce6b27fc88cdc..8c70c4c8929ea1911fc632e973a798554c532698 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -38,7 +38,6 @@
 #include <QMap>
 #include <QPointer>
 #include <QWeakPointer>
-#include <QHash>
 #include <QUrl>
 
 #include <modelnode.h>
diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h
index 72d115c4edf69a88da6e397c9bf49217da8403e9..f507f45214e545ce5ecb9d7e58ca2150be84f17e 100644
--- a/src/plugins/qmldesigner/designercore/include/variantproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef VARIANTROPERTY_H
-#define VARIANTROPERTY_H
+#ifndef VARIANTPROPERTY_H
+#define VARIANTPROPERTY_H
 
 #include "qmldesignercorelib_global.h"
 #include "abstractproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 9d6a23e21d3c3580b07e167d8df34e3ff56d75b4..fbfc3fce8d2755389d60492b67e4484983b0105d 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -32,7 +32,6 @@
 #include "invalidargumentexception.h"
 
 #include "metainfo.h"
-#include <model.h>
 #include <rewriterview.h>
 #include <propertyparser.h>
 
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index d6ac8467a682fc07967a350b7e73a3c38e3e9861..9360f4fdfc89cd8c28cae9cb2e2ccbd56cd33a22 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -27,9 +27,10 @@
 **
 ****************************************************************************/
 
+#include "subcomponentmanager.h"
+
 #include <qmldesignerconstants.h>
 
-#include "subcomponentmanager.h"
 #include "model.h"
 #include "metainfo.h"
 #include "metainforeader.h"
diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
index 6889527ce2273b27019d29647acbd7f135471dcd..376102df472651b9284eb4f8c2eb7b17df1bf247 100644
--- a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
+++ b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
@@ -27,12 +27,12 @@
 **
 ****************************************************************************/
 
-#include <QBuffer>
-#include <QDataStream>
-
 #include "copyhelper.h"
 #include "internalnode_p.h"
 
+#include <QBuffer>
+#include <QDataStream>
+
 namespace QmlDesigner {
 namespace Internal {
 
diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp
index c8eda5539677f37895857b853dfcabcf81615be3..c49800123f9df3cabc601eb52222631e3ee1966b 100644
--- a/src/plugins/qmldesigner/designercore/model/import.cpp
+++ b/src/plugins/qmldesigner/designercore/model/import.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#include <QHash>
-
 #include "import.h"
 
+#include <QHash>
+
 namespace QmlDesigner {
 
 Import Import::createLibraryImport(const QString &url, const QString &version, const QString &alias, const QStringList &importPaths)
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 3f2c6047dbb53c36a22a528d3dff82360583bf0f..eb32bf1b904d0212af3904439393e9275dd1272f 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -27,7 +27,8 @@
 **
 ****************************************************************************/
 
-#include <model.h>
+#include "model.h"
+#include "model_p.h"
 #include <modelnode.h>
 #include "internalnode_p.h"
 #include "invalidpropertyexception.h"
@@ -48,7 +49,6 @@
 #include "nodeinstanceview.h"
 #include "metainfo.h"
 #include "nodemetainfo.h"
-#include "model_p.h"
 #include "subcomponentmanager.h"
 #include "internalproperty.h"
 #include "internalnodelistproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index c72a330f77cf19cad1ccd9f3d6328a45f9f8ef9b..cac03fa4b6b76ed32c38ae4f081771f3edccb9f0 100644
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -29,7 +29,6 @@
 
 #include "modelmerger.h"
 
-#include "modelmerger.h"
 #include "modelnode.h"
 #include "abstractview.h"
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index b79f4ec26a70379c6c7fb4cfa450fe57223ef1e2..1266241b12455818b462b9950f2da1fa068c1030 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <modelnode.h>
+#include "modelnode.h"
 #include <abstractproperty.h>
 #include <abstractview.h>
 #include <model.h>
@@ -42,8 +42,6 @@
 #include "invalidpropertyexception.h"
 #include "invalidslideindexexception.h"
 #include "model_p.h"
-#include "abstractview.h"
-#include "abstractproperty.h"
 #include "variantproperty.h"
 #include "bindingproperty.h"
 #include "nodeabstractproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp
index f70fa15ecf2733060c009c7c906c9524b8fb034b..2a3591d1cf13a7aa5ad9e26bec5a9a6711a97880 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp
@@ -27,9 +27,10 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
 #include "modelnodepositionrecalculator.h"
 
+#include <QDebug>
+
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
 
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
index 3dfcf5f0612e5f7cd226d40f5f4bde2789fbde86..451c27dee64f8b54331f8d9816454beb7845c2a8 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "invalidmodelnodeexception.h"
 #include "modelnodepositionstorage.h"
+#include "invalidmodelnodeexception.h"
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp b/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp
index f51239ebcf92ffb3f835534b7842868d7381f03b..a4ad2ff8186ccb7bf266c416f25b175c7b13da77 100644
--- a/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelrewriter.cpp
@@ -27,13 +27,13 @@
 **
 ****************************************************************************/
 
+#include "modelrewriter.h"
 #include <QCoreApplication>
 
 #include "copyhelper.h"
 #include "invalidmodelnodeexception.h"
 #include "invalidpropertyexception.h"
 #include "internalnode_p.h"
-#include "modelrewriter.h"
 #include "modificationgroupexception.h"
 #include "nodeproperty.h"
 #include "paster.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
index 8c97a2211e9ec2e98c572522118c3f55800cf7eb..511ea6c44e3339e0b3ac1bb1e17f5f3b09ddd197 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "modelnodepositionrecalculator.h"
 #include "modeltotextmerger.h"
+#include "modelnodepositionrecalculator.h"
 #include "qmltextgenerator.h"
 #include "rewriteactioncompressor.h"
 #include "rewriterview.h"
diff --git a/src/plugins/qmldesigner/designercore/model/paster.cpp b/src/plugins/qmldesigner/designercore/model/paster.cpp
index 17c2fb47941670a41cc966f7267cde06cb073193..d2a2ee0afedb2a0c5ecd89a56b9cc5fe122b2cb3 100644
--- a/src/plugins/qmldesigner/designercore/model/paster.cpp
+++ b/src/plugins/qmldesigner/designercore/model/paster.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "paster.h"
+
 #include <QByteArray>
 #include <QDataStream>
 #include <QSet>
@@ -34,7 +36,6 @@
 #include "changeimportsvisitor.h"
 #include "copypasteutil.h"
 #include "parsedqml.h"
-#include "paster.h"
 #include "qmlrewriter.h"
 
 using namespace QmlJS;
diff --git a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
index 20297527b40b742adfa361f7ec6f189675891110..1b050d06bac6544f7f40a4268ee2a3b1a7d1863e 100644
--- a/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
+++ b/src/plugins/qmldesigner/designercore/model/propertybinding.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "invalidpropertyexception.h"
 #include "propertybinding.h"
+#include "invalidpropertyexception.h"
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index d8259a5ef23a48f99e5efc4a84fd551b3a716a9e..fa7d13737d166b2dd67de51eba3c1ca4a312df29 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -29,7 +29,6 @@
 
 #include "qmlobjectnode.h"
 #include "qmlitemnode.h"
-#include "qmlitemnode.h"
 #include "qmlstate.h"
 #include "variantproperty.h"
 #include "nodeproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
index 12fb422844704d1beec61cf7bbc6ea8f526e03e7..ebd001a29223ac680860039e128e746b3efcfe90 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
@@ -27,13 +27,14 @@
 **
 ****************************************************************************/
 
+#include "qmltextgenerator.h"
+
 #include <QVariant>
 #include <QColor>
 
 #include "bindingproperty.h"
 #include "nodeproperty.h"
 #include "nodelistproperty.h"
-#include "qmltextgenerator.h"
 #include "variantproperty.h"
 #include <nodemetainfo.h>
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
index 0bfff4195a8a30dff58ee102a4d623f31ef2f084..91875e097970fcd3668640a4d8aec5310d0da7a1 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
@@ -27,12 +27,13 @@
 **
 ****************************************************************************/
 
+#include "rewriteaction.h"
+
 #include <QDebug>
 
 #include "nodeabstractproperty.h"
 #include "nodelistproperty.h"
 #include "nodemetainfo.h"
-#include "rewriteaction.h"
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
index 608c6b9327f87e80ef959114116394cc93fec510..bce759a9461875595507a4f4a92c451aab27efb7 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
@@ -27,13 +27,14 @@
 **
 ****************************************************************************/
 
+#include "rewriteactioncompressor.h"
+
 #include <QSet>
 
 #include "modelnode.h"
 #include "nodelistproperty.h"
 #include "nodeproperty.h"
 #include "qmltextgenerator.h"
-#include "rewriteactioncompressor.h"
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index 21f79597730ed4dec705664a4a9d25ec6a063403..97e5c7a7bf935a8e140d2e32c6857279eaa9c452 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -27,6 +27,8 @@
 **
 ****************************************************************************/
 
+#include "rewriterview.h"
+
 #include <filemanager/astobjecttextextractor.h>
 #include <filemanager/objectlengthcalculator.h>
 #include <filemanager/firstdefinitionfinder.h>
@@ -34,7 +36,6 @@
 
 #include <qmljs/parser/qmljsengine_p.h>
 
-#include "rewriterview.h"
 #include "rewritingexception.h"
 #include "textmodifier.h"
 #include "texttomodelmerger.h"
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index aac9de667c142c5313c7591cbf2073b79e0f39ea..de6c4d75d8be92773eebe43b4a1c1a331bf3a664 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -27,6 +27,7 @@
 **
 ****************************************************************************/
 
+#include "texttomodelmerger.h"
 #include "abstractproperty.h"
 #include "bindingproperty.h"
 #include "filemanager/firstdefinitionfinder.h"
@@ -37,7 +38,6 @@
 #include "nodeproperty.h"
 #include "propertyparser.h"
 #include "textmodifier.h"
-#include "texttomodelmerger.h"
 #include "rewriterview.h"
 #include "variantproperty.h"
 #include "nodemetainfo.h"
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index ef62c1407363e473ec9a309bfde0cafc5080d440..9853772cac322a20040ad33f2441ebf57ca12dcd 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLDESIGNERPLUGIN_CONSTANTS_H
-#define QMLDESIGNERPLUGIN_CONSTANTS_H
+#ifndef QMLDESIGNERCONSTANTS_H
+#define QMLDESIGNERCONSTANTS_H
 
 namespace QmlDesigner {
 namespace Constants {
@@ -75,4 +75,4 @@ namespace Internal {
 } // Constants
 } // QmlDesigner
 
-#endif //QMLDESIGNERPLUGIN_CONSTANTS_H
+#endif //QMLDESIGNERCONSTANTS_H
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index d7908fd28d18c0f46d1774b02035f9e1395ae4fe..552654600738c5dc74da04ce8e9c6f7179ca2e74 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "exception.h"
 #include "qmldesignerplugin.h"
+#include "exception.h"
 #include "qmldesignerconstants.h"
 #include "pluginmanager.h"
 #include "designmodewidget.h"
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 5158a8a96a174f01f7650533b34ce731e68eb9bb..0274cd7c74205ac98956444dc4ddc09820c8e793 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
+#include "settingspage.h"
 #include "designersettings.h"
 #include "qmldesignerconstants.h"
 #include "qmldesignerplugin.h"
-#include "settingspage.h"
 
 #include <qmljseditor/qmljseditorconstants.h>