fix includes

- include headers from own directory with ""
- include headers from own project without private/
- sort includes from most specific to most generic
- make headers self-contained
- some whitespace unification

no attempt was made at making the qt includes consistent regarding the
use of module names and forwarding headers.
no attempt was made at sorting includes.

80 files changed, 325 insertions, 239 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
index eabd344..c838d7d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
@@ -39,12 +39,15 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsanchors_p_p.h>
+#include "qmlgraphicsanchors_p_p.h"
+
 #include "qmlgraphicsitem.h"
-#include <private/qmlgraphicsitem_p.h>
-#include <QDebug>
+#include "qmlgraphicsitem_p.h"
+
 #include <qmlinfo.h>
 
+#include <QDebug>
+
 QT_BEGIN_NAMESPACE
 
 QML_DEFINE_TYPE(Qt,4,6,Anchors,QmlGraphicsAnchors)
@@ -1006,7 +1009,7 @@ bool QmlGraphicsAnchorsPrivate::checkVAnchorValid(QmlGraphicsAnchorLine anchor)
     return true;
 }
 
-#include "moc_qmlgraphicsanchors_p.cpp"
+#include <moc_qmlgraphicsanchors_p.cpp>
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
index 507b4d8..2f2ca74 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
@@ -42,9 +42,11 @@
 #ifndef QMLGRAPHICSANCHORS_H
 #define QMLGRAPHICSANCHORS_H
 
-#include <QtCore/QObject>
+#include "qmlgraphicsitem.h"
+
 #include <qml.h>
-#include <qmlgraphicsitem.h>
+
+#include <QtCore/QObject>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
index 5b6d6cf..be3b6dc 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h
@@ -53,8 +53,9 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsanchors_p.h>
-#include "private/qobject_p.h"
+#include "qmlgraphicsanchors_p.h"
+
+#include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
index 8cb597d..670b38b 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
@@ -39,10 +39,12 @@
 **
 ****************************************************************************/
 
-#include <QMovie>
+#include "qmlgraphicsanimatedimage_p.h"
+#include "qmlgraphicsanimatedimage_p_p.h"
+
 #include <qmlengine.h>
-#include <private/qmlgraphicsanimatedimage_p.h>
-#include <private/qmlgraphicsanimatedimage_p_p.h>
+
+#include <QMovie>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
index 79daa0f..a837702 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSANIMATEDIMAGE_H
 #define QMLGRAPHICSANIMATEDIMAGE_H
 
-#include <private/qmlgraphicsimage_p.h>
+#include "qmlgraphicsimage_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
index c24afa0..0d1c749 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsimage_p_p.h>
+#include "qmlgraphicsimage_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
index 71233c6..1964ee4 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
@@ -39,12 +39,14 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsborderimage_p.h>
-#include <private/qmlgraphicsborderimage_p_p.h>
+#include "qmlgraphicsborderimage_p.h"
+#include "qmlgraphicsborderimage_p_p.h"
+
+#include <qmlengine.h>
+
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
-#include <qmlengine.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
index 8c10a87..cf3c518 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
@@ -42,8 +42,9 @@
 #ifndef QMLGRAPHICSBORDERIMAGE_H
 #define QMLGRAPHICSBORDERIMAGE_H
 
+#include "qmlgraphicsimagebase_p.h"
+
 #include <QtNetwork/qnetworkreply.h>
-#include <private/qmlgraphicsimagebase_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
index 50d81cd..51ebb02 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsimagebase_p_p.h>
-#include <private/qmlgraphicsscalegrid_p_p.h>
+#include "qmlgraphicsimagebase_p_p.h"
+#include "qmlgraphicsscalegrid_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicseffects.cpp b/src/declarative/graphicsitems/qmlgraphicseffects.cpp
index 0523fd5..e1f5687 100644
--- a/src/declarative/graphicsitems/qmlgraphicseffects.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicseffects.cpp
@@ -38,7 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include <qml.h>
+
 #include <QtGui/qgraphicseffect.h>
 
 QML_DECLARE_TYPE(QGraphicsEffect)
diff --git a/src/declarative/graphicsitems/qmlgraphicsevents.cpp b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
index 24214ea..9958dea 100644
--- a/src/declarative/graphicsitems/qmlgraphicsevents.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsevents_p_p.h>
+#include "qmlgraphicsevents_p_p.h"
 
 QT_BEGIN_NAMESPACE
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
index 567a509..b07fd88 100644
--- a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <qml.h>
+
 #include <QtCore/qobject.h>
 #include <QtGui/qevent.h>
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
index 806b72f..89c7657 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsflickable_p.h>
-#include <private/qmlgraphicsflickable_p_p.h>
+#include "qmlgraphicsflickable_p.h"
+#include "qmlgraphicsflickable_p_p.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPointer>
@@ -1287,4 +1287,4 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QmlGraphicsFlickableVisibleArea)
 QML_DEFINE_TYPE(Qt,4,6,VisibleArea,QmlGraphicsFlickableVisibleArea)
 
-#include "qmlgraphicsflickable.moc"
+#include <qmlgraphicsflickable.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
index 9610ac1..aa29f3e 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSFLICKABLE_H
 #define QMLGRAPHICSFLICKABLE_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
index 4953aa0..b19a08c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
@@ -53,12 +53,15 @@
 // We mean it.
 //
 
-#include "qdatetime.h"
-#include <private/qmlgraphicsflickable_p.h>
-#include <private/qmlgraphicsitem_p.h>
-#include "qml.h"
-#include <private/qmltimeline_p_p.h>
-#include <private/qmlanimation_p_p.h>
+#include "qmlgraphicsflickable_p.h"
+
+#include "qmlgraphicsitem_p.h"
+
+#include <qml.h>
+#include <qmltimeline_p_p.h>
+#include <qmlanimation_p_p.h>
+
+#include <qdatetime.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
index cbb5581..ff8995b 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
@@ -39,11 +39,14 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsflipable_p.h>
-#include <private/qmlgraphicsitem_p.h>
-#include "QtGui/qgraphicstransform.h"
+#include "qmlgraphicsflipable_p.h"
+
+#include "qmlgraphicsitem_p.h"
+
 #include <qmlinfo.h>
 
+#include <QtGui/qgraphicstransform.h>
+
 QT_BEGIN_NAMESPACE
 
 QML_DEFINE_TYPE(Qt,4,6,Flipable,QmlGraphicsFlipable)
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
index 8f075ac..c189786 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLGRAPHICSFLIPABLE_H
 #define QMLGRAPHICSFLIPABLE_H
 
+#include "qmlgraphicsitem.h"
+
 #include <QtCore/QObject>
 #include <QtGui/QTransform>
-#include <qmlgraphicsitem.h>
 #include <QtGui/qvector3d.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
index 8cd59f4..333b689 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
@@ -39,7 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsfocuspanel_p.h>
+#include "qmlgraphicsfocuspanel_p.h"
+
 #include <QtGui/qgraphicsscene.h>
 #include <QEvent>
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
index d1824e7..4c5cc14 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSFOCUSPANEL_H
 #define QMLGRAPHICSFOCUSPANEL_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
index f1ddac0..828756c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
@@ -39,8 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsfocusscope_p.h>
-
+#include "qmlgraphicsfocusscope_p.h"
 
 QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,FocusScope,QmlGraphicsFocusScope)
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
index 3744240..0ea9da5 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSFOCUSSCOPE_H
 #define QMLGRAPHICSFOCUSSCOPE_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
index 2ae18f9..275d38d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
@@ -39,11 +39,13 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsgraphicsobjectcontainer_p.h>
+#include "qmlgraphicsgraphicsobjectcontainer_p.h"
+
+#include "qmlgraphicsitem_p.h"
+
 #include <QGraphicsObject>
 #include <QGraphicsWidget>
 #include <QGraphicsSceneResizeEvent>
-#include <private/qmlgraphicsitem_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -225,6 +227,6 @@ void QmlGraphicsGraphicsObjectContainerPrivate::_q_updateSize()
     }*/
 }
 
-#include "moc_qmlgraphicsgraphicsobjectcontainer_p.cpp"
+#include <moc_qmlgraphicsgraphicsobjectcontainer_p.cpp>
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
index 7d16685..1091145 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
 #define QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
index f31e586..f4d94aa 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
@@ -39,12 +39,14 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsgridview_p.h>
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include <private/qlistmodelinterface_p.h>
-#include <private/qmleasefollow_p.h>
-#include <private/qmlgraphicsflickable_p_p.h>
+#include "qmlgraphicsgridview_p.h"
 
+#include "qmlgraphicsvisualitemmodel_p.h"
+#include "qmlgraphicsflickable_p_p.h"
+
+#include <qmleasefollow_p.h>
+
+#include <qlistmodelinterface_p.h>
 #include <QKeyEvent>
 
 QT_BEGIN_NAMESPACE
@@ -1681,4 +1683,4 @@ QML_DEFINE_TYPE(Qt, 4,6, GridView, QmlGraphicsGridView)
 
 QT_END_NAMESPACE
 
-#include "qmlgraphicsgridview.moc"
+#include <qmlgraphicsgridview.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h
index 99515a3..1615469 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSGRIDVIEW_H
 #define QMLGRAPHICSGRIDVIEW_H
 
-#include <private/qmlgraphicsflickable_p.h>
+#include "qmlgraphicsflickable_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
index c75b9ce..38df0c7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsimage_p.h>
-#include <private/qmlgraphicsimage_p_p.h>
+#include "qmlgraphicsimage_p.h"
+#include "qmlgraphicsimage_p_p.h"
 
 #include <QKeyEvent>
 #include <QPainter>
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p.h
index 5d1228d..2547b78 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimage_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimage_p.h
@@ -42,8 +42,9 @@
 #ifndef QMLGRAPHICSIMAGE_H
 #define QMLGRAPHICSIMAGE_H
 
+#include "qmlgraphicsimagebase_p.h"
+
 #include <QtNetwork/qnetworkreply.h>
-#include <private/qmlgraphicsimagebase_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
index 93bccb6..f6b4e51 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
-#include <private/qmlgraphicsimagebase_p_p.h>
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsimagebase_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
index e11e6c1..b7ed7b6 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
@@ -39,13 +39,15 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsimagebase_p.h>
-#include <private/qmlgraphicsimagebase_p_p.h>
+#include "qmlgraphicsimagebase_p.h"
+#include "qmlgraphicsimagebase_p_p.h"
+
+#include <qmlengine.h>
+#include <qmlpixmapcache_p.h>
+
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
-#include <qmlengine.h>
-#include <private/qmlpixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
index 4936794..61ea975 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSIMAGEBASE_H
 #define QMLGRAPHICSIMAGEBASE_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
index 7ce413c..44b2332 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h
@@ -53,7 +53,8 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsitem_p.h"
+
 #include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 1bf1089..1b2861d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -39,6 +39,19 @@
 **
 ****************************************************************************/
 
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsitem.h"
+
+#include "qmlgraphicsevents_p_p.h"
+
+#include <qfxperf_p_p.h>
+#include <qmlengine.h>
+#include <qmlopenmetaobject_p.h>
+#include <qmlstate_p.h>
+#include <qmlview.h>
+#include <qmlstategroup_p.h>
+#include <qmlcomponent.h>
+
 #include <QDebug>
 #include <QPen>
 #include <QFile>
@@ -47,22 +60,9 @@
 #include <QNetworkRequest>
 #include <QGraphicsSceneMouseEvent>
 #include <QtScript/qscriptengine.h>
-#include <private/qfxperf_p_p.h>
 #include <QtGui/qgraphicstransform.h>
 #include <QtGui/qgraphicseffect.h>
-
-#include <qmlengine.h>
-#include <private/qmlopenmetaobject_p.h>
-#include <private/qmlstate_p.h>
-#include <private/qlistmodelinterface_p.h>
-
-#include "qmlview.h"
-#include <private/qmlstategroup_p.h>
-
-#include <private/qmlgraphicsitem_p.h>
-#include "qmlgraphicsitem.h"
-#include <private/qmlgraphicsevents_p_p.h>
-#include <qmlcomponent.h>
+#include <qlistmodelinterface_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -3033,8 +3033,8 @@ int QmlGraphicsItemPrivate::restart(QTime &t)
     return n;
 }
 
-#include "qmlgraphicsitem.moc"
-#include "moc_qmlgraphicsitem.cpp"
+#include <qmlgraphicsitem.moc>
+#include <moc_qmlgraphicsitem.cpp>
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h
index d092896..df8c634 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.h
@@ -42,10 +42,11 @@
 #ifndef QMLGRAPHICSITEM_H
 #define QMLGRAPHICSITEM_H
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
 #include <qml.h>
 #include <qmlcomponent.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QList>
 #include <QtGui/qgraphicsitem.h>
 #include <QtGui/qgraphicstransform.h>
 #include <QtGui/qfont.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
index a76a7f7..82950c2 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
@@ -53,17 +53,21 @@
 // We mean it.
 //
 
-#include <qmlgraphicsitem.h>
-#include <private/qmlstate_p.h>
-#include <private/qmlgraphicsanchors_p.h>
-#include <private/qmlnullablevalue_p_p.h>
-#include <private/qmlgraphicsanchors_p_p.h>
+#include "qmlgraphicsitem.h"
+
+#include "qmlgraphicsanchors_p.h"
+#include "qmlgraphicsanchors_p_p.h"
+
+#include <qmlstate_p.h>
+#include <qmlnullablevalue_p_p.h>
 #include <qml.h>
 #include <qmlcontext.h>
+
 #include <QtCore/qlist.h>
-#include <private/qgraphicsitem_p.h>
 #include <QtCore/qdebug.h>
 
+#include <private/qgraphicsitem_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QNetworkReply;
diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
index fa761a2..7227eb0 100644
--- a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
@@ -39,8 +39,10 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicslayoutitem_p.h>
+#include "qmlgraphicslayoutitem_p.h"
+
 #include <QDebug>
+
 #include <limits.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
index 1acb5c1..3278b63 100644
--- a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
@@ -41,8 +41,9 @@
 
 #ifndef QMLGRAPHICSGRAPHICSLAYOUTITEM_H
 #define QMLGRAPHICSGRAPHICSLAYOUTITEM_H
+#include "qmlgraphicsitem.h"
+
 #include <QGraphicsLayoutItem>
-#include <qmlgraphicsitem.h>
 #include <QSizeF>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index 7a4e02c..658cfaa 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -39,13 +39,15 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsflickable_p_p.h>
-#include <private/qmleasefollow_p.h>
-#include <private/qlistmodelinterface_p.h>
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include <private/qmlgraphicslistview_p.h>
+#include "qmlgraphicslistview_p.h"
+
+#include "qmlgraphicsflickable_p_p.h"
+#include "qmlgraphicsvisualitemmodel_p.h"
+
+#include <qmleasefollow_p.h>
 #include <qmlexpression.h>
 
+#include <qlistmodelinterface_p.h>
 #include <QKeyEvent>
 
 QT_BEGIN_NAMESPACE
@@ -2497,4 +2499,4 @@ QML_DEFINE_TYPE(Qt,4,6,ListView,QmlGraphicsListView)
 
 QT_END_NAMESPACE
 
-#include "qmlgraphicslistview.moc"
+#include <qmlgraphicslistview.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
index 241fb05..6dc131c 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSLISTVIEW_H
 #define QMLGRAPHICSLISTVIEW_H
 
-#include <private/qmlgraphicsflickable_p.h>
+#include "qmlgraphicsflickable_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
index 7c3a8f1..86239cf 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsloader_p_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlgraphicsloader_p_p.h"
+
+#include <qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -396,6 +397,6 @@ QmlGraphicsItem *QmlGraphicsLoader::item() const
     return d->item;
 }
 
-#include "moc_qmlgraphicsloader_p.cpp"
+#include <moc_qmlgraphicsloader_p.cpp>
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p.h
index bca65fa..88cc70d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsloader_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSLOADER_H
 #define QMLGRAPHICSLOADER_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
index 7c1d9bc..569e1a5 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h
@@ -53,8 +53,9 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
-#include <private/qmlgraphicsloader_p.h>
+#include "qmlgraphicsloader_p.h"
+
+#include "qmlgraphicsitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
index 2aa9397..159fc29 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
@@ -39,11 +39,12 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsmouseregion_p.h>
-#include <private/qmlgraphicsmouseregion_p_p.h>
-#include <private/qmlgraphicsevents_p_p.h>
-#include <QGraphicsSceneMouseEvent>
+#include "qmlgraphicsmouseregion_p.h"
+#include "qmlgraphicsmouseregion_p_p.h"
+
+#include "qmlgraphicsevents_p_p.h"
 
+#include <QGraphicsSceneMouseEvent>
 
 QT_BEGIN_NAMESPACE
 static const qreal DragThreshold = 5;
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
index 998183d..0ddad1b 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSMOUSEREGION_H
 #define QMLGRAPHICSMOUSEREGION_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h
index dc43ad5..0f1b0d4 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h
@@ -53,10 +53,11 @@
 // We mean it.
 //
 
-#include "qdatetime.h"
-#include "qbasictimer.h"
-#include "qgraphicssceneevent.h"
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsitem_p.h"
+
+#include <qdatetime.h>
+#include <qbasictimer.h>
+#include <qgraphicssceneevent.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
index a31f08f..146b1e4 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicspainteditem_p.h>
-#include <private/qmlgraphicspainteditem_p_p.h>
+#include "qmlgraphicspainteditem_p.h"
+#include "qmlgraphicspainteditem_p_p.h"
 
 #include <QDebug>
 #include <QPen>
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
index d59f6d1..ab21f36 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
@@ -42,8 +42,7 @@
 #ifndef QMLGRAPHICSIMAGEITEM_H
 #define QMLGRAPHICSIMAGEITEM_H
 
-#include <qmlgraphicsitem.h>
-
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
index 2eace4c..6bcc51a 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
index 6286dd3..63c7658 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
@@ -39,10 +39,22 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsparticles_p.h"
+
+#include "qmlgraphicsitem_p.h"
+
+#include <qmlpixmapcache_p.h>
+#include <qfxperf_p_p.h>
+#include <qmlanimation_p_p.h>
+
+#include <QNetworkReply>
+#include <QPainter>
+#include <QtGui/qdrawutil.h>
+#include <QVarLengthArray>
 
 #include <stdlib.h>
 #include <math.h>
+
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #define M_PI_2 (M_PI / 2.)
@@ -50,15 +62,6 @@
 #ifndef INT_MAX
 #define INT_MAX 2147483647
 #endif
-#include <private/qmlpixmapcache_p.h>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlanimation_p_p.h>
-#include <QNetworkReply>
-
-#include <private/qmlgraphicsparticles_p.h>
-#include <QPainter>
-#include <QtGui/qdrawutil.h>
-#include <QVarLengthArray>
 
 QT_BEGIN_NAMESPACE
 #define PI_SQR 9.8696044
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
index 3cb3ff6..c34d55b 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSPARTICLES_H
 #define QMLGRAPHICSPARTICLES_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
index 2fa965a..18f27af 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp
@@ -39,12 +39,14 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicspath_p.h>
-#include <private/qmlgraphicspath_p_p.h>
-#include <private/qfxperf_p_p.h>
-#include <private/qbezier_p.h>
+#include "qmlgraphicspath_p.h"
+#include "qmlgraphicspath_p_p.h"
+
+#include <qfxperf_p_p.h>
+
 #include <QSet>
 
+#include <private/qbezier_p.h>
 
 QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,Path,QmlGraphicsPath)
diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h
index 30a377e..2b4b0fd 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspath_p.h
@@ -42,11 +42,12 @@
 #ifndef QMLGRAPHICSPATH_H
 #define QMLGRAPHICSPATH_H
 
-#include <QtCore/QObject>
-#include <QtGui/QPainterPath>
+#include "qmlgraphicsitem.h"
+
 #include <qml.h>
-#include <qmlgraphicsitem.h>
 
+#include <QtCore/QObject>
+#include <QtGui/QPainterPath>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h
index 1374ede..04342a8 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h
@@ -53,10 +53,11 @@
 // We mean it.
 //
 
-#include "private/qobject_p.h"
-#include <private/qmlgraphicspath_p.h>
-#include "qml.h"
+#include "qmlgraphicspath_p.h"
 
+#include <qml.h>
+
+#include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 class QmlGraphicsPathPrivate : public QObjectPrivate
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
index 92751a0..705462a 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
@@ -39,17 +39,19 @@
 **
 ****************************************************************************/
 
-#include <math.h>
+#include "qmlgraphicspathview_p.h"
+#include "qmlgraphicspathview_p_p.h"
+
+#include <qmlstate_p.h>
+#include <qmlopenmetaobject_p.h>
+
 #include <QDebug>
 #include <QEvent>
-#include <private/qmlstate_p.h>
-#include <private/qlistmodelinterface_p.h>
-#include <private/qmlopenmetaobject_p.h>
-
-#include <private/qmlgraphicspathview_p.h>
-#include <private/qmlgraphicspathview_p_p.h>
+#include <qlistmodelinterface_p.h>
 #include <QGraphicsSceneEvent>
 
+#include <math.h>
+
 static const int FlickThreshold = 5;
 
 QT_BEGIN_NAMESPACE
@@ -892,4 +894,4 @@ QObject *QmlGraphicsPathView::qmlAttachedProperties(QObject *obj)
 
 QT_END_NAMESPACE
 
-#include "qmlgraphicspathview.moc"
+#include <qmlgraphicspathview.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
index 38f1cd8..17106a2 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
@@ -42,8 +42,8 @@
 #ifndef QMLGRAPHICSPATHVIEW_H
 #define QMLGRAPHICSPATHVIEW_H
 
-#include <qmlgraphicsitem.h>
-#include <private/qmlgraphicspath_p.h>
+#include "qmlgraphicsitem.h"
+#include "qmlgraphicspath_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
index 4987b9c..7ffe6ac 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
@@ -53,12 +53,15 @@
 // We mean it.
 //
 
-#include "qdatetime.h"
-#include <private/qmlgraphicspathview_p.h>
-#include <private/qmlgraphicsitem_p.h>
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include "qml.h"
-#include <private/qmlanimation_p_p.h>
+#include "qmlgraphicspathview_p.h"
+
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsvisualitemmodel_p.h"
+
+#include <qml.h>
+#include <qmlanimation_p_p.h>
+
+#include <qdatetime.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
index 07bbf1f..db0cc7c 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
@@ -39,15 +39,17 @@
 **
 ****************************************************************************/
 
+#include "qmlgraphicspositioners_p.h"
+#include "qmlgraphicspositioners_p_p.h"
+
+#include <qml.h>
+#include <qmlstate_p.h>
+#include <qmlstategroup_p.h>
+#include <qmlstateoperations_p.h>
+#include <qfxperf_p_p.h>
+
 #include <QDebug>
 #include <QCoreApplication>
-#include "qml.h"
-#include <private/qmlstate_p.h>
-#include <private/qmlstategroup_p.h>
-#include <private/qmlstateoperations_p.h>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlgraphicspositioners_p.h>
-#include <private/qmlgraphicspositioners_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
index a0665ae..03e0f41 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
@@ -42,11 +42,12 @@
 #ifndef QMLGRAPHICSLAYOUTS_H
 #define QMLGRAPHICSLAYOUTS_H
 
+#include "qmlgraphicsitem.h"
+
+#include <qmlstate_p.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <qmlgraphicsitem.h>
-#include <private/qmlstate_p.h>
-
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
index 676f94c..b079f6a 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
@@ -53,13 +53,16 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicspositioners_p.h"
+
+#include "qmlgraphicsitem_p.h"
+
+#include <qmlstate_p.h>
+#include <qmltransitionmanager_p_p.h>
+#include <qmlstateoperations_p.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <private/qmlgraphicspositioners_p.h>
-#include <private/qmlstate_p.h>
-#include <private/qmltransitionmanager_p_p.h>
-#include <private/qmlstateoperations_p.h>
 #include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
index 9c11bc4..cc09436 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicsrectangle_p_p.h>
+#include "qmlgraphicsrectangle_p.h"
+#include "qmlgraphicsrectangle_p_p.h"
 
 #include <QPainter>
 #include <QtCore/qmath.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
index fe8c403..4f4c1cf 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
@@ -42,9 +42,9 @@
 #ifndef QMLGRAPHICSRECT_H
 #define QMLGRAPHICSRECT_H
 
-#include <qmlgraphicsitem.h>
-#include <QtGui/qbrush.h>
+#include "qmlgraphicsitem.h"
 
+#include <QtGui/qbrush.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h
index d15b2da..c4bbbe4 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
index 4e6fce2..a650999 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
@@ -39,12 +39,14 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicsrepeater_p.h>
-#include <private/qmlgraphicsrepeater_p_p.h>
-#include <private/qmllistaccessor_p.h>
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qmlgraphicsrepeater_p.h"
+#include "qmlgraphicsrepeater_p_p.h"
 
+#include "qmlgraphicsvisualitemmodel_p.h"
+
+#include <qmllistaccessor_p.h>
+
+#include <qlistmodelinterface_p.h>
 
 QT_BEGIN_NAMESPACE
 QmlGraphicsRepeaterPrivate::QmlGraphicsRepeaterPrivate()
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
index c5d0166..61f82d7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSREPEATER_H
 #define QMLGRAPHICSREPEATER_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
index c2a8606..e6d7bfd 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h
@@ -53,10 +53,11 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
-#include <private/qmlgraphicsrepeater_p.h>
-#include <QPointer>
+#include "qmlgraphicsrepeater_p.h"
+
+#include "qmlgraphicsitem_p.h"
 
+#include <QPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
index 142384b..3fd14bb 100644
--- a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp
@@ -39,11 +39,12 @@
 **
 ****************************************************************************/
 
-#include <QBuffer>
+#include "qmlgraphicsscalegrid_p_p.h"
+
 #include <qml.h>
-#include <QDebug>
-#include <private/qmlgraphicsscalegrid_p_p.h>
 
+#include <QBuffer>
+#include <QDebug>
 
 QT_BEGIN_NAMESPACE
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
index 6a2b773..c7d067d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
@@ -42,12 +42,13 @@
 #ifndef QMLGRAPHICSSCALEGRID_H
 #define QMLGRAPHICSSCALEGRID_H
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
-#include <private/qmlpixmapcache_p.h>
+#include "qmlgraphicsborderimage_p.h"
+
+#include <qmlpixmapcache_p.h>
 #include <qml.h>
-#include <private/qmlgraphicsborderimage_p.h>
 
+#include <QtCore/QString>
+#include <QtCore/QObject>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 650d844..854d503 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlgraphicstext_p_p.h>
+#include "qmlgraphicstext_p.h"
+#include "qmlgraphicstext_p_p.h"
+
+#include <qfxperf_p_p.h>
 
-#include <private/qtextcontrol_p.h>
-#include <private/qfxperf_p_p.h>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTextDocument>
@@ -52,6 +52,8 @@
 #include <QPainter>
 #include <qmath.h>
 
+#include <private/qtextcontrol_p.h>
+
 QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,Text,QmlGraphicsText)
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p.h
index b6a5932..6ca460b 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstext_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSTEXT_H
 #define QMLGRAPHICSTEXT_H
 
-#include <qmlgraphicsitem.h>
+#include "qmlgraphicsitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h
index 8a4c057..0ddae57 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h
@@ -54,8 +54,10 @@
 //
 
 #include "qmlgraphicsitem.h"
-#include <private/qmlgraphicsitem_p.h>
-#include "qml.h"
+#include "qmlgraphicsitem_p.h"
+
+#include <qml.h>
+
 #include <QtGui/qtextlayout.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index 042c43c..747e2fb 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
@@ -39,19 +39,22 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicstextedit_p.h>
-#include <private/qmlgraphicstextedit_p_p.h>
-#include <private/qtextcontrol_p.h>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlgraphicsevents_p_p.h>
+#include "qmlgraphicstextedit_p.h"
+#include "qmlgraphicstextedit_p_p.h"
+
+#include "qmlgraphicsevents_p_p.h"
+
+#include <qfxperf_p_p.h>
+
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTextDocument>
 #include <QGraphicsSceneMouseEvent>
-
 #include <QDebug>
 #include <QPainter>
 
+#include <private/qtextcontrol_p.h>
+
 QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,TextEdit,QmlGraphicsTextEdit)
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
index 1ddfa6b..0fe09f3 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
@@ -42,15 +42,14 @@
 #ifndef QMLGRAPHICSTEXTEDIT_H
 #define QMLGRAPHICSTEXTEDIT_H
 
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlgraphicspainteditem_p.h>
+#include "qmlgraphicstext_p.h"
+#include "qmlgraphicspainteditem_p.h"
 
 #include <QtGui/qtextdocument.h>
 #include <QtGui/qtextoption.h>
 #include <QtGui/qtextcursor.h>
 #include <QtGui/qtextformat.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
index 84965e4..8914bfd 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h
@@ -54,9 +54,9 @@
 //
 
 #include "qmlgraphicsitem.h"
-#include <private/qmlgraphicspainteditem_p_p.h>
-#include "qml.h"
+#include "qmlgraphicspainteditem_p_p.h"
 
+#include <qml.h>
 
 QT_BEGIN_NAMESPACE
 class QTextLayout;
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
index d3e8ad6..ff6c32c 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
-#include <private/qmlgraphicstextinput_p.h>
-#include <private/qmlgraphicstextinput_p_p.h>
-#include "qmlinfo.h"
+#include "qmlgraphicstextinput_p.h"
+#include "qmlgraphicstextinput_p_p.h"
+
+#include <qmlinfo.h>
+
 #include <QValidator>
 #include <QApplication>
 #include <QFontMetrics>
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
index a31ced2..c22c637 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
@@ -42,8 +42,9 @@
 #ifndef QMLGRAPHICSTEXTINPUT_H
 #define QMLGRAPHICSTEXTINPUT_H
 
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlgraphicspainteditem_p.h>
+#include "qmlgraphicstext_p.h"
+#include "qmlgraphicspainteditem_p.h"
+
 #include <QGraphicsSceneMouseEvent>
 #include <QIntValidator>
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
index efb05fe..9eb6e07 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h
@@ -42,11 +42,16 @@
 #ifndef QMLGRAPHICSTEXTINPUT_P_H
 #define QMLGRAPHICSTEXTINPUT_P_H
 
-#include <private/qmlgraphicstextinput_p.h>
-#include "qml.h"
-#include <private/qmlgraphicspainteditem_p_p.h>
-#include "private/qlinecontrol_p.h"
+#include "qmlgraphicstextinput_p.h"
+
+#include "qmlgraphicspainteditem_p_p.h"
+
+#include <qml.h>
+
 #include <QPointer>
+
+#include <private/qlinecontrol_p.h>
+
 //
 //  W A R N I N G
 //  -------------
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index eaf25d1..b973d6c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -39,22 +39,26 @@
 **
 ****************************************************************************/
 
-#include <private/qlistmodelinterface_p.h>
+#include "qmlgraphicsvisualitemmodel_p.h"
+
 #include "qmlgraphicsitem.h"
+
 #include <qmlcontext.h>
 #include <qmlexpression.h>
-#include <private/qmlpackage_p.h>
-#include "qhash.h"
-#include "qlist.h"
-#include "private/qobject_p.h"
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qmlopenmetaobject_p.h>
-#include <private/qmllistaccessor_p.h>
-#include "qmlinfo.h"
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include "private/qguard_p.h"
+#include <qmlpackage_p.h>
+#include <qmlopenmetaobject_p.h>
+#include <qmllistaccessor_p.h>
+#include <qmlinfo.h>
+
+#include <qlistmodelinterface_p.h>
+#include <qhash.h>
+#include <qlist.h>
+#include <qmetaobjectbuilder_p.h>
 #include <QtCore/qdebug.h>
 
+#include <private/qobject_p.h>
+#include <private/qguard_p.h>
+
 QML_DECLARE_TYPE(QListModelInterface)
 
 QT_BEGIN_NAMESPACE
@@ -1055,4 +1059,4 @@ QML_DEFINE_TYPE(Qt,4,6,VisualDataModel,QmlGraphicsVisualDataModel)
 
 QT_END_NAMESPACE
 
-#include "qmlgraphicsvisualitemmodel.moc"
+#include <qmlgraphicsvisualitemmodel.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
index 9855867..4e76aee 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
@@ -42,10 +42,10 @@
 #ifndef QMLGRAPHICSVISUALDATAMODEL_H
 #define QMLGRAPHICSVISUALDATAMODEL_H
 
-#include <QtCore/qobject.h>
-#include <QtCore/qabstractitemmodel.h>
 #include <qml.h>
 
+#include <QtCore/qobject.h>
+#include <QtCore/qabstractitemmodel.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index ffbbdf9..d2b8289 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -39,6 +39,15 @@
 **
 ****************************************************************************/
 
+#include "qmlgraphicswebview_p.h"
+#include "qmlgraphicswebview_p_p.h"
+
+#include "qmlgraphicspainteditem_p_p.h"
+
+#include <qml.h>
+#include <qmlengine.h>
+#include <qmlstate_p.h>
+
 #include <QDebug>
 #include <QPen>
 #include <QFile>
@@ -52,15 +61,7 @@
 #include <QtWebKit/QWebFrame>
 #include <QtWebKit/QWebElement>
 #include <QtWebKit/QWebSettings>
-
-#include "qml.h"
-#include "qmlengine.h"
-#include <private/qmlstate_p.h>
-#include <private/qlistmodelinterface_p.h>
-
-#include <private/qmlgraphicswebview_p.h>
-#include <private/qmlgraphicswebview_p_p.h>
-#include <private/qmlgraphicspainteditem_p_p.h>
+#include <qlistmodelinterface_p.h>
 
 QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,WebView,QmlGraphicsWebView)
@@ -1321,4 +1322,4 @@ QWebPage *QmlGraphicsWebPage::createWindow(WebWindowType type)
 
 QT_END_NAMESPACE
 
-#include "qmlgraphicswebview.moc"
+#include <qmlgraphicswebview.moc>
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index a1c0d57..0b2ba07 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLGRAPHICSWEBVIEW_H
 #define QMLGRAPHICSWEBVIEW_H
 
+#include "qmlgraphicspainteditem_p.h"
+
 #include <QtGui/QAction>
 #include <QtCore/QUrl>
-#include <private/qmlgraphicspainteditem_p.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtWebKit/QWebPage>
 
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h
index 5063669..5659059 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h
@@ -43,6 +43,7 @@
 #define QMLGRAPHICSWEBVIEW_P_H
 
 #include <qml.h>
+
 #include <QtWebKit/QWebPage>
 
 QT_BEGIN_HEADER