diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 7ed695280e26c9b4309afd159e4a03860a134ab2..0facd0449451715fa8bda12abb580e94a4683714 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -29,12 +29,8 @@
 
 #include "designeractionmanager.h"
 #include "modelnodecontextmenu_helper.h"
-#include "modelnodeoperations.h"
-#include "componentcore_constants.h"
 #include <nodeproperty.h>
 
-#include <QMenu>
-
 namespace QmlDesigner {
 
 static inline QString captionForModelNode(const ModelNode &modelNode)
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h
index b8951e99baf61c6e4df7a53e0b64f35038427ef9..2b4f31ec56893b5c0be2772e919cea4c18c8116f 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h
@@ -34,8 +34,6 @@
 #include "abstractdesigneraction.h"
 #include "qmlmodelview.h"
 
-#include <QScopedPointer>
-
 namespace QmlDesigner {
 
 namespace Internal {
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp
index 909bf2bfab69654c0944da36055fe15f25e183b6..f26159ec361a7333caddd8161d56fcb1020c415c 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.cpp
@@ -31,22 +31,7 @@
 #include "modelnodecontextmenu_helper.h"
 #include "designeractionmanager.h"
 
-#include <cmath>
-#include <QApplication>
-#include <QMessageBox>
-#include <coreplugin/editormanager/editormanager.h>
-#include <nodeabstractproperty.h>
-#include <nodelistproperty.h>
-#include <nodemetainfo.h>
 #include <modelnode.h>
-#include <qmlitemnode.h>
-#include <variantproperty.h>
-#include <bindingproperty.h>
-#include <nodeproperty.h>
-#include <rewritingexception.h>
-#include <rewritertransaction.h>
-#include <designmodewidget.h>
-#include <qmlanchors.h>
 
 #include <QSet>
 
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
index a72f8becc319594aee0fd4d74b972630f5407d95..3c7d29955667c68e972505ea13d95a298e845e47 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
@@ -34,7 +34,6 @@
 #include <qmlitemnode.h>
 #include <bindingproperty.h>
 #include <nodeproperty.h>
-#include <designmodewidget.h>
 #include <qmldesignerplugin.h>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
index 81f104c56ec12ee73c3b8b0583024bbc03a9ab19..d25731495a714faaadc6e2f3b782d00168102125 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h
@@ -30,9 +30,7 @@
 #ifndef MODELNODECONTEXTMENU_HELPER_H
 #define MODELNODECONTEXTMENU_HELPER_H
 
-#include "modelnodecontextmenu.h"
 #include "modelnodeoperations.h"
-#include "designeractionmanager.h"
 #include "defaultdesigneraction.h"
 
 #include <QAction>
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index c7159094175fa81d84f43ca4abd5b0822ccbd50a..182fca25c83e6458ea0554127642d1809fc18cb7 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -31,20 +31,14 @@
 #include "modelnodecontextmenu_helper.h"
 
 #include <cmath>
-#include <QApplication>
 #include <QMessageBox>
-#include <coreplugin/editormanager/editormanager.h>
 #include <nodeabstractproperty.h>
-#include <nodelistproperty.h>
 #include <nodemetainfo.h>
 #include <modelnode.h>
 #include <qmlitemnode.h>
 #include <variantproperty.h>
-#include <bindingproperty.h>
-#include <nodeproperty.h>
 #include <rewritingexception.h>
 #include <rewritertransaction.h>
-#include <designmodewidget.h>
 #include <qmlanchors.h>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp
index b4b5906ef5349601c1f23e9db402c24d1be6b5bc..7bf56a9d638c0b73dcf528b7c16c4c155c87818d 100644
--- a/src/plugins/qmldesigner/components/debugview/debugview.cpp
+++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp
@@ -31,7 +31,6 @@
 #include "debugviewwidget.h"
 
 #include <qmldesignerplugin.h>
-#include <designersettings.h>
 
 #include <bindingproperty.h>
 #include <signalhandlerproperty.h>
diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
index ca6618f81fc50cb2b5e28eb871fc679e1f753db1..7dc1d2a93ac2889b686bb67bb3682b5ced54bb3f 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
@@ -32,12 +32,10 @@
 
 #include <modelnodecontextmenu.h>
 
-#include <coreplugin/editormanager/editormanager.h>
-
 #include <QDebug>
 #include <QGraphicsSceneDragDropEvent>
+#include <QMimeData>
 #include <nodemetainfo.h>
-#include <nodeproperty.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/controlelement.cpp b/src/plugins/qmldesigner/components/formeditor/controlelement.cpp
index a33aa0dd9b69caf759f27efcbb2b38caeb8a5e43..574d9a07176d94c4d7ab1a73825f337b70997fdf 100644
--- a/src/plugins/qmldesigner/components/formeditor/controlelement.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/controlelement.cpp
@@ -31,7 +31,6 @@
 
 #include <QGraphicsScene>
 #include <QGraphicsRectItem>
-#include <QBrush>
 #include "layeritem.h"
 #include <QDebug>
 
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
index 6bf3bd48d1954fceab276eaba780c242c886bc14..40469e3977cf929816203541a03f8804fc0091d4 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
@@ -31,17 +31,13 @@
 
 #include "formeditorscene.h"
 #include "formeditorview.h"
-#include "formeditorwidget.h"
-#include "itemutilfunctions.h"
 #include <customdraganddrop.h>
 #include <metainfo.h>
 #include <rewritingexception.h>
 
-#include "resizehandleitem.h"
-
-#include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QDebug>
+#include <QMimeData>
 #include <QMessageBox>
 #include <QTimer>
 
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h
index 50b40c860a55e1608f6c8090ba262e8d30d52469..107755bdaa0f052cd233583fb11574dd86faf47e 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.h
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h
@@ -33,9 +33,7 @@
 #include "abstractformeditortool.h"
 #include "movemanipulator.h"
 #include "selectionindicator.h"
-#include "resizeindicator.h"
 
-#include <QHash>
 #include <QObject>
 #include <QScopedPointer>
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
index c34b1d9eaadd29bdcbf5553ef15306f05807c44b..04484561dc0a2673172c5a61f6ca5338acb2f050 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp
@@ -30,11 +30,8 @@
 #include "formeditorgraphicsview.h"
 
 #include <QWheelEvent>
-#include <QApplication>
 #include <QDebug>
 
-#include <qmlanchors.h>
-
 namespace QmlDesigner {
 
 FormEditorGraphicsView::FormEditorGraphicsView(QWidget *parent) :
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
index c2c5cf3b74d344639ec45f699077008c68f2b430..dd29d41e181e0b70c328c463049dc4641361ef21 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h
@@ -31,7 +31,6 @@
 #define FORMEDITORGRAPHICSVIEW_H
 
 #include <QGraphicsView>
-#include <qmlitemnode.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
index aa1c0a533a5c5cc6b1108c35aca71aa5ff1ca331..104d277c058ac48c578880817d8a28b0008af013 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
@@ -29,24 +29,17 @@
 
 #include "formeditoritem.h"
 #include "formeditorscene.h"
-#include "formeditornodeinstanceview.h"
-#include "selectiontool.h"
 
 #include <modelnode.h>
-#include <nodemetainfo.h>
-#include <qmlanchors.h>
 
 
-#include <QGraphicsSceneMouseEvent>
 #include <QDebug>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
-#include <QGraphicsView>
 #include <QTimeLine>
 
 #include <cmath>
 
-#include <invalidmodelnodeexception.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
index 245899f1997be9b5932ef6cf611c831b8c82fc17..a3ef2a15ef93e95a084baff0333cf71909374607 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
@@ -31,12 +31,10 @@
 #include "formeditorview.h"
 #include "formeditorwidget.h"
 #include "formeditoritem.h"
-#include "movemanipulator.h"
 #include "qmldesignerplugin.h"
 #include "designersettings.h"
 
 
-#include <metainfo.h>
 #include <QGraphicsSceneDragDropEvent>
 
 #include <QEvent>
@@ -44,13 +42,9 @@
 #include <QGraphicsSceneHoverEvent>
 #include <QGraphicsView>
 
-#include <QApplication>
 #include <QDebug>
 #include <QList>
 
-#include "formeditornodeinstanceview.h"
-
-#include "resizehandleitem.h"
 
 
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index 4fdb92baa13f3f97f5e1c529c5b8629807f76f8d..ddf3caa0f5fdaf5ec3821782e2085b56194cda94 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -33,29 +33,20 @@
 #include "resizetool.h"
 #include "dragtool.h"
 #include "formeditorwidget.h"
-#include "formeditornodeinstanceview.h"
 #include "formeditoritem.h"
 #include "formeditorscene.h"
-#include "toolbox.h"
 #include "abstractcustomtool.h"
 
 #include <designmodecontext.h>
-#include <rewritertransaction.h>
 #include <modelnode.h>
-#include <itemlibraryinfo.h>
-#include <metainfo.h>
 #include <model.h>
-#include <QApplication>
 #include <QDebug>
 #include <QPair>
 #include <QString>
-#include <QDir>
-#include <QAction>
 #include <QTimer>
 #include <zoomaction.h>
 #include <nodeabstractproperty.h>
 #include <nodelistproperty.h>
-#include <commondefines.h>
 
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index 131dc97c123933cd9b8c053925c6366555f04cfa..4c2ae66711ccc4b58c03ac1fd2b173009b371b56 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -32,13 +32,8 @@
 #include "designersettings.h"
 
 #include <QWheelEvent>
-#include <cmath>
-#include <QCoreApplication>
-#include <QPushButton>
-#include <QFile>
 #include <QVBoxLayout>
 #include <QActionGroup>
-#include <QGraphicsView>
 #include <toolbox.h>
 #include <zoomaction.h>
 #include <formeditorgraphicsview.h>
diff --git a/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp b/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp
index 89025fcd4e60e8827730b9a0b14b9711e276e694..2abbbaea6c0115fbe42cb112201f138c86088bfd 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "itemutilfunctions.h"
-#include <formeditorscene.h>
 
 #include <QRectF>
 #include <QDebug>
diff --git a/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.h b/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.h
index 3e9565ca3200857c4ad2efaca49b70b1bc158e25..312dba5aca70416588925ad736cbb205c954ba0c 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.h
+++ b/src/plugins/qmldesigner/components/formeditor/itemutilfunctions.h
@@ -31,7 +31,6 @@
 #define ITEMUTILFUNCTIONS_H
 
 #include <QRectF>
-#include <QGraphicsItem>
 #include "formeditoritem.h"
 
 
diff --git a/src/plugins/qmldesigner/components/formeditor/layeritem.h b/src/plugins/qmldesigner/components/formeditor/layeritem.h
index d55328a327a2b1ed62684777ba018b2df6ca5baf..b26b93040e83e1667a162da351ccb9387eed1116 100644
--- a/src/plugins/qmldesigner/components/formeditor/layeritem.h
+++ b/src/plugins/qmldesigner/components/formeditor/layeritem.h
@@ -31,7 +31,6 @@
 #define LAYERITEM_H
 
 #include <QGraphicsObject>
-#include <QWeakPointer>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
index 0836b2054ff4f697af48ec9a8399cfd7db2c724e..a25828385620f5122689af46ef2fc52d82e5bb3c 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
@@ -28,19 +28,14 @@
 ****************************************************************************/
 
 #include "movemanipulator.h"
-#include "itemutilfunctions.h"
 #include "layeritem.h"
 #include "formeditoritem.h"
 #include "formeditorscene.h"
 
 #include <QPointF>
 #include <QDebug>
-#include <QColor>
-#include <QPen>
-#include <QApplication>
 
 #include <limits>
-#include <model.h>
 #include <qmlanchors.h>
 #include <nodemetainfo.h>
 #include <variantproperty.h>
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h
index 4e97ea4cfca15e50db460459d761626f5430ef66..00870b154b790004e9c4be311ba22528c853213b 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.h
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.h
@@ -32,12 +32,10 @@
 
 #include <QWeakPointer>
 #include <QGraphicsItem>
-#include <QGraphicsLineItem>
 #include <QHash>
 #include <QPointF>
 #include <QRectF>
 
-#include "controlelement.h"
 #include "formeditoritem.h"
 #include "rewritertransaction.h"
 #include "snapper.h"
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
index e284da2eaa1e88c2e286893d2596895de73f0a76..5bfe3498a3878fe4a18427465a36610d9e54b646 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
@@ -32,12 +32,9 @@
 #include "formeditorscene.h"
 #include "formeditorview.h"
 #include "formeditorwidget.h"
-#include "itemutilfunctions.h"
 
 #include "resizehandleitem.h"
 
-#include "nodemetainfo.h"
-
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QAction>
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h
index cd6eba9a52df286cb9a414da18f36321f9438694..2611219b60c8054d871987b887e6b332a5616573 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.h
@@ -35,8 +35,6 @@
 #include "selectionindicator.h"
 #include "resizeindicator.h"
 
-#include <QHash>
-
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp
index 407a385cf21e62978a177aceecbda9f3ec5d9bf2..c4a450e52a53a69ee39a5d92d0b0a3657ced5f2b 100644
--- a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp
@@ -29,9 +29,6 @@
 
 #include "resizehandleitem.h"
 
-#include <formeditoritem.h>
-#include <QCursor>
-
 namespace QmlDesigner {
 
 ResizeHandleItem::ResizeHandleItem(QGraphicsItem *parent, const ResizeController &resizeController)
diff --git a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp
index 162a9e5babb3658b553bb78b7a91e4927fe8416d..f4462eb82953c2e47b2773fec1be77e18bc684f3 100644
--- a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp
@@ -33,7 +33,6 @@
 #include "formeditorscene.h"
 #include "qmlanchors.h"
 #include <QDebug>
-#include <model.h>
 #include "mathutils.h"
 
 #include <limits>
diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
index e6a3478fcd75893e6432fb46386d23e3218135a2..3f4fc4808512db529cc8b4be9a3eecae1a3780a8 100644
--- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
@@ -35,7 +35,6 @@
 
 #include "resizehandleitem.h"
 
-#include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QAction>
 #include <QDebug>
diff --git a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp
index 8d3565acdfd577d47dd7cd8b43e5f936b50f7629..1a33b4e04ac15263e825fc6cc670e8405c144175 100644
--- a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp
@@ -29,7 +29,6 @@
 
 #include "rubberbandselectionmanipulator.h"
 
-#include "model.h"
 #include "formeditorscene.h"
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/formeditor/scalemanipulator.h b/src/plugins/qmldesigner/components/formeditor/scalemanipulator.h
index 47f21b98608d7e5dc488a7a33a62687fe1866c5d..263f232b7092b9a9be9576de84079b0db1c9c407 100644
--- a/src/plugins/qmldesigner/components/formeditor/scalemanipulator.h
+++ b/src/plugins/qmldesigner/components/formeditor/scalemanipulator.h
@@ -31,7 +31,6 @@
 #define SCALEMANIPULATOR_H
 
 #include <QPointF>
-#include <QList>
 
 
 
diff --git a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
index 53fd6767c45e234c70df15f2da1bb2963cbce962..16364c9dd2fa0736b4f4be4aa5dc317cfdf1698a 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp
@@ -30,11 +30,7 @@
 #include "selectionindicator.h"
 
 #include <QPen>
-#include <cmath>
 #include <QGraphicsScene>
-#include <formeditorview.h>
-#include <formeditorwidget.h>
-#include <zoomaction.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
index e1673e9ecd937b34bdc0afb7ee0bd2d4fe698988..6df144c7838e3a5cda447886b599f8687c623224 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
@@ -32,13 +32,10 @@
 #include "formeditorview.h"
 
 #include "resizehandleitem.h"
-#include "nodemetainfo.h"
 
 
-#include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QDebug>
-#include <QClipboard>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
index 8dbb782442d9d194cecbb2d2bc3910812d8dead9..464630f59efb7f3b8bb83a10f1cb514e7833b451 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
@@ -32,13 +32,11 @@
 
 
 #include "abstractformeditortool.h"
-#include "movemanipulator.h"
 #include "rubberbandselectionmanipulator.h"
 #include "singleselectionmanipulator.h"
 #include "selectionindicator.h"
 #include "resizeindicator.h"
 
-#include <QHash>
 #include <QTime>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp
index 52a3b79e4180e8c9b6ec89ed9e78dac010857b5d..fedccd62e207dc7e55ae8243f852bdfdf641f701 100644
--- a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp
@@ -29,8 +29,6 @@
 
 #include "singleselectionmanipulator.h"
 
-#include "model.h"
-#include "nodemetainfo.h"
 #include "formeditorscene.h"
 #include "formeditorview.h"
 #include <QDebug>
diff --git a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.h b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.h
index 5ee447fe3709f48622814b8002048d35ff44bf13..14369c913d849b69fd7bd7a630b58c3adad14591 100644
--- a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.h
+++ b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.h
@@ -30,7 +30,6 @@
 #ifndef SINGLESELECTIONMANIPULATOR_H
 #define SINGLESELECTIONMANIPULATOR_H
 
-#include "selectionrectangle.h"
 #include "formeditorview.h"
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/formeditor/snapper.cpp b/src/plugins/qmldesigner/components/formeditor/snapper.cpp
index 9c9f715f98662de149e1634f0ea044b4a1fd857a..ee12bb9e72202c3e242350d23cb1e5d6fd1166b8 100644
--- a/src/plugins/qmldesigner/components/formeditor/snapper.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/snapper.cpp
@@ -32,7 +32,6 @@
 #include <QDebug>
 
 #include <limits>
-#include <cmath>
 #include <QLineF>
 #include <QPen>
 #include <QApplication>
diff --git a/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp b/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp
index 2fd01092ba3c46483322446f4c5c7a4649d639b4..f0803c6c6ebbaa086534bfbe8f7dc9552d710b1c 100644
--- a/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp
@@ -29,8 +29,6 @@
 
 #include "snappinglinecreator.h"
 
-#include <QGraphicsItem>
-#include "onedimensionalcluster.h"
 #include "formeditoritem.h"
 #include "formeditorview.h"
 
diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp
index 6af1ded4b8656e032e7c90074a580dd3aa17f8f7..9d010324d18de4716de5d473202ee47c3ab61c90 100644
--- a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp
@@ -28,16 +28,11 @@
 ****************************************************************************/
 
 #include "toolbox.h"
-#include "utils/styledbar.h"
-#include "utils/crumblepath.h"
 
 #include <QToolBar>
 #include <QHBoxLayout>
-#include <QPainter>
 #include <QDebug>
-#include <QFile>
 #include <QFrame>
-#include <QVariant>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/zoomaction.cpp b/src/plugins/qmldesigner/components/formeditor/zoomaction.cpp
index d517c7a765343ad6b2abc744913b02fb34422b75..718dedfb0dcf54093a2bef0310edf955a03cfa54 100644
--- a/src/plugins/qmldesigner/components/formeditor/zoomaction.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/zoomaction.cpp
@@ -30,9 +30,6 @@
 #include "zoomaction.h"
 
 #include <QComboBox>
-#include <QLineEdit>
-#include <QEvent>
-#include <QCoreApplication>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/integration/componentaction.cpp b/src/plugins/qmldesigner/components/integration/componentaction.cpp
index ec5b72e8ed86d9a18435de426c33b22e8f6c52ad..78667b67769448ea52565bce5b02e077b90e0879 100644
--- a/src/plugins/qmldesigner/components/integration/componentaction.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentaction.cpp
@@ -32,7 +32,6 @@
 #include <QComboBox>
 #include "componentview.h"
 #include <QStandardItemModel>
-#include <qmldesignerplugin.h>
 #include <modelnode.h>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index 49fb7df80bbdee98e827835e58c6f647ac181550..346d31b7b9eff4cde7a36751f3b3a9875ddb1254 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -31,10 +31,8 @@
 #include "componentaction.h"
 #include <QDebug>
 
-#include <nodemetainfo.h>
 #include <nodeabstractproperty.h>
 #include <QStandardItemModel>
-#include <QAbstractItemView>
 
 // silence gcc warnings about unused parameters
 
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index 0f3e84f7c74b10bf4519759c472bded10867fd52..63c54a28e0e8895962e25fb457c782c4d02bd964 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -29,16 +29,8 @@
 
 #include "designdocument.h"
 #include "designdocumentview.h"
-#include "xuifiledialog.h"
-#include "componentview.h"
 
-#include <itemlibrarywidget.h>
-#include <formeditorwidget.h>
-#include <toolbox.h>
 #include <metainfo.h>
-#include <invalidargumentexception.h>
-#include <componentaction.h>
-#include <designeractionmanager.h>
 #include <qmlobjectnode.h>
 #include <rewritingexception.h>
 #include <nodelistproperty.h>
@@ -50,32 +42,15 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
-#include <qmlprojectmanager/qmlprojectrunconfiguration.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionmanager.h>
-#include <utils/crumblepath.h>
-#include <utils/fileutils.h>
 
-#include <QCoreApplication>
-#include <QDir>
-#include <QFile>
 #include <QFileInfo>
 #include <QUrl>
-#include <QProcess>
-#include <QTemporaryFile>
 #include <QDebug>
-#include <QEvent>
-
-#include <QBoxLayout>
-#include <QComboBox>
-#include <QErrorMessage>
-#include <QFileDialog>
-#include <QLabel>
-#include <QMdiArea>
-#include <QMdiSubWindow>
+
 #include <QMessageBox>
-#include <QUndoStack>
 #include <QPlainTextEdit>
 #include <QApplication>
 
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
index 4a34d31c1ef25733590139547862690063d7d860..8c44ee83431b0f3c93de57cba64b189d17b9335e 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
@@ -30,12 +30,11 @@
 #include "designdocumentview.h"
 #include <rewriterview.h>
 #include <basetexteditmodifier.h>
-#include <metainfo.h>
-#include <plaintexteditmodifier.h>
 
 #include <QApplication>
 #include <QPlainTextEdit>
 #include <QClipboard>
+#include <QMimeData>
 #include <QDebug>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
index a6d66434a92b24e71f9b38901bc1be7811f78d49..0fc1f750e10ace9e8e6a495d4ad36be93370a6df 100644
--- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "stackedutilitypanelcontroller.h"
-#include "designdocument.h"
 
 #include <QStackedWidget>
 
diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
index b898473f1432ac6c2fc23c39ac7ae264e1bf4395..f3953af9b64eaa15dac68a84da577743c3ebba3b 100644
--- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
@@ -30,9 +30,6 @@
 #include "utilitypanelcontroller.h"
 
 #include <QDebug>
-#include <QEvent>
-#include <QDockWidget>
-#include <QVBoxLayout>
 #include <QWidget>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
index b7ee0e2244e5b0868e8578079e5344486cb87d8d..74199f83ebd2c366ff30ed5887a81eb7581c16db 100644
--- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
@@ -31,8 +31,8 @@
 #define UtilityPanelController_h
 
 #include <QObject>
-#include <QString>
-#include <QWidget>
+
+QT_FORWARD_DECLARE_CLASS(QWidget)
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
index e9f988eaebfa371950c244538dee99898701f721..f5dc94a079493c89e1d9c165f316a95f75fcb531 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
@@ -31,7 +31,6 @@
 
 #include <QMimeData>
 #include <QPoint>
-#include <QLabel>
 
 #include <QMouseEvent>
 #include <QApplication>
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
index 6edca83b73a3b631b83d72b51c10adc29aeb6bd3..f1d82e66d1f43ef5011f33b4a04bd82a744cb585 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
@@ -33,12 +33,8 @@
 #include <QMimeData>
 #include <QDebug>
 
-#include <QImage>
 #include <QPixmap>
-#include <QDrag>
 #include <QPainter>
-#include <QLabel>
-#include <itemlibraryinfo.h>
 #include <QFileSystemModel>
 #include <QProxyStyle>
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
index 8990ddd131d7eaae77419524a15c393a2ae483eb..8eb1d63db622cc9801f75cb65826d7e4215a6047 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
@@ -31,11 +31,6 @@
 #define ITEMLIBRARYCOMPONENTS_H
 
 #include <QTreeView>
-#include <QStandardItemModel>
-#include <QDrag>
-#include <QDebug>
-#include <QTimeLine>
-#include <QToolButton>
 #include <QStyledItemDelegate>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index ddbbb49ffddb52c128fab70f115cfd4cc239b6e9..8b7a6964da9fdb5d731d5d202c0fe96405e4e130 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -32,7 +32,6 @@
 
 #include <QMap>
 #include <QIcon>
-#include <QVariant>
 #include <QScriptEngine>
 #include <private/qdeclarativelistmodel_p.h>
 
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index 9c36456e9d6516de9d2287c59b58e93a1bfc6b2a..f2e21cd62dad97d93204044a78c3c68b5e94a9f8 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -34,7 +34,6 @@
 #include <nodeproperty.h>
 #include <variantproperty.h>
 #include <metainfo.h>
-#include <qgraphicswidget.h>
 #include <qmlmodelview.h>
 #include <rewriterview.h>
 #include <invalididexception.h>
@@ -44,7 +43,6 @@
 #include <QMimeData>
 #include <QMessageBox>
 #include <QApplication>
-#include <QTransform>
 #include <QPointF>
 
 static inline void setScenePos(const QmlDesigner::ModelNode &modelNode,const QPointF &pos)
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
index f38f520e99315b1324695b4f7fb6e8f27396e039..497318705df845363bc1d5bf8a21ff6b59191ca3 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
@@ -33,10 +33,8 @@
 
 #include "navigatorview.h"
 #include "navigatortreemodel.h"
-#include "navigatorwidget.h"
 #include "qproxystyle.h"
 
-#include <nodeproperty.h>
 #include "metainfo.h"
 #include <QLineEdit>
 #include <QPen>
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
index b685e927159dc02438e8a9bcf64a683d3f12132c..61ee53a0837e143c9b3494dbec9c0ae286426b10 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
@@ -30,7 +30,6 @@
 #include "navigatorview.h"
 #include "navigatortreemodel.h"
 #include "navigatorwidget.h"
-#include "modelnodecontextmenu.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 3f74c08aa43ddfec008d7f4513aecc52ad76c380..820886e6b3f56567feec570ca598340764486e33 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -31,9 +31,9 @@
 #include "navigatorview.h"
 
 #include <QBoxLayout>
-#include <QTreeView>
+#include <QToolButton>
+#include <QAbstractItemModel>
 #include <QHeaderView>
-#include <model.h>
 
 #include <utils/fileutils.h>
 
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
index ebe10db01323355e8c5519aaff4cd91b6fd281c1..30800ec5e31928bac90d913f46d0616c0ed14499 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
@@ -31,11 +31,12 @@
 #define NAVIGATORWIDGET_H
 
 #include <QFrame>
-#include <QAbstractItemModel>
-#include <QToolButton>
 
 #include "navigatortreeview.h"
 
+QT_FORWARD_DECLARE_CLASS(QToolButton)
+QT_FORWARD_DECLARE_CLASS(QAbstractItemModel)
+
 namespace QmlDesigner {
 
 class Model;
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
index f663e53e50c18a86c568a1879fd07ab66f207c5b..4fb130042e585f56ae4834e34f5c6b4c38b9f21b 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
@@ -33,21 +33,14 @@
 
 #include <QCoreApplication>
 #include <QObject>
-#include <QSharedData>
 #include <QDir>
 #include <QStringList>
 #include <QDebug>
-#include <QWeakPointer>
-#include <QPluginLoader>
-#include <QFileInfo>
-#include <QLibraryInfo>
 
 #include <QStandardItemModel>
-#include <QStandardItem>
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <QDialog>
-#include <QLabel>
 #include <QDialogButtonBox>
 
 enum { debug = 0 };
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
index 2d7398336711f1aebdde817ccb2f5f043ec503a2..5bcfc90c5d4b3da86f61b0146097cd5fc9fe849d 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
@@ -32,13 +32,12 @@
 
 #include <iplugin.h>
 #include <QLibrary>
-#include <QWeakPointer>
 #include <QPluginLoader>
 #include <QFileInfo>
-#include <QLibraryInfo>
 #include <QCoreApplication>
+#include <QStandardItem>
+
 #include <QObject>
-#include <QSharedData>
 #include <QDebug>
 
 enum { debug = 1 };
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h
index 0678f0460c442f24f14c3c606125c05d6eb2c3b6..f28b94785e32073359b3ac7b1abada392ed33c83 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h
@@ -34,11 +34,11 @@
 #include <QWeakPointer>
 #include <QList>
 #include <QDir>
-#include <QStandardItem>
 
 QT_BEGIN_NAMESPACE
 class QString;
 class QAbstractItemModel;
+class QStandardItem;
 QT_END_NAMESPACE
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
index 9b073818ed78a8b98c272e3e536e644b71900d1c..d4af8b4524b4ae339da443db53e790bd60b0cfc2 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
@@ -31,7 +31,6 @@
 #define BASICLAYOUTS_H
 
 #include <qlayoutobject.h>
-#include <QHBoxLayout>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 8edda671603f3eb33cd98ad9c1a98d6e6855ea9e..ffc61704c9ad29f99af2f23625541da1762f8b42 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -31,7 +31,6 @@
 #include <utils/fileutils.h>
 #include <qlayoutobject.h>
 #include <QDeclarativeContext>
-#include <QDeclarativeEngine>
 #include <QDeclarativeComponent>
 #include <QDebug>
 #include <QFile>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
index 9800f0c97d5158d0689c26cbc5075ddcab95df6f..b4454acf9417d2842892d28305f0f2f5f38defe0 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
@@ -31,7 +31,6 @@
 #define BASICWIDGETS_H
 
 #include <qdeclarative.h>
-#include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QLabel>
 #include <QPushButton>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
index 2a8e706160c6d7287002b1a667ae99065cd97acc..b26f2e9bd9c750b4e5ad0377f26ba8dfd6b89a4c 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
@@ -34,9 +34,6 @@
 #include <variantproperty.h>
 #include <bindingproperty.h>
 
-#include <QLineEdit>
-#include <QSpinBox>
-
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
index 35b9f8eeac699889e4901547e757647c6e8eaa77..26151d8f7e4c231e1bff661e78864ce764676cec 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
@@ -35,9 +35,7 @@
 
 #include <QPushButton>
 #include <QDialog>
-#include <QWeakPointer>
 #include <QScopedPointer>
-#include <qdeclarative.h>
 
 #include "ui_behaviordialog.h"
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/declarativewidgetview.cpp b/src/plugins/qmldesigner/components/propertyeditor/declarativewidgetview.cpp
index aa92166b92d0f065ebe580c492efd50de5f64c27..9db2ce5ac67e53cfa03e8806d5a1005e44fe6985 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/declarativewidgetview.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/declarativewidgetview.cpp
@@ -29,11 +29,9 @@
 
 #include "declarativewidgetview.h"
 
-#include <qdeclarative.h>
 #include <QDeclarativeItem>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
-#include <QPointer>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp
index d31ba06288095170cc99fb92b04f5c00fa7a78a6..ad53a1c16f9c75f5049c57844b393a2c67935928 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp
@@ -29,7 +29,6 @@
 
 #include "filewidget.h"
 #include <QHBoxLayout>
-#include <QFont>
 #include <QFileDialog>
 #include <QDirIterator>
 #include <QDebug>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/filewidget.h b/src/plugins/qmldesigner/components/propertyeditor/filewidget.h
index 3df6dcd212dc40784d95076da3a3d5ab82ca4cf7..6c48c2fb1a86f1b12ce25c27f8f5e68af6768bc2 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/filewidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/filewidget.h
@@ -32,7 +32,6 @@
 #define FILEWIDGET_H
 
 #include <QWidget>
-#include <QLabel>
 #include <QToolButton>
 #include <QLineEdit>
 #include <QComboBox>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
index e3daa1981ab30c91da75a9046d1eee0d03dc6f54..d7b08da2db7254be871051cffe37c2de7dfbc3fc 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp
@@ -32,7 +32,6 @@
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QFontDialog>
-#include <QApplication>
 #include <QComboBox>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.h b/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.h
index f8f36d023abe5c69c8eb63d00e3915febb45427a..237bfff72962a3b6afd732a8b9a448365026b16d 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.h
@@ -31,7 +31,6 @@
 #define GRADIENTLINEQMLADAPTOR_H
 
 #include <qmleditorwidgets/gradientline.h>
-#include <propertyeditorvalue.h>
 #include <qmlitemnode.h>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h b/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h
index 200d21a81a96cce394c9059e0d2cc7613c8d965e..10288c4ea291fab537c07d92f2b7fbc55607d794 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h
@@ -32,7 +32,6 @@
 #define LAYOUTWIDGET_H
 
 #include <QFrame>
-#include <QLabel>
 #include <QPushButton>
 #include <QUrl>
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index d4329cc674560e709548619586463cc4f6227797..d6b6d952ed71228b540cd68529ea0b0e28e135b7 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -32,7 +32,6 @@
 #include <qmldesignerconstants.h>
 
 #include <nodemetainfo.h>
-#include <metainfo.h>
 
 #include <invalididexception.h>
 #include <rewritingexception.h>
@@ -65,16 +64,10 @@
 #include <QFileInfo>
 #include <QDebug>
 #include <QTimer>
-#include <QDeclarativeView>
 #include <QDeclarativeContext>
-#include <QVBoxLayout>
 #include <QShortcut>
-#include <QStackedWidget>
-#include <QDeclarativeEngine>
 #include <QMessageBox>
 #include <QApplication>
-#include <QGraphicsOpacityEffect>
-#include <QToolBar>
 
 #ifdef Q_OS_WIN
 #include <utils/winutils.h>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 2aa52ad07dfcff87ea126b71a20c97501dbc6ea4..b590eb24b12500dc089878ce8d0f9c4f15da16dd 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -33,7 +33,6 @@
 #include <qmlmodelview.h>
 #include <declarativewidgetview.h>
 #include <QHash>
-#include <QDeclarativePropertyMap>
 #include <QStackedWidget>
 #include <QTimer>
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
index 71df7a061180b590c8624bb130de683e0c8e3454..ce6b27bafaeef75c5e9eec6f2a9e4c0d6d578352 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "propertyeditorcontextobject.h"
-#include <nodemetainfo.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index a4adf32240f452ea0dd1ab6f0f0783adfe6511ed..27d38533305d8cf1c6332457773070e32e95c7fe 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -31,11 +31,8 @@
 #include <QRegExp>
 #include <QUrl>
 #include <abstractview.h>
-#include <nodeabstractproperty.h>
 #include <nodeproperty.h>
-#include <model.h>
 #include <nodemetainfo.h>
-#include <metainfo.h>
 #include <qmlobjectnode.h>
 
 //using namespace QmlDesigner;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
index 64e84a8fd89be0340b461603a9e2d4c9dbc568ab..9f485cc8a699ef64c2f7afd00de78ea0ce3c5d18 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
@@ -36,8 +36,6 @@
 #include <QDeclarativePropertyMap>
 #include <qdeclarative.h>
 #include <modelnode.h>
-#include <qmlitemnode.h>
-#include <rewritertransaction.h>
 
 class PropertyEditorValue;
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
index c94026ff04beefd5f99688e5cf1c2ae1ef0c0a00..c5e35644f79dfe3a12886be30e9e23a2f229cb2e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
@@ -32,7 +32,6 @@
 #include <qmlanchors.h>
 #include <nodeabstractproperty.h>
 #include <variantproperty.h>
-#include <nodeinstance.h>
 #include <QDebug>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
index 56f9e96017e125003765c663c987a793e962277e..f53658ba4c829eb8e8f6321d5586b556a09f74bd 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
@@ -31,8 +31,6 @@
 #include "resetwidget.h"
 #include "qdeclarative.h"
 #include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QStringList>
 #include <QTableWidget>
 #include <QHeaderView>
 #include <QPushButton>
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp
index 344778c7da43b5a14cee8d884a313af705364bf9..3b0216ea6759461eb220de75cad5819a28cbf517 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp
@@ -27,7 +27,6 @@
 **
 ****************************************************************************/
 #include "stateseditorimageprovider.h"
-#include "stateseditorview.h"
 #include "nodeinstanceview.h"
 
 #include <QDebug>
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 58f52e9d8d16f9042dd2916d7ee9d99c4ef074f0..e1a04c9ecf1d61455e27f10eeaf957148d0b433b 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -30,11 +30,8 @@
 #include "stateseditorview.h"
 #include "stateseditorwidget.h"
 #include "stateseditormodel.h"
-#include <customnotifications.h>
 #include <rewritingexception.h>
 
-#include <QPainter>
-#include <QTimerEvent>
 #include <QMessageBox>
 #include <QDebug>
 #include <math.h>
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
index e51ec0969abd134acb5ea08208e058daa862e964..c885392462543da5a41e94312e30f836e706f9af 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
@@ -32,17 +32,11 @@
 #include "stateseditorview.h"
 #include "stateseditorimageprovider.h"
 
-#include <qmlitemnode.h>
-#include <invalidargumentexception.h>
 #include <invalidqmlsourceexception.h>
 
-#include <QFile>
 #include <qapplication.h>
 
 #include <QBoxLayout>
-#include <QListWidget>
-#include <QPushButton>
-#include <QMessageBox>
 
 #include <QDeclarativeView>
 #include <QDeclarativeContext>
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
index 3b3f20e5e02c5a2fc402ee59d2e7c2c1bfaf1d01..8973b9c4a65020f4d0fc9ae661dd607f0805ab97 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
@@ -31,7 +31,6 @@
 #define STATESEDITORWIDGET_H
 
 #include <QWidget>
-#include <QListWidgetItem>
 
 QT_BEGIN_NAMESPACE
 class QDeclarativeView;
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
index dfbd9775bcd06060840e426b12e483fd5c59406d..51fbc6661aa417c8ee0e4814ae335bab8d6f7d1b 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "componentsplugin.h"
-#include <widgetplugin_helper.h>
 #include <QtPlugin>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
index 505f4be898a63c1fecd9e551520e05950df3c53f..9951ecd91e7d4a6899bd25bd7cd8be598c8cc53c 100644
--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
@@ -34,7 +34,6 @@
 #include <cxxabi.h>
 #endif
 
-#include <QRegExp>
 
 /*!
 \defgroup CoreExceptions
diff --git a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp
index dd0c2e3b49c651b5b69f7bb0ae825c6eb046e6b3..57506ae559bc86bb12edbcc3b3de333348db9f39 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp
@@ -30,7 +30,6 @@
 #include "addarraymembervisitor.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp
index 2fce3907baab44b7b347e74034949cfcb14042ff..5324838a8b386594c3d7541cf4acf90057d4530f 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp
@@ -30,7 +30,6 @@
 #include "addobjectvisitor.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp
index 37af895cea9eb47c47f623b2fdfad58cb15ea244..80beffc43ad7652b2a1695f4bad930fa7c2d9c2b 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp
@@ -30,7 +30,6 @@
 #include "addpropertyvisitor.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
index f7fa85301e743615c57e95f5a04cff76838d7fac..6d533f8fd502e719709944f91bf8ecec5455304a 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
@@ -30,7 +30,6 @@
 #include "changeimportsvisitor.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 
 using namespace QmlJS;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h
index 9ece6ecd5c5ddee542eae0336da018e0fa397b64..8b29b8abf7f28e85cc906dce3611ac378d8405bb 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h
@@ -30,8 +30,6 @@
 #ifndef CHANGEIMPORTSVISITOR_H
 #define CHANGEIMPORTSVISITOR_H
 
-#include <QSet>
-
 #include "import.h"
 #include "qmlrewriter.h"
 
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.cpp
index 533b4830b56d2214c32f0d3a4dd11763cb81efec..64ed05063e628b01c8f1ace859ca7ac6743b1acf 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.cpp
@@ -29,7 +29,6 @@
 
 #include "changeobjecttypevisitor.h"
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
index 720a2e6cb5ad6416586ad74fad3c923ea0fd5e03..d03203d03679a28a9af8bb01bd58b74e19bf52a2 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.cpp
@@ -30,7 +30,6 @@
 #include "changepropertyvisitor.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
index 38de16e03668f17660061a1bf9d9559fb7b76bed..d6840b9395af0f7b8c8767524ae08b92e4cff20f 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
@@ -28,10 +28,8 @@
 ****************************************************************************/
 
 #include "moveobjectbeforeobjectvisitor.h"
-#include "textmodifier.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
index ce2393c5a819a125ca24a0e1cfa75f6ef6099b57..d77bba04d99b70a651e804219fa9e04963eb5d1f 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
@@ -28,10 +28,8 @@
 ****************************************************************************/
 
 #include "moveobjectvisitor.h"
-#include "textmodifier.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h
index c6376cfbf41ae8f983bcba337b2aec1e38fd05a8..62b3d70353a965c9a1663849929173eab5c3f547 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h
@@ -32,8 +32,6 @@
 
 #include <import.h>
 #include <textmodifier.h>
-#include <qmljs/qmljsdocument.h>
-#include <QSet>
 #include <QString>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
index 7dbdeb9ca40403684e648eba13f11d4095b1826a..3d56a6d12458acb4d4773092ed0d94a5f7e76444 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp
@@ -30,7 +30,6 @@
 #include "qmlrewriter.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QDebug>
 #include <QTextBlock>
diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp
index 29b565313af6a7a6de8af01d2429aa91b3c51bcc..e1ab75919d023f01d7957336592df7731e76a471 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp
@@ -30,7 +30,6 @@
 #include "removepropertyvisitor.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlDesigner::Internal;
 using namespace QmlJS;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp
index f0b8937683530f60a5af678c91a6097657c34c27..b36258949965c288a455736f592198989bdae562 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp
@@ -30,7 +30,6 @@
 #include "removeuiobjectmembervisitor.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
index 86e7381ce5d5826b021aa33f5fff7c92263ac3c8..dd5696cd86321dd122f501900157411beeef6b35 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
@@ -30,7 +30,6 @@
 #ifndef ABSTRACTPROPERTY_H
 #define ABSTRACTPROPERTY_H
 
-#include <QVariant>
 #include <QWeakPointer>
 #include <QSharedPointer>
 #include "qmldesignercorelib_global.h"
diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h
index ba96d46e5bb248694a0e645ca5a901c1ec29ca45..8b06431b3ad5e6b6ae3bbe65e2b91cea01281ca1 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfo.h
@@ -32,8 +32,6 @@
 
 #include "qmldesignercorelib_global.h"
 
-#include <QMultiHash>
-#include <QString>
 #include <QStringList>
 #include <QSharedPointer>
 
diff --git a/src/plugins/qmldesigner/designercore/include/metainforeader.h b/src/plugins/qmldesigner/designercore/include/metainforeader.h
index e75f6cfbd99d074221c0dc8832e098011b9d977f..bc1efc88f008394052619280705c07e231cb09d2 100644
--- a/src/plugins/qmldesigner/designercore/include/metainforeader.h
+++ b/src/plugins/qmldesigner/designercore/include/metainforeader.h
@@ -36,7 +36,6 @@
 #include <qmljs/qmljssimplereader.h>
 
 #include <QString>
-#include <QFile>
 
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index 84fb9982fd9e3c72ca0ff53f7538343e445ebba7..e799907a19043f4f35f8f2037cd9e31d9b33235f 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -32,7 +32,6 @@
 
 #include <qmldesignercorelib_global.h>
 #include <QObject>
-#include <QMimeData>
 #include <QPair>
 
 #include <import.h>
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index baadebb65676bef0bdef457053125eb9a34170e3..491fecc600069b5c0e83bb54ecfa9a1295d2ca93 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -33,7 +33,6 @@
 #include "qmldesignercorelib_global.h"
 #include <QWeakPointer>
 #include <QList>
-#include <QMetaType>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
index 205355edd991ba5c38bb87c534e95adbd5f35ad9..c20f257e0b8b392ecf3134f2d62df2e246f96eb5 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
@@ -39,7 +39,6 @@
 #include <nodeinstanceserverinterface.h>
 
 #include <QHash>
-#include <QSet>
 #include <QImage>
 #include <QWeakPointer>
 #include <QRectF>
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
index 0ece87b058c41594623ca414a9877975b5d47ac9..ef199801c7acfb8198ee1242f923eef483db9531 100644
--- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
@@ -32,7 +32,6 @@
 
 #include <QList>
 #include <QString>
-#include <QExplicitlySharedDataPointer>
 #include <QIcon>
 
 #include "qmldesignercorelib_global.h"
diff --git a/src/plugins/qmldesigner/designercore/include/propertycontainer.h b/src/plugins/qmldesigner/designercore/include/propertycontainer.h
index 7d6452ef347120770051479cb0df18c5cf1a9492..84276ac4cf7d378e26d749000018ec52969a2c0d 100644
--- a/src/plugins/qmldesigner/designercore/include/propertycontainer.h
+++ b/src/plugins/qmldesigner/designercore/include/propertycontainer.h
@@ -33,7 +33,6 @@
 #include "qmldesignercorelib_global.h"
 
 #include <QString>
-#include <QExplicitlySharedDataPointer>
 #include <QDataStream>
 #include <QVariant>
 
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
index 9af0420fd2824fd67b6c69e46bba5a2bfda12fec..08e56e853557370237699dfeb0e1b632a17a7fd0 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
@@ -31,7 +31,6 @@
 #define QMLMODELVIEW_H
 
 #include <qmldesignercorelib_global.h>
-#include <QPoint>
 #include <abstractview.h>
 #include "qmlitemnode.h"
 #include "qmlstate.h"
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 4af11eacceb06485b34b340832c90de6f4e2b412..0ad4428f8e197d4dc389068ab8bfd009ef6d8f05 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -34,10 +34,7 @@
 #include "abstractview.h"
 #include "exception.h"
 #include <modelnodepositionstorage.h>
-#include <QHash>
 #include <QMap>
-#include <QPointer>
-#include <QWeakPointer>
 #include <QUrl>
 
 #include <modelnode.h>
diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h
index af9cde56d2e9bfc20b8d7bce5fd0dc6c82c3e120..a996a11aa0eae6347fca382b60eb8c2900d546d3 100644
--- a/src/plugins/qmldesigner/designercore/include/textmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h
@@ -34,7 +34,6 @@
 
 #include <qmljs/qmljsdocument.h>
 
-#include <QByteArray>
 #include <QObject>
 #include <QTextCursor>
 #include <QTextDocument>
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
index 1a67bcfac5d699b042f757607d2349651c0f78d6..50a09e94f7c142707f70cf5e7fc2b167750d5647 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
@@ -31,7 +31,6 @@
 
 #include <QPainter>
 #include <modelnode.h>
-#include "commondefines.h"
 
 #include <QDebug>
 
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
index 55b2add1913e1caff324b30ed540aaf2c662033a..c5fb89d1e803a9a1e27b62eb8b5b6ebd19523746 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
@@ -39,10 +39,6 @@
 #include <QTimer>
 #include <QTextStream>
 
-#include "propertyabstractcontainer.h"
-#include "propertyvaluecontainer.h"
-#include "propertybindingcontainer.h"
-#include "instancecontainer.h"
 #include "createinstancescommand.h"
 #include "createscenecommand.h"
 #include "changevaluescommand.h"
@@ -62,7 +58,6 @@
 #include "pixmapchangedcommand.h"
 #include "valueschangedcommand.h"
 #include "childrenchangedcommand.h"
-#include "imagecontainer.h"
 #include "statepreviewimagechangedcommand.h"
 #include "componentcompletedcommand.h"
 #include "tokencommand.h"
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h
index 8acca459ceb6773be93f9c38feb2388d58318f5b..d68ff85aacc87b975109686015d7c7a25b5051b4 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h
@@ -32,7 +32,6 @@
 
 #include "nodeinstanceserverinterface.h"
 
-#include <QDataStream>
 #include <QWeakPointer>
 #include <QProcess>
 
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 83ba3d0f43ed1509c0b1c148f2957c3e911fb17a..6a920ffffe548dbdfb23993e1621b5acd895e767 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -32,26 +32,18 @@
 #include <QUrl>
 #include <QGraphicsView>
 #include <QGraphicsScene>
-#include <QGraphicsObject>
-#include <QFileSystemWatcher>
 #include <QMultiHash>
-#include <QTimer>
 
 #include <model.h>
 #include <modelnode.h>
 #include <metainfo.h>
 
-#include <typeinfo>
-#include <iwidgetplugin.h>
-
 #include "abstractproperty.h"
 #include "variantproperty.h"
 #include "bindingproperty.h"
 #include "nodeabstractproperty.h"
 #include "nodelistproperty.h"
 
-#include <nodeinstanceserverinterface.h>
-
 #include "createscenecommand.h"
 #include "createinstancescommand.h"
 #include "clearscenecommand.h"
@@ -69,7 +61,6 @@
 #include "informationchangedcommand.h"
 #include "changestatecommand.h"
 #include "childrenchangedcommand.h"
-#include "imagecontainer.h"
 #include "statepreviewimagechangedcommand.h"
 #include "completecomponentcommand.h"
 #include "componentcompletedcommand.h"
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index 429c7a396046ca1938372993656d99675e21f088..aeb51fc4deb966326012d378dc75f4a029435e64 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -29,10 +29,7 @@
 
 #include "metainfo.h"
 
-#include "abstractproperty.h"
 #include "modelnode.h"
-#include "invalidmodelnodeexception.h"
-#include "invalidargumentexception.h"
 #include "metainforeader.h"
 #include "iwidgetplugin.h"
 
@@ -41,7 +38,6 @@
 
 #include <QDebug>
 #include <QMessageBox>
-#include <QPair>
 #include <QtAlgorithms>
 
 enum {
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index 191dce43d8fd93f59fca0d643fb3a2bcbebe577e..77af31f2cd6c5349bbff8f887e5cadbdc43d76eb 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -30,10 +30,7 @@
 #include "metainforeader.h"
 #include "metainfo.h"
 
-#include <propertyparser.h>
-#include <QXmlStreamReader>
 #include <QString>
-#include <QFile>
 #include <QFileInfo>
 #include <QDebug>
 #include <QIcon>
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 9c290630baf930bfe2a1d673e94eb172cc1b6099..a026da45ca7179094b84ae634aafcc00852df5f5 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -29,24 +29,17 @@
 
 #include "nodemetainfo.h"
 #include "model.h"
-#include "invalidargumentexception.h"
 
 #include "metainfo.h"
 #include <rewriterview.h>
 #include <propertyparser.h>
 
 #include <QDir>
-#include <QSharedData>
 #include <QDebug>
-#include <QIcon>
 
-#include <qmljs/qmljsdocument.h>
-#include <qmljs/qmljscontext.h>
-#include <qmljs/qmljsbind.h>
 #include <qmljs/qmljsscopechain.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
-#include <languageutils/fakemetaobject.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index 473500224b7abe59f5c88b70ada4e97d7fa775b0..b3d57ad05ace89ddfb488e9542ebedc0792d7125 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -32,23 +32,16 @@
 #include <qmldesignerconstants.h>
 
 #include "model.h"
-#include "metainfo.h"
 #include "metainforeader.h"
 
 #include <utils/hostosinfo.h>
 
 #include <QDir>
-#include <QMetaType>
 #include <QMessageBox>
 #include <QUrl>
 
-#include <qmljs/qmljsevaluate.h>
-#include <qmljs/qmljsinterpreter.h>
-#include <qmljs/qmljscontext.h>
 #include <qmljs/qmljslink.h>
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/qmljsscopebuilder.h>
-#include <qmljs/qmljsscopechain.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
 enum { debug = false };
diff --git a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp
index 51cac9a412235bf98a0594d18360831fda21b051..9e264747fb2e114d2f0870f5a5803476a7da4a7b 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractproperty.cpp
@@ -29,11 +29,9 @@
 
 #include "abstractproperty.h"
 #include "internalnode_p.h"
-#include "internalproperty.h"
 #include <model.h>
 #include "model_p.h"
 #include <modelnode.h>
-#include <metainfo.h>
 #include "invalidpropertyexception.h"
 #include "variantproperty.h"
 #include "bindingproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index 9653ed6d8d86835cf4aeee0284a28cef83754e05..b06c07dfca94e2be5aaa2891ff61f3e8045927a9 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -31,8 +31,6 @@
 
 #include "model.h"
 #include "model_p.h"
-#include "nodeproperty.h"
-#include "bindingproperty.h"
 #include "internalnode_p.h"
 #include <qmlmodelview.h>
 
diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
index b38fc0bdd2fed1de7963432c281e0263c3701afa..75266deb1cc214e5b1bc5f89892c113f32471d90 100644
--- a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
@@ -29,8 +29,6 @@
 
 #include "basetexteditmodifier.h"
 
-#include <extensionsystem/pluginmanager.h>
-#include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljseditor/qmljseditor.h>
 #include <texteditor/tabsettings.h>
diff --git a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
index 3346eef6a62ef178ff0381e923ebe506a5709952..7ccd6a9bc11ec18dbb106f2a9dcf3fbede4c6fbd 100644
--- a/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/bindingproperty.cpp
@@ -28,10 +28,8 @@
 ****************************************************************************/
 
 #include "bindingproperty.h"
-#include "nodeabstractproperty.h"
 #include "nodeproperty.h"
 #include "internalproperty.h"
-#include "internalbindingproperty.h"
 #include "invalidmodelnodeexception.h"
 #include "invalidpropertyexception.h"
 #include "invalidargumentexception.h"
diff --git a/src/plugins/qmldesigner/designercore/model/internalnode.cpp b/src/plugins/qmldesigner/designercore/model/internalnode.cpp
index 8c452eb523186c8b01f21214ccb54ea07f3e8b89..8e6bac99c17851cccac3bc9cba425a3ad8a1b566 100644
--- a/src/plugins/qmldesigner/designercore/model/internalnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/internalnode.cpp
@@ -32,11 +32,9 @@
 #include "internalvariantproperty.h"
 #include "internalnodeproperty.h"
 #include "internalnodelistproperty.h"
-#include "invalidmodelnodeexception.h"
-#include "invalidpropertyexception.h"
+
 
 #include <QDebug>
-#include <qmldesignercorelib_global.h>
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalproperty.cpp
index 2ae1307550fb45d9fa22075ab702bee2deaa750a..7241e4c90eb19dab6617bfbac8c6fe846d31cf93 100644
--- a/src/plugins/qmldesigner/designercore/model/internalproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/internalproperty.cpp
@@ -34,13 +34,6 @@
 #include "internalnodeproperty.h"
 #include "internalsignalhandlerproperty.h"
 #include "internalnode_p.h"
-#include <QVariant>
-#include <QString>
-#include <QRegExp>
-#include <QSize>
-#include <QSizeF>
-#include <QPoint>
-#include <QPointF>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.h b/src/plugins/qmldesigner/designercore/model/internalproperty.h
index 14d72a68a593b59126719ca165c4551ffaff2987..f62764709142222fb607d8fb71d6451b47a7fd5f 100644
--- a/src/plugins/qmldesigner/designercore/model/internalproperty.h
+++ b/src/plugins/qmldesigner/designercore/model/internalproperty.h
@@ -33,12 +33,6 @@
 #include "qmldesignercorelib_global.h"
 
 #include <QVariant>
-#include <QString>
-#include <QRegExp>
-#include <QSize>
-#include <QSizeF>
-#include <QPoint>
-#include <QPointF>
 #include <QSharedPointer>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 23b71ef0faf5f34b867a9a7f3948421e9593275f..b35d0a5e2d18709bbdc43efc089ea1c9ac2f25a3 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -34,29 +34,19 @@
 #include "invalidpropertyexception.h"
 #include "invalidargumentexception.h"
 
-#include <QFile>
-#include <QByteArray>
 #include <QWeakPointer>
-#include <QFileInfo>
 
-#include <QUndoStack>
-#include <QXmlStreamReader>
-#include <QDebug>
-#include <QPlainTextEdit>
 #include <QHashIterator>
 
 #include "abstractview.h"
 #include "nodeinstanceview.h"
 #include "metainfo.h"
 #include "nodemetainfo.h"
-#include "subcomponentmanager.h"
 #include "internalproperty.h"
 #include "internalnodelistproperty.h"
 #include "internalsignalhandlerproperty.h"
 #include "internalnodeabstractproperty.h"
 #include "invalidmodelnodeexception.h"
-#include "invalidmodelstateexception.h"
-#include "invalidslideindexexception.h"
 
 #include "abstractproperty.h"
 #include "variantproperty.h"
@@ -64,7 +54,6 @@
 #include "signalhandlerproperty.h"
 #include "nodeabstractproperty.h"
 #include "nodelistproperty.h"
-#include "rewritertransaction.h"
 #include "rewriterview.h"
 #include "rewritingexception.h"
 #include "invalididexception.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index cac03fa4b6b76ed32c38ae4f081771f3edccb9f0..ba919e70ef6725419e0c34e9b5aec57308435cd4 100644
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -31,7 +31,6 @@
 
 #include "modelnode.h"
 #include "abstractview.h"
-#include "model.h"
 #include "nodemetainfo.h"
 #include "nodeproperty.h"
 #include "nodelistproperty.h"
@@ -40,8 +39,6 @@
 #include "rewritertransaction.h"
 #include <rewritingexception.h>
 
-#include <QSet>
-#include <QStringList>
 #include <QUrl>
 
 #include <QDebug>
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index b1752c3c7fd634f0595ab8ec81b767734fbbad1d..33345279032a0dfa14f146b9ccd72368c2656e63 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -31,7 +31,6 @@
 #include <abstractproperty.h>
 #include <abstractview.h>
 #include <model.h>
-#include <metainfo.h>
 #include <nodemetainfo.h>
 #include "internalnode_p.h"
 #include <QHash>
@@ -39,8 +38,6 @@
 #include "invalidargumentexception.h"
 #include "invalididexception.h"
 #include "invalidmodelnodeexception.h"
-#include "invalidpropertyexception.h"
-#include "invalidslideindexexception.h"
 #include "model_p.h"
 #include "variantproperty.h"
 #include "bindingproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h
index 17ff6bc89342e9411c151f4741a57acbf22ffd28..b9d0c8f7416c3830ca3f905db3d8340c91e13b17 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h
+++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h
@@ -32,7 +32,6 @@
 
 #include <QMap>
 #include <QObject>
-#include <QSet>
 
 #include "modelnode.h"
 #include "modelnodepositionstorage.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
index 451c27dee64f8b54331f8d9816454beb7845c2a8..9d4f718ba2ff98ce0f8656ab7636c9e40d950a0e 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "modelnodepositionstorage.h"
-#include "invalidmodelnodeexception.h"
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
index 53d0bab0fb4324d026d167e8c4f40967e37d0dbd..232b2151c66881acd23ebaf36ceb71b4720869d5 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
@@ -33,11 +33,8 @@
 #include "rewriteactioncompressor.h"
 #include "rewriterview.h"
 
-#include <qmljs/qmljsdocument.h>
-#include <variantproperty.h>
 #include <nodelistproperty.h>
 #include <nodeproperty.h>
-#include <textmodifier.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
index 13955ad9f2b96faf020270d658140d3b88151546..7d177b353c1f83cf1a412e8725c35c888c461679 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
@@ -35,14 +35,10 @@
 #include "abstractview.h"
 #include "nodeabstractproperty.h"
 #include "variantproperty.h"
-#include "nodelistproperty.h"
 #include "bindingproperty.h"
 #include "rewriteaction.h"
 #include <filemanager/qmlrefactoring.h>
 #include <QMap>
-#include <QSet>
-#include <QHash>
-#include <QVariant>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp
index c829a9ed86118829e9b6d02d6f021e9a1290c8f5..3741d4fa904deab19cbe3a8c3eb230674b9803ee 100644
--- a/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/nodeabstractproperty.cpp
@@ -29,10 +29,7 @@
 
 #include "nodeabstractproperty.h"
 #include "nodeproperty.h"
-#include "internalproperty.h"
-#include "internalnodelistproperty.h"
 #include "invalidmodelnodeexception.h"
-#include "invalidpropertyexception.h"
 #include "invalidreparentingexception.h"
 #include "internalnode_p.h"
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp
index 1a325c71ff42aea2cb495a3ca38f3fd960286663..9f5ff031d374916f63bedcb75a3233009c496a22 100644
--- a/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp
@@ -30,7 +30,6 @@
 #include "nodelistproperty.h"
 #include "internalproperty.h"
 #include "internalnodelistproperty.h"
-#include "invalidmodelnodeexception.h"
 #include "invalidpropertyexception.h"
 #include "internalnode_p.h"
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp b/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp
index 5340263d177e90e5b7dbb77fc0e431542fe22aa8..54a6427853a1575768645dc258e0004d933b7645 100644
--- a/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/nodeproperty.cpp
@@ -28,9 +28,7 @@
 ****************************************************************************/
 
 #include "nodeproperty.h"
-#include "internalnodeproperty.h"
 #include "invalidmodelnodeexception.h"
-#include "invalidpropertyexception.h"
 #include "invalidargumentexception.h"
 #include "internalnode_p.h"
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
index 5cf32b1a2ec6aa063bc33433a44bd488aab2aa49..1ef587ddf017c5bdd7bd50a30aed9c0639eb0607 100644
--- a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
@@ -30,11 +30,9 @@
 #include "plaintexteditmodifier.h"
 
 #include <utils/changeset.h>
-#include <extensionsystem/pluginmanager.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
 #include <QPlainTextEdit>
-#include <QUndoStack>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp
index 562f80c89588bf6d776dcf89550c39e3cb8bf92c..3208216fd6b0e58d82943ae892b6370e4b8ea1cd 100644
--- a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp
+++ b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp
@@ -31,11 +31,6 @@
 #include "propertyparser.h"
 #include <QVariant>
 #include <QString>
-#include <QRegExp>
-#include <QSize>
-#include <QSizeF>
-#include <QPoint>
-#include <QPointF>
 #include <QDebug>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
index f73b1a7b34dfecd7dcdfa5c2c56303f8b4811b9c..bcbcd30028084bbc8dc3e018844b96aceefcb488 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
@@ -28,13 +28,10 @@
 ****************************************************************************/
 
 #include "qmlanchors.h"
-#include "variantproperty.h"
 #include "bindingproperty.h"
 #include "nodeabstractproperty.h"
-#include "nodeinstance.h"
 #include "rewritertransaction.h"
 #include "qmlmodelview.h"
-#include "mathutils.h"
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index 24e7653370cf1d1757dfece73bc558aedffd8a33..f9626b18fce6e2962781570cb2bb6fb072cf7cb4 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -30,15 +30,10 @@
 #include "qmlitemnode.h"
 #include <metainfo.h>
 #include "qmlchangeset.h"
-#include "variantproperty.h"
-#include "nodeproperty.h"
 #include "nodelistproperty.h"
-#include "nodeinstance.h"
 #include "qmlanchors.h"
 #include "invalidmodelnodeexception.h"
-#include "rewritertransaction.h"
 #include "qmlmodelview.h"
-#include "mathutils.h"
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index fa7d13737d166b2dd67de51eba3c1ca4a312df29..0681f2f3f5a34b634b44fe0717d442d827601b57 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -34,7 +34,6 @@
 #include "nodeproperty.h"
 #include <invalidmodelnodeexception.h>
 #include "qmlmodelview.h"
-#include "nodeinstanceview.h"
 #include "nodeinstance.h"
 #include "nodemetainfo.h"
 #include "bindingproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h
index 4f5ba555dcefd1ef4bcbe65d3fbcadc4f6964b91..05da2937d2b189f423bf31d394ece0136babedd3 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h
@@ -31,7 +31,6 @@
 #define QMLTEXTGENERATOR_H
 
 #include <QString>
-#include <QStringList>
 
 #include "abstractproperty.h"
 #include "modelnode.h"
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
index 41abf3d2cb7e6150fc7b0629243e4c3d6651ac5f..264ca7ea93869184287f3713fac28f0d60a6fb07 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
@@ -31,7 +31,6 @@
 
 #include <QDebug>
 
-#include "nodeabstractproperty.h"
 #include "nodelistproperty.h"
 #include "nodemetainfo.h"
 
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
index 82b0189aaebc42b31536303b00c8151ec8a3b6be..c33a1ae62eb7a5dd4dc45b1c90719291672d5432 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
@@ -33,7 +33,6 @@
 
 #include "modelnode.h"
 #include "nodelistproperty.h"
-#include "nodeproperty.h"
 #include "qmltextgenerator.h"
 
 using namespace QmlDesigner;
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h
index 938835c9a654e3e773bc957a1d479b1eb007ac1a..719d9de5f90e012f8bf390a173bda508d3614449 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h
@@ -30,8 +30,6 @@
 #ifndef REWRITEACTIONCOMPRESSOR_H
 #define REWRITEACTIONCOMPRESSOR_H
 
-#include <QStringList>
-
 #include "rewriteaction.h"
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index a30cf5130a1bac9a419f3c19d4ef5f358c54a881..6245ec3f3f4865625c456ca063eeeb49db79a7bf 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -34,17 +34,13 @@
 #include <filemanager/firstdefinitionfinder.h>
 #include <customnotifications.h>
 
-#include <qmljs/parser/qmljsengine_p.h>
 
 #include "rewritingexception.h"
-#include "textmodifier.h"
 #include "texttomodelmerger.h"
 #include "modelnodepositionstorage.h"
 #include "modeltotextmerger.h"
 #include "nodelistproperty.h"
-#include "nodeproperty.h"
 #include "signalhandlerproperty.h"
-#include "invalidmodelnodeexception.h"
 
 
 
diff --git a/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp b/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp
index 3ee9f2e3a1ef00c276e152fb532d9808d4282db2..56f538f027b94f00a905fbd36276aa3ee5d4183e 100644
--- a/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/signalhandlerproperty.cpp
@@ -28,10 +28,7 @@
 ****************************************************************************/
 
 #include "signalhandlerproperty.h"
-#include "nodeabstractproperty.h"
-#include "nodeproperty.h"
 #include "internalproperty.h"
-#include "internalsignalhandlerproperty.h"
 #include "invalidmodelnodeexception.h"
 #include "invalidpropertyexception.h"
 #include "invalidargumentexception.h"
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index dd2dfa217539a52c57142d415844a579477dd8fe..7fe45f1b27bd7028e8311978df8ac079669f08fb 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -34,30 +34,21 @@
 #include "filemanager/objectlengthcalculator.h"
 #include "filemanager/qmlrefactoring.h"
 #include "filemanager/qmlwarningdialog.h"
-#include "rewriteaction.h"
 #include "nodeproperty.h"
 #include "propertyparser.h"
-#include "textmodifier.h"
 #include "rewriterview.h"
 #include "variantproperty.h"
 #include "signalhandlerproperty.h"
 #include "nodemetainfo.h"
-#include "qmldesignercorelib_global.h"
 
-#include <languageutils/componentversion.h>
 #include <qmljs/qmljsevaluate.h>
-#include <qmljs/qmljsinterpreter.h>
-#include <qmljs/qmljscontext.h>
 #include <qmljs/qmljslink.h>
-#include <qmljs/qmljsscopebuilder.h>
-#include <qmljs/qmljsscopechain.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljscheck.h>
 #include <qmljs/qmljsutils.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
 #include <QSet>
-#include <QMessageBox>
 #include <QDir>
 
 using namespace LanguageUtils;
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
index 68e9a4778c29da939778df75e7e824bcbe307e28..8c98376db2de7f4fcbc4a61e130f4b1aa7223fd2 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
@@ -35,7 +35,6 @@
 #include "nodelistproperty.h"
 #include "modelnode.h"
 
-#include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsscopechain.h>
 
 #include <QStringList>
diff --git a/src/plugins/qmldesigner/designercore/model/variantproperty.cpp b/src/plugins/qmldesigner/designercore/model/variantproperty.cpp
index 8c1bb0fd73f007b3a86fd2444e0094d6f9762ecc..614a5f8050e53896a42f170d06d20b7adfe7da66 100644
--- a/src/plugins/qmldesigner/designercore/model/variantproperty.cpp
+++ b/src/plugins/qmldesigner/designercore/model/variantproperty.cpp
@@ -29,9 +29,7 @@
 
 #include "variantproperty.h"
 #include "internalproperty.h"
-#include "internalvariantproperty.h"
 #include "invalidmodelnodeexception.h"
-#include "invalidpropertyexception.h"
 #include "invalidargumentexception.h"
 #include "internalnode_p.h"
 #include "model.h"
diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
index b09e4d9bf41564f3da7ac7cceb42b63fbb83478f..6205f0a2c72f4a474f6d74f5e4a0adcd70577966 100644
--- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
@@ -1,18 +1,12 @@
 #include "viewmanager.h"
 
-#include "designdocument.h"
 #include "componentaction.h"
-#include "itemlibrarywidget.h"
-#include "designmodewidget.h"
 #include "formeditorwidget.h"
 #include "toolbox.h"
 #include "designeractionmanager.h"
-#include "designersettings.h"
 
 #include <qmldesigner/qmldesignerplugin.h>
 
-#include <utils/crumblepath.h>
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/qtsupportconstants.h>
 
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
index e9e7d8100673d2408d1beb7af32d2bf19b400c34..bb9eede119f9968237a2a2dd3eda41541094708c 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
@@ -28,21 +28,12 @@
 ****************************************************************************/
 
 #include "widgetpluginmanager.h"
-#include <iwidgetplugin.h>
 
-#include <QCoreApplication>
 #include <QObject>
-#include <QSharedData>
 #include <QDir>
-#include <QStringList>
 #include <QDebug>
-#include <QWeakPointer>
-#include <QPluginLoader>
-#include <QFileInfo>
-#include <QLibraryInfo>
 
 #include <QStandardItemModel>
-#include <QStandardItem>
 
 enum { debug = 0 };
 
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
index e161303884310ea6254f368b539e0714d5b55d08..3ac93f85d7b688d64231198f6e6c76acaa35eac6 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
@@ -30,13 +30,10 @@
 #include "widgetpluginpath.h"
 #include <iwidgetplugin.h>
 #include <QLibrary>
-#include <QWeakPointer>
 #include <QPluginLoader>
 #include <QFileInfo>
-#include <QLibraryInfo>
 #include <QCoreApplication>
 #include <QObject>
-#include <QSharedData>
 #include <QDebug>
 
 enum { debug = 0 };
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index d21ff9ef687b5a9073dd37c4e8262416cf5356de..d01ae232b5e738273e750a71c763c4d3dca3ba3a 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -28,47 +28,28 @@
 ****************************************************************************/
 
 #include "designmodewidget.h"
-#include "qmldesignerconstants.h"
 #include "styledoutputpaneplaceholder.h"
 #include "qmldesignerplugin.h"
 
-#include <model.h>
 #include <rewriterview.h>
-#include <componentaction.h>
-#include <toolbox.h>
 #include <itemlibrarywidget.h>
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/modemanager.h>
-#include <coreplugin/outputpane.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/sidebar.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/openeditorsmodel.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editortoolbar.h>
 #include <coreplugin/inavigationwidgetfactory.h>
 #include <extensionsystem/pluginmanager.h>
 
-#include <utils/parameteraction.h>
 #include <utils/fileutils.h>
-#include <utils/qtcassert.h>
-#include <utils/crumblepath.h>
 
 #include <QSettings>
-#include <QEvent>
-#include <QDir>
-#include <QApplication>
-#include <QPlainTextEdit>
 #include <QVBoxLayout>
-#include <QScrollArea>
 #include <QToolButton>
-#include <QMenu>
-#include <QClipboard>
 #include <QLabel>
-#include <QProgressDialog>
 #include <QTabWidget>
 
 using Core::MiniSplitter;
diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h
index 48f4f5045abb785d19afbe37c7bd0a40cd075f22..58142ab8c3ca5e1a36adb8705c56eb8c56d23361 100644
--- a/src/plugins/qmldesigner/designmodewidget.h
+++ b/src/plugins/qmldesigner/designmodewidget.h
@@ -31,26 +31,13 @@
 #define DESIGNMODEWIDGET_H
 
 #include <coreplugin/minisplitter.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <utils/faketooltip.h>
-#include <texteditor/itexteditor.h>
 
 #include <designdocument.h>
-#include <itemlibraryview.h>
-#include <navigatorwidget.h>
-#include <navigatorview.h>
-#include <stateseditorview.h>
-#include <componentview.h>
 #include <modelnode.h>
-#include <formeditorview.h>
 #include <propertyeditor.h>
 
-#include <QWeakPointer>
-#include <QDeclarativeError>
-#include <QHash>
 #include <QWidget>
-#include <QToolBar>
-#include <QComboBox>
 #include <QLabel>
 #include <QScopedPointer>
 
diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp
index 7e24904ae8e998560e92e2cf0bdc365a963f1ea8..b69d9adafa68448bf6c867a14041020263311c86 100644
--- a/src/plugins/qmldesigner/documentmanager.cpp
+++ b/src/plugins/qmldesigner/documentmanager.cpp
@@ -29,10 +29,6 @@
 
 #include "documentmanager.h"
 
-#include <coreplugin/designmode.h>
-#include <coreplugin/modemanager.h>
-#include <qmljseditor/qmljseditorconstants.h>
-
 namespace QmlDesigner {
 
 DocumentManager::DocumentManager()
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 552654600738c5dc74da04ce8e9c6f7179ca2e74..94bc843fe234b994684743d4872e52ab4e33e7d4 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -30,38 +30,24 @@
 #include "qmldesignerplugin.h"
 #include "exception.h"
 #include "qmldesignerconstants.h"
-#include "pluginmanager.h"
 #include "designmodewidget.h"
 #include "settingspage.h"
 #include "designmodecontext.h"
 
 #include <qmljseditor/qmljseditorconstants.h>
 
-#include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/designmode.h>
-#include <coreplugin/dialogs/iwizard.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditorfactory.h>
-#include <coreplugin/editormanager/openeditorsmodel.h>
-#include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/modemanager.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
 
 #include <QAction>
 
-#include <QFileInfo>
 #include <QCoreApplication>
 #include <qplugin.h>
 #include <QDebug>
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h
index 51e4ebdf24c63396c3c11ea44294543dba92c6b8..9ed708e55dc0bb51997288beb1a1495cc19e324d 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.h
+++ b/src/plugins/qmldesigner/qmldesignerplugin.h
@@ -40,7 +40,6 @@
 #include "viewmanager.h"
 #include "shortcutmanager.h"
 
-#include <QWeakPointer>
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
index 1afbbc854a9f5b28e003711bef903942d359546a..c6fde7ec784816c0413aa5ecb316cc089ff39f8c 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "qtquickplugin.h"
-#include <widgetplugin_helper.h>
 #include <QtPlugin>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 4a1ded4092f738660ff753e221d4241116bfc5b8..941cb4b5597b7aef3780ba10fa5ce72ef4de51c1 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -35,7 +35,6 @@
 #include <qmljseditor/qmljseditorconstants.h>
 
 #include <QTextStream>
-#include <QCheckBox>
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp
index 231b98e5ab538db26df71083bd1e422cfc47a889..1a56e4f22a845bba967408a4f1df3b5375c76753 100644
--- a/src/plugins/qmldesigner/shortcutmanager.cpp
+++ b/src/plugins/qmldesigner/shortcutmanager.cpp
@@ -3,13 +3,11 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
 #include <coreplugin/editormanager/openeditorsmodel.h>
 #include <coreplugin/coreconstants.h>
 #include <utils/hostosinfo.h>
 
 #include "qmldesignerconstants.h"
-#include "designdocument.h"
 #include "qmldesignerplugin.h"
 #include "designmodewidget.h"
 
diff --git a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
index 89ca973e9b40bdccfd3c27bf0d886fb4163ea567..b1169edfc1ec5807e74014588a26a1b6c70d03ff 100644
--- a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
+++ b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
@@ -32,9 +32,7 @@
 #include <utils/fileutils.h>
 
 #include <QChildEvent>
-#include <QFile>
 #include <QTabWidget>
-#include <QStackedWidget>
 #include <QDebug>
 
 StyledOutputpanePlaceHolder::StyledOutputpanePlaceHolder(Core::IMode *mode, QSplitter *parent) : Core::OutputPanePlaceHolder(mode, parent)