Clean headers in QML-Designer.

Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
author: Friedemann Kleint <Friedemann.Kleint@digia.com> 2013-04-25 11:50:38 +0200
committer: Friedemann Kleint <Friedemann.Kleint@digia.com> 2013-04-30 14:09:58 +0200
commit: ffbbf64e294d0bcd0b106f228a50ab5c37326f31 (patch)
tree: bf5aae5fdd741d2ba76de05e25a4b8017e07adc2
parent: a25d66a9448fadf0121532aad88a926c23d6e572 (diff)
156 files changed, 15 insertions, 470 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 7ed695280e..0facd04494 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 b8951e99ba..2b4f31ec56 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 909bf2bfab..f26159ec36 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 a72f8becc3..3c7d299556 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 81f104c56e..d25731495a 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 c715909417..182fca25c8 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 b4b5906ef5..7bf56a9d63 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 ca6618f81f..7dc1d2a93a 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 a33aa0dd9b..574d9a0717 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 6bf3bd48d1..40469e3977 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 50b40c860a..107755bdaa 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 c34b1d9eaa..04484561dc 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 c2c5cf3b74..dd29d41e18 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 aa1c0a533a..104d277c05 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 245899f199..a3ef2a15ef 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 4fdb92baa1..ddf3caa0f5 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 131dc97c12..4c2ae66711 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 89025fcd4e..2abbbaea6c 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 3e9565ca32..312dba5aca 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 d55328a327..b26b93040e 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 0836b2054f..a258283856 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 4e97ea4cfc..00870b154b 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 e284da2eaa..5bfe3498a3 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 cd6eba9a52..2611219b60 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 407a385cf2..c4a450e52a 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 162a9e5bab..f4462eb829 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 e6a3478fcd..3f4fc48085 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 8d3565acdf..1a33b4e04a 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 47f21b9860..263f232b70 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 53fd6767c4..16364c9dd2 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 e1673e9ecd..6df144c783 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 8dbb782442..464630f59e 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 52a3b79e41..fedccd62e2 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 5ee447fe37..14369c913d 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 9c9f715f98..ee12bb9e72 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 2fd01092ba..f0803c6c6e 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 6af1ded4b8..9d010324d1 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 d517c7a765..718dedfb0d 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 ec5b72e8ed..78667b6776 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 49fb7df80b..346d31b7b9 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 0f3e84f7c7..63c54a28e0 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 4a34d31c1e..8c44ee8343 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 a6d66434a9..0fc1f750e1 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 b898473f14..f3953af9b6 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 b7ee0e2244..74199f83eb 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 e9f988eaeb..f5dc94a079 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 6edca83b73..f1d82e66d1 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 8990ddd131..8eb1d63db6 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 ddbbb49ffd..8b7a6964da 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 9c36456e9d..f2e21cd62d 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 f38f520e99..497318705d 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 b685e92715..61ee53a083 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 3f74c08aa4..820886e6b3 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 ebe10db013..30800ec5e3 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 f663e53e50..4fb130042e 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 2d73983367..5bcfc90c5d 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 0678f0460c..f28b94785e 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 9b073818ed..d4af8b4524 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 8edda67160..ffc61704c9 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 9800f0c97d..b4454acf94 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 2a8e706160..b26f2e9bd9 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 35b9f8eeac..26151d8f7e 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 aa92166b92..9db2ce5ac6 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 d31ba06288..ad53a1c16f 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 3df6dcd212..6c48c2fb1a 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 e3daa1981a..d7b08da2db 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 f8f36d023a..237bfff729 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 200d21a81a..10288c4ea2 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 d4329cc674..d6b6d952ed 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 2aa52ad07d..b590eb24b1 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 71df7a0611..ce6b27bafa 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 a4adf32240..27d3853330 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 64e84a8fd8..9f485cc8a6 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 c94026ff04..c5e35644f7 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 56f9e96017..f53658ba4c 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 344778c7da..3b0216ea67 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 58f52e9d8d..e1a04c9ecf 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 e51ec0969a..c885392462 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 3b3f20e5e0..8973b9c4a6 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 dfbd9775bc..51fbc6661a 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 505f4be898..9951ecd91e 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 dd0c2e3b49..57506ae559 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 2fce3907ba..5324838a8b 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 37af895cea..80beffc43a 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 f7fa85301e..6d533f8fd5 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 9ece6ecd5c..8b29b8abf7 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 533b4830b5..64ed05063e 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 720a2e6cb5..d03203d036 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 38de16e036..d6840b9395 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 ce2393c5a8..d77bba04d9 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 c6376cfbf4..62b3d70353 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 7dbdeb9ca4..3d56a6d124 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 29b565313a..e1ab75919d 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 f0b8937683..b362589499 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 86e7381ce5..dd5696cd86 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 ba96d46e5b..8b06431b3a 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 e75f6cfbd9..bc1efc88f0 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 84fb9982fd..e799907a19 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 baadebb656..491fecc600 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 205355edd9..c20f257e0b 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 0ece87b058..ef199801c7 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 7d6452ef34..84276ac4cf 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 9af0420fd2..08e56e8535 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 4af11eacce..0ad4428f8e 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 af9cde56d2..a996a11aa0 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 1a67bcfac5..50a09e94f7 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 55b2add191..c5fb89d1e8 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 8acca459ce..d68ff85aac 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 83ba3d0f43..6a920ffffe 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 429c7a3960..aeb51fc4de 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 191dce43d8..77af31f2cd 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 9c290630ba..a026da45ca 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 473500224b..b3d57ad05a 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 51cac9a412..9e264747fb 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 9653ed6d8d..b06c07dfca 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 b38fc0bdd2..75266deb1c 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 3346eef6a6..7ccd6a9bc1 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 8c452eb523..8e6bac99c1 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 2ae1307550..7241e4c90e 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 14d72a68a5..f627647091 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 23b71ef0fa..b35d0a5e2d 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 cac03fa4b6..ba919e70ef 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 b1752c3c7f..3334527903 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 17ff6bc893..b9d0c8f741 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 451c27dee6..9d4f718ba2 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 53d0bab0fb..232b2151c6 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 13955ad9f2..7d177b353c 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 c829a9ed86..3741d4fa90 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 1a325c71ff..9f5ff031d3 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 5340263d17..54a6427853 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 5cf32b1a2e..1ef587ddf0 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 562f80c895..3208216fd6 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 f73b1a7b34..bcbcd30028 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 24e7653370..f9626b18fc 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 fa7d13737d..0681f2f3f5 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 4f5ba555dc..05da2937d2 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 41abf3d2cb..264ca7ea93 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 82b0189aae..c33a1ae62e 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 938835c9a6..719d9de5f9 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 a30cf5130a..6245ec3f3f 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 3ee9f2e3a1..56f538f027 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 dd2dfa2175..7fe45f1b27 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 68e9a4778c..8c98376db2 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 8c1bb0fd73..614a5f8050 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 b09e4d9bf4..6205f0a2c7 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 e9e7d81006..bb9eede119 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 e161303884..3ac93f85d7 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 d21ff9ef68..d01ae232b5 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 48f4f5045a..58142ab8c3 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 7e24904ae8..b69d9adafa 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 5526546007..94bc843fe2 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 51e4ebdf24..9ed708e55d 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 1afbbc854a..c6fde7ec78 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 4a1ded4092..941cb4b559 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 231b98e5ab..1a56e4f22a 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 89ca973e9b..b1169edfc1 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)
author	Friedemann Kleint <Friedemann.Kleint@digia.com>	2013-04-25 11:50:38 +0200
committer	Friedemann Kleint <Friedemann.Kleint@digia.com>	2013-04-30 14:09:58 +0200
commit	ffbbf64e294d0bcd0b106f228a50ab5c37326f31 (patch)
tree	bf5aae5fdd741d2ba76de05e25a4b8017e07adc2
parent	a25d66a9448fadf0121532aad88a926c23d6e572 (diff)