diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 0c85a9753d81563fcff856f6d621172ce8e0ea20..fdc17c1483e68cd811ab8b4f44f27e4f2021d760 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -29,7 +29,6 @@
 
 #include "basicwidgets.h"
 #include <qlayoutobject.h>
-//#include <private/graphicswidgets_p.h>
 #include <QDeclarativeContext>
 #include <QDeclarativeEngine>
 #include <QDeclarativeComponent>
diff --git a/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp b/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp
index 566878b10dce1899268308d523e525a834d6fb64..d2f7658743ea7e14c8f27c017976d39b3c6373c0 100644
--- a/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp
@@ -29,7 +29,6 @@
 
 #include "dummynodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
 #include <nodemetainfo.h>
 
 #include <invalidnodeinstanceexception.h>
diff --git a/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp
index 0ab1f6be664696f0fa29fe7df405897dcf612025..aa5fdb38879a870ee142af685cde246e2b2364af 100644
--- a/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "graphicsscenenodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include "graphicsviewnodeinstance.h"
 
 #include <invalidnodeinstanceexception.h>
diff --git a/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp
index 197992ffec9a1245f1f86be318a53522dedf7e5c..866f0ca9d3a1e84dbfdd824733b5c602588cf5f3 100644
--- a/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp
@@ -29,7 +29,6 @@
 
 #include "graphicsviewnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
 #include <QDeclarativeEngine>
 #include <invalidnodeinstanceexception.h>
 
diff --git a/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp
index 68415bdd0c988680216a35f8ef6df26faae695be..de5239ec0a156c721a1b584d53bdcf42b6f51c2a 100644
--- a/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp
@@ -32,8 +32,6 @@
 
 #include "objectnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include <invalidnodeinstanceexception.h>
 #include <propertymetainfo.h>
 
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp b/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
index 48a19d019c26871b8929ca5e9b1dc064d91d564d..670a6d206510c790a586083069b202661f70b322 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp
@@ -4,7 +4,6 @@
 #include <QMetaProperty>
 #include <QMetaObject>
 #include <QtDebug>
-#include <private/qdeclarativeproperty_p.h>
 
 #include "objectnodeinstance.h"
 #include <QSharedPointer>
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
index 19c87b256856a0daf60c24b659b3882f03ebe40b..2f50d777e6ed51df97aed9c85f4d32e8eed7a772 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
@@ -29,15 +29,14 @@
 
 #include "nodeinstanceview.h"
 
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
 
 #include <QtDebug>
 #include <QUrl>
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QGraphicsObject>
-#include <private/qdeclarativeengine_p.h>
 
 #include <model.h>
 #include <modelnode.h>
diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
index 7157ef0982a7b8cd2d3059f87d1ae12353773df0..70e6f26dbf94e1c3b83556ad337137f8328250d8 100644
--- a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
@@ -57,18 +57,6 @@
 #include <QSharedPointer>
 
 #include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativecontext_p.h>
-#include <private/qdeclarativelistaccessor_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include <private/qdeclarativeanchors_p.h>
-#include <private/qdeclarativerectangle_p.h> // to get QDeclarativePen
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qdeclarativevmemetaobject_p.h>
-#include <private/qdeclarativemetatype_p.h>
-#include <private/qobject_p.h>
-#include <private/qdeclarativeproperty_p.h>
-
-
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
index 6b4f2df863cb897f1372495d30adb4710c2c94c4..d403ef891908a9ba0485c605454aaad397f1ce1e 100644
--- a/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "proxywidgetnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include <QGraphicsProxyWidget>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h b/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h
index 9f7a8c5fd3a3bb184b8ff4c0802793c6e0896e0b..bc3b8f7e318072fab2a9586a9880b1a234243cc9 100644
--- a/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h
+++ b/src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h
@@ -31,7 +31,9 @@
 #define QMLSTATENODEINSTANCE_H
 
 #include "objectnodeinstance.h"
-#include <private/qdeclarativestate_p.h>
+
+class QDeclarativeState;
+class QDeclarativeStateGroup;
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp
index 72006e0c58145bbc76f1e75117b45813ba659484..516c4d6542fb6cb46d87a7314b12e985492e7055 100644
--- a/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "qmlviewnodeinstance.h"
 
-
-#include <private/qdeclarativemetatype_p.h>
 #include <QDeclarativeView>
 #include <QDeclarativeItem>
 
diff --git a/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp
index 871123574f62ca70858c104b7ffd2306d4d9bcba..ab61ee990bf669041fe0758868064104411430ed 100644
--- a/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp
@@ -29,8 +29,6 @@
 
 #include "widgetnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include "proxywidgetnodeinstance.h"
 #include <invalidnodeinstanceexception.h>
 
diff --git a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
index 15829d91adc0461a56995fe7627da74524fd8924..7a1a0f5c98c2d5eaec57dca597b9debaab345582 100644
--- a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
@@ -45,6 +45,7 @@
 #include <QtAlgorithms>
 #include <QMetaProperty>
 #include <QDeclarativeEngine>
+
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativeanchors_p.h>
 
diff --git a/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp
index 68c226d2a28867035504378afe0dd4755edfdefd..0e295a81029e7a1cb28835adbb12daead6dbf6ba 100644
--- a/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp
@@ -36,14 +36,14 @@
 #include "metainfo.h"
 #include "propertymetainfo.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QtDebug>
-#include <QtGui/QIcon>
-#include <QtDeclarative/private/qdeclarativemetatype_p.h>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <private/qdeclarativevaluetype_p.h>
+#include <QSharedData>
+#include <QtDebug>
+#include <QIcon>
+#include <QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+
+#include <private/qdeclarativemetatype_p.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
index 769a3a41ecd664d742a91fe368d26e2f34707c01..af4ba9dd55bc928045c60e5e893b73ce14250fbf 100644
--- a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
@@ -34,6 +34,7 @@
 #include "invalidmetainfoexception.h"
 #include "metainfo.h"
 #include "modelnode.h"
+
 #include <private/qdeclarativevaluetype_p.h>
 #include <private/qdeclarativestringconverters_p.h>
 
diff --git a/src/plugins/qmldesigner/core/model/propertyparser.cpp b/src/plugins/qmldesigner/core/model/propertyparser.cpp
index 50453d3ea87911986b5de7ccac56ddaa65e93f4f..91cb772786ce02bdcc5da8a09b7470b51e487a3b 100644
--- a/src/plugins/qmldesigner/core/model/propertyparser.cpp
+++ b/src/plugins/qmldesigner/core/model/propertyparser.cpp
@@ -28,12 +28,14 @@
 **************************************************************************/
 
 #include "propertyparser.h"
-#include <QUrl>
-#include <QtCore/QDebug>
-#include <QtDeclarative/private/qdeclarativestringconverters_p.h>
 #include <modelnode.h>
 #include <metainfo.h>
 
+#include <QUrl>
+#include <QDebug>
+
+#include <private/qdeclarativestringconverters_p.h>
+
 namespace QmlDesigner {
 namespace Internal {
 namespace PropertyParser {