Remove include styles that rely on configure.

May help modularization (syncqt and configure are Qt-specific).

122 files changed, 297 insertions, 298 deletions

diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp
index 72f613a..40995e7 100644
--- a/src/declarative/debugger/qmldebug.cpp
+++ b/src/declarative/debugger/qmldebug.cpp
@@ -41,7 +41,7 @@
 #include "qmldebug_p.h"
 #include "qmldebugclient_p.h"
 #include <private/qobject_p.h>
-#include <private/qmlenginedebug_p.h>
+#include "qmlenginedebug_p.h"
 
 class QmlEngineDebugClient : public QmlDebugClient
 {
diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp
index 2cd1301..3a76b36 100644
--- a/src/declarative/debugger/qmldebugclient.cpp
+++ b/src/declarative/debugger/qmldebugclient.cpp
@@ -41,7 +41,7 @@
 
 #include "qmldebugclient_p.h"
 #include <private/qobject_p.h>
-#include <private/qpacketprotocol_p.h>
+#include "qpacketprotocol_p.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
 
diff --git a/src/declarative/debugger/qmldebugservice.cpp b/src/declarative/debugger/qmldebugservice.cpp
index b54ad63..3c09585 100644
--- a/src/declarative/debugger/qmldebugservice.cpp
+++ b/src/declarative/debugger/qmldebugservice.cpp
@@ -44,7 +44,7 @@
 #include <QtNetwork/qtcpserver.h>
 #include <QtNetwork/qtcpsocket.h>
 #include <private/qobject_p.h>
-#include <private/qpacketprotocol_p.h>
+#include "qpacketprotocol_p.h"
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index d1e2ee8..8d059bf 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -14,7 +14,7 @@ exists("qml_enable_gcov") {
     LIBS += -lgcov
 }
 
-INCLUDEPATH += ../../include/QtDeclarative
+INCLUDEPATH += 3rdparty util graphicsitems debugger qml
 
 include(../qbase.pri)
 
diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri
index da3a0d4..5675130 100644
--- a/src/declarative/graphicsitems/graphicsitems.pri
+++ b/src/declarative/graphicsitems/graphicsitems.pri
@@ -85,4 +85,3 @@ contains(QT_CONFIG, webkit) {
     HEADERS += graphicsitems/qmlgraphicswebview_p.h
     HEADERS += graphicsitems/qmlgraphicswebview_p_p.h
 }
-
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/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
index 8044ba7..210052e 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h
@@ -57,8 +57,8 @@
 #include "qmlgraphicsflickable_p.h"
 #include "qmlgraphicsitem_p.h"
 #include "qml.h"
-#include "private/qmltimeline_p_p.h"
-#include "private/qmlanimation_p_p.h"
+#include "qmltimeline_p_p.h"
+#include "qmlanimation_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
index b964e22..c271010 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlgraphicsflipable_p.h"
-#include "private/qmlgraphicsitem_p.h"
+#include "qmlgraphicsitem_p.h"
 #include "QtGui/qgraphicstransform.h"
 #include <qmlinfo.h>
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
index 294a374..bdad6ae 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
@@ -43,7 +43,7 @@
 #include <QGraphicsObject>
 #include <QGraphicsWidget>
 #include <QGraphicsSceneResizeEvent>
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
index 81128e7..f223413 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include "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 "qmlgraphicsvisualitemmodel_p.h"
+#include "qlistmodelinterface_p.h"
+#include "qmleasefollow_p.h"
+#include "qmlgraphicsflickable_p_p.h"
 
 #include <QKeyEvent>
 
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/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
index 8374c9f..c6954fb 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
@@ -45,7 +45,7 @@
 #include <QNetworkReply>
 #include <QFile>
 #include <qmlengine.h>
-#include <private/qmlpixmapcache_p.h>
+#include "qmlpixmapcache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index db59cf2..3ca9fce 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -47,21 +47,21 @@
 #include <QNetworkRequest>
 #include <QGraphicsSceneMouseEvent>
 #include <QtScript/qscriptengine.h>
-#include <private/qfxperf_p_p.h>
+#include "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 "qmlopenmetaobject_p.h"
+#include "qmlstate_p.h"
+#include "qlistmodelinterface_p.h"
 
 #include "qmlview.h"
-#include <private/qmlstategroup_p.h>
+#include "qmlstategroup_p.h"
 
 #include "qmlgraphicsitem_p.h"
 #include "qmlgraphicsitem.h"
-#include <private/qmlgraphicsevents_p_p.h>
+#include "qmlgraphicsevents_p_p.h"
 #include <qmlcomponent.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
index 0c722ac..0c6960e 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
@@ -54,10 +54,10 @@
 //
 
 #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 "qmlstate_p.h"
+#include "qmlgraphicsanchors_p.h"
+#include "qmlnullablevalue_p_p.h"
+#include "qmlgraphicsanchors_p_p.h"
 #include <qml.h>
 #include <qmlcontext.h>
 #include <QtCore/qlist.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
index 35905b5..1acb5c1 100644
--- a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLGRAPHICSGRAPHICSLAYOUTITEM_H
 #define QMLGRAPHICSGRAPHICSLAYOUTITEM_H
 #include <QGraphicsLayoutItem>
-#include <QmlGraphicsItem>
+#include <qmlgraphicsitem.h>
 #include <QSizeF>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index 9dd2ab4..61545ec 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qmlgraphicsflickable_p_p.h"
-#include <private/qmleasefollow_p.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qmlgraphicsflickable_p_p.h"
+#include "qmleasefollow_p.h"
+#include "qlistmodelinterface_p.h"
 #include "qmlgraphicsvisualitemmodel_p.h"
 #include "qmlgraphicslistview_p.h"
 #include <qmlexpression.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
index cc74056..543c70a 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 c841efe..7b2c542 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlgraphicsloader_p_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
index a938ecf..a49bbdf 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 f15d9f6..a1dbe14 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qmlgraphicsitem_p.h"
+#include "qmlgraphicsitem_p.h"
 
 #include <stdlib.h>
 #include <math.h>
@@ -50,9 +50,9 @@
 #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 "qmlpixmapcache_p.h"
+#include "qfxperf_p_p.h"
+#include "qmlanimation_p_p.h"
 #include <QNetworkReply>
 
 #include "qmlgraphicsparticles_p.h"
diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
index 1791074..269552a 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp
@@ -41,7 +41,7 @@
 
 #include "qmlgraphicspath_p.h"
 #include "qmlgraphicspath_p_p.h"
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <private/qbezier_p.h>
 #include <QSet>
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
index 92751a0..3a77274 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
@@ -42,12 +42,12 @@
 #include <math.h>
 #include <QDebug>
 #include <QEvent>
-#include <private/qmlstate_p.h>
-#include <private/qlistmodelinterface_p.h>
-#include <private/qmlopenmetaobject_p.h>
+#include "qmlstate_p.h"
+#include "qlistmodelinterface_p.h"
+#include "qmlopenmetaobject_p.h"
 
-#include <private/qmlgraphicspathview_p.h>
-#include <private/qmlgraphicspathview_p_p.h>
+#include "qmlgraphicspathview_p.h"
+#include "qmlgraphicspathview_p_p.h"
 #include <QGraphicsSceneEvent>
 
 static const int FlickThreshold = 5;
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
index 38f1cd8..fef0798 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
@@ -43,7 +43,7 @@
 #define QMLGRAPHICSPATHVIEW_H
 
 #include <qmlgraphicsitem.h>
-#include <private/qmlgraphicspath_p.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 a0f2a3d..a61968c 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h
@@ -58,7 +58,7 @@
 #include "qmlgraphicsitem_p.h"
 #include "qmlgraphicsvisualitemmodel_p.h"
 #include "qml.h"
-#include "private/qmlanimation_p_p.h"
+#include "qmlanimation_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
index 65e63eb..56fd98e 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
@@ -42,12 +42,12 @@
 #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>
+#include "qmlstate_p.h"
+#include "qmlstategroup_p.h"
+#include "qmlstateoperations_p.h"
+#include "qfxperf_p_p.h"
+#include "qmlgraphicspositioners_p.h"
+#include "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..001ad80 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
@@ -45,7 +45,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <qmlgraphicsitem.h>
-#include <private/qmlstate_p.h>
+#include "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 d7a31a3..ced545e 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h
@@ -53,13 +53,13 @@
 // We mean it.
 //
 
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsitem_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 "qmlgraphicspositioners_p.h"
+#include "qmlstate_p.h"
+#include "qmltransitionmanager_p_p.h"
+#include "qmlstateoperations_p.h"
 #include <QtCore/QTimer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
index be10c24..967a29b 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
@@ -41,9 +41,9 @@
 
 #include "qmlgraphicsrepeater_p.h"
 #include "qmlgraphicsrepeater_p_p.h"
-#include <private/qmllistaccessor_p.h>
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qmllistaccessor_p.h"
+#include "qmlgraphicsvisualitemmodel_p.h"
+#include "qlistmodelinterface_p.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
index 82e0a94..4283c19 100644
--- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QObject>
-#include <private/qmlpixmapcache_p.h>
+#include "qmlpixmapcache_p.h"
 #include <qml.h>
 #include "qmlgraphicsborderimage_p.h"
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index d0aec8d..2d2c523 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -43,7 +43,7 @@
 #include "qmlgraphicstext_p_p.h"
 
 #include <private/qtextcontrol_p.h>
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTextDocument>
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index 5f5269f..94c4a1e 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
@@ -42,8 +42,8 @@
 #include "qmlgraphicstextedit_p.h"
 #include "qmlgraphicstextedit_p_p.h"
 #include <private/qtextcontrol_p.h>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlgraphicsevents_p_p.h>
+#include "qfxperf_p_p.h"
+#include "qmlgraphicsevents_p_p.h"
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTextDocument>
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
index 1ddfa6b..28d7d83 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
@@ -42,8 +42,8 @@
 #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>
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index e8ee196..cde1f8a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include <private/qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include "qmlgraphicsitem.h"
 #include <qmlcontext.h>
 #include <qmlexpression.h>
-#include <private/qmlpackage_p.h>
+#include "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 "qmetaobjectbuilder_p.h"
+#include "qmlopenmetaobject_p.h"
+#include "qmllistaccessor_p.h"
 #include "qmlinfo.h"
 #include "qmlgraphicsvisualitemmodel_p.h"
 #include "private/qguard_p.h"
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index e21bda3..0a1587e 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -55,12 +55,12 @@
 
 #include "qml.h"
 #include "qmlengine.h"
-#include <private/qmlstate_p.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qmlstate_p.h"
+#include "qlistmodelinterface_p.h"
 
 #include "qmlgraphicswebview_p.h"
 #include "qmlgraphicswebview_p_p.h"
-#include <private/qmlgraphicspainteditem_p_p.h>
+#include "qmlgraphicspainteditem_p_p.h"
 
 QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,WebView,QmlGraphicsWebView)
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index 7ff51f3..1e44263 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -44,7 +44,7 @@
 
 #include <QtGui/QAction>
 #include <QtCore/QUrl>
-#include <private/qmlgraphicspainteditem_p.h>
+#include "qmlgraphicspainteditem_p.h"
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtWebKit/QWebPage>
 
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index b3bcf42..a27c4fb 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -42,14 +42,14 @@
 #include "qmlbasicscript_p.h"
 #include <QColor>
 #include <QDebug>
-#include <private/qmlengine_p.h>
-#include <private/qmlcontext_p.h>
+#include "qmlengine_p.h"
+#include "qmlcontext_p.h"
 #include <QStack>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlrefcount_p.h>
-#include <private/qmljsast_p.h>
-#include <private/qmljsengine_p.h>
-#include <private/qmlglobal_p.h>
+#include "qfxperf_p_p.h"
+#include "qmlrefcount_p.h"
+#include "qmljsast_p.h"
+#include "qmljsengine_p.h"
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbasicscript_p.h b/src/declarative/qml/qmlbasicscript_p.h
index 57d4fa7..4c4b178 100644
--- a/src/declarative/qml/qmlbasicscript_p.h
+++ b/src/declarative/qml/qmlbasicscript_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/QList>
 #include <QtCore/QByteArray>
 #include <QtCore/QVariant>
-#include <private/qmlparser_p.h>
+#include "qmlparser_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index ef92308..bb9a803 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -45,11 +45,11 @@
 #include <qmlcontext.h>
 #include <qmlinfo.h>
 #include <QVariant>
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <QtCore/qdebug.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmldeclarativedata_p.h>
-#include <private/qmlstringconverters_p.h>
+#include "qmlcontext_p.h"
+#include "qmldeclarativedata_p.h"
+#include "qmlstringconverters_p.h"
 
 Q_DECLARE_METATYPE(QList<QObject *>);
 
diff --git a/src/declarative/qml/qmlbindingoptimizations.cpp b/src/declarative/qml/qmlbindingoptimizations.cpp
index 0efa600..5c67241 100644
--- a/src/declarative/qml/qmlbindingoptimizations.cpp
+++ b/src/declarative/qml/qmlbindingoptimizations.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlbindingoptimizations_p.h"
-#include <private/qmlcontext_p.h>
+#include "qmlcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h
index 2cdc07d..1e3723f 100644
--- a/src/declarative/qml/qmlbindingoptimizations_p.h
+++ b/src/declarative/qml/qmlbindingoptimizations_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qmlexpression_p.h>
+#include "qmlexpression_p.h"
 #include <qmlbinding.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp
index deb15dc..4a0577a 100644
--- a/src/declarative/qml/qmlboundsignal.cpp
+++ b/src/declarative/qml/qmlboundsignal.cpp
@@ -40,15 +40,15 @@
 ****************************************************************************/
 
 #include "qmlboundsignal_p.h"
-#include "private/qmetaobjectbuilder_p.h"
-#include "private/qmlengine_p.h"
-#include "private/qmlexpression_p.h"
-#include "private/qmlcontext_p.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qmlengine_p.h"
+#include "qmlexpression_p.h"
+#include "qmlcontext_p.h"
 #include <qmlmetatype.h>
 #include <qml.h>
 #include <qmlcontext.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp
index ef803d0..6b98191 100644
--- a/src/declarative/qml/qmlcleanup.cpp
+++ b/src/declarative/qml/qmlcleanup.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlcleanup_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 /*!
 \internal
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index a4e14b2..ee0c484 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "private/qmlcompiler_p.h"
-#include "private/qmlcompositetypedata_p.h"
-#include <private/qfxperf_p_p.h>
+#include "qmlcompiler_p.h"
+#include "qmlcompositetypedata_p.h"
+#include "qfxperf_p_p.h"
 #include "qmlparser_p.h"
-#include "private/qmlscriptparser_p.h"
+#include "qmlscriptparser_p.h"
 #include <qmlpropertyvaluesource.h>
 #include <qmlcomponent.h>
-#include "private/qmetaobjectbuilder_p.h"
+#include "qmetaobjectbuilder_p.h"
 #include "qmlbasicscript_p.h"
 #include <QColor>
 #include <QDebug>
@@ -54,23 +54,23 @@
 #include <QSizeF>
 #include <QRectF>
 #include <QAtomicInt>
-#include <private/qmlstringconverters_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlstringconverters_p.h"
+#include "qmlengine_p.h"
 #include <qmlengine.h>
 #include <qmlcontext.h>
 #include <qmlmetatype.h>
 #include <QtCore/qdebug.h>
 #include <QtGui/qapplication.h>
-#include "private/qmlcustomparser_p_p.h"
-#include <private/qmlcontext_p.h>
-#include <private/qmlcomponent_p.h>
+#include "qmlcustomparser_p_p.h"
+#include "qmlcontext_p.h"
+#include "qmlcomponent_p.h"
 #include "parser/qmljsast_p.h"
-#include <private/qmlvmemetaobject_p.h>
-#include <private/qmlexpression_p.h>
+#include "qmlvmemetaobject_p.h"
+#include "qmlexpression_p.h"
 #include "qmlmetaproperty_p.h"
 #include "qmlrewrite_p.h"
 #include <qmlscriptstring.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 #include "qmlscriptparser_p.h"
 
@@ -2307,7 +2307,7 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
     return true;
 }
 
-#include <private/qmljsparser_p.h>
+#include "qmljsparser_p.h"
 static QStringList astNodeToStringList(QmlJS::AST::Node *node)
 {
     if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) {
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index b54a62a..6b41a5f 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -57,14 +57,14 @@
 #include <QtCore/qset.h>
 #include <qml.h>
 #include <qmlerror.h>
-#include <private/qmlinstruction_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qmlparser_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qbitfield_p.h>
-#include <private/qmlpropertycache_p.h>
-#include <private/qmlintegercache_p.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmlinstruction_p.h"
+#include "qmlcompositetypemanager_p.h"
+#include "qmlparser_p.h"
+#include "qmlengine_p.h"
+#include "qbitfield_p.h"
+#include "qmlpropertycache_p.h"
+#include "qmlintegercache_p.h"
+#include "qmltypenamecache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 5f8b816..1e03557 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -42,21 +42,21 @@
 #include "qmlcomponent.h"
 #include "qmlcomponent_p.h"
 #include "qmlcompiler_p.h"
-#include "private/qmlcontext_p.h"
-#include "private/qmlcompositetypedata_p.h"
-#include "private/qmlengine_p.h"
+#include "qmlcontext_p.h"
+#include "qmlcompositetypedata_p.h"
+#include "qmlengine_p.h"
 #include "qmlvme_p.h"
 #include "qml.h"
 #include <QStack>
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <QStringList>
 #include <qmlengine.h>
 #include <QFileInfo>
 #include "qmlbinding.h"
 #include <QtCore/qdebug.h>
 #include <QApplication>
-#include <private/qmlbinding_p.h>
-#include <private/qmlglobal_p.h>
+#include "qmlbinding_p.h"
+#include "qmlglobal_p.h"
 
 #include "qmlscriptparser_p.h"
 
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index 61a8a10..c9dfac8 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -57,9 +57,9 @@
 #include <QtCore/QStringList>
 #include <QtCore/QList>
 #include <private/qobject_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qbitfield_p.h>
+#include "qmlengine_p.h"
+#include "qmlcompositetypemanager_p.h"
+#include "qbitfield_p.h"
 #include <qmlerror.h>
 #include <qmlcomponent.h>
 #include <qml.h>
diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h
index 0d2843d..96531982 100644
--- a/src/declarative/qml/qmlcompositetypedata_p.h
+++ b/src/declarative/qml/qmlcompositetypedata_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qglobal.h>
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index fa68951..ca07d84 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include <private/qmlcompositetypedata_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qmlscriptparser_p.h>
+#include "qmlcompositetypedata_p.h"
+#include "qmlcompositetypemanager_p.h"
+#include "qmlscriptparser_p.h"
 #include <qmlengine.h>
 #include <QtNetwork/qnetworkreply.h>
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
 #include <qmlcomponent.h>
-#include <private/qmlcomponent_p.h>
-#include <private/qmlcompiler_p.h>
+#include "qmlcomponent_p.h"
+#include "qmlcompiler_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
index 0abbfb5..f81e594 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -54,8 +54,8 @@
 //
 
 #include <QtCore/qglobal.h>
-#include <private/qmlscriptparser_p.h>
-#include <private/qmlrefcount_p.h>
+#include "qmlscriptparser_p.h"
+#include "qmlrefcount_p.h"
 #include <qmlerror.h>
 #include <qmlengine.h>
 
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 38cbcfa..be483c9 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -40,14 +40,14 @@
 ****************************************************************************/
 
 #include <qmlcontext.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlexpression_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlcontext_p.h"
+#include "qmlexpression_p.h"
+#include "qmlengine_p.h"
 #include <qmlengine.h>
 #include <qscriptengine.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlbindingoptimizations_p.h>
+#include "qmlbindingoptimizations_p.h"
 #include <private/qscriptdeclarativeclass_p.h>
 #include <qmlinfo.h>
 
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index c8d0b2d..4ad524d 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -55,14 +55,14 @@
 
 #include <qmlcontext.h>
 #include <private/qobject_p.h>
-#include <private/qmldeclarativedata_p.h>
+#include "qmldeclarativedata_p.h"
 #include <QtCore/qhash.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtCore/qset.h>
 #include <private/qguard_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlintegercache_p.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmlengine_p.h"
+#include "qmlintegercache_p.h"
+#include "qmltypenamecache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp
index fda284a..acf6203 100644
--- a/src/declarative/qml/qmlcontextscriptclass.cpp
+++ b/src/declarative/qml/qmlcontextscriptclass.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include "qmlcontextscriptclass_p.h"
-#include <private/qmlengine_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmltypenamescriptclass_p.h>
+#include "qmlengine_p.h"
+#include "qmlcontext_p.h"
+#include "qmltypenamescriptclass_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h
index bbd779b..cf91242 100644
--- a/src/declarative/qml/qmlcontextscriptclass_p.h
+++ b/src/declarative/qml/qmlcontextscriptclass_p.h
@@ -55,7 +55,7 @@
 
 #include <QtScript/qscriptclass.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmltypenamecache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index 88a264f..9b09280 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/qxmlstream.h>
 #include <qmlmetatype.h>
 #include <qmlerror.h>
-#include <private/qmlparser_p.h>
+#include "qmlparser_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index f4a137c..596294f 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -41,14 +41,14 @@
 
 #include "qmldom.h"
 #include "qmldom_p.h"
-#include "private/qmlcompositetypedata_p.h"
-#include "private/qmlcompiler_p.h"
-#include "private/qmlengine_p.h"
+#include "qmlcompositetypedata_p.h"
+#include "qmlcompiler_p.h"
+#include "qmlengine_p.h"
 #include <QtCore/QByteArray>
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 #include "qmlscriptparser_p.h"
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 864d07e..0221458 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 
 #include <QtCore/qmetaobject.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcontext_p.h>
+#include "qmlengine_p.h"
+#include "qmlcontext_p.h"
 #include <private/qobject_p.h>
-#include <private/qmlcompiler_p.h>
+#include "qmlcompiler_p.h"
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlglobalscriptclass_p.h>
+#include "qmlglobalscriptclass_p.h"
 
 #include <QScriptClass>
 #include <QNetworkReply>
@@ -58,9 +58,9 @@
 #include <QDebug>
 #include <QMetaObject>
 #include "qml.h"
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <QStack>
-#include "private/qmlbasicscript_p.h"
+#include "qmlbasicscript_p.h"
 #include "qmlengine.h"
 #include "qmlcontext.h"
 #include "qmlexpression.h"
@@ -73,19 +73,19 @@
 #include <QtGui/qsound.h>
 #include <QGraphicsObject>
 #include <qmlcomponent.h>
-#include <private/qmlmetaproperty_p.h>
-#include <private/qmlbinding_p.h>
-#include <private/qmlvme_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmlstringconverters_p.h>
-#include <private/qmlxmlhttprequest_p.h>
-#include <private/qmlsqldatabase_p.h>
-#include <private/qmltypenamescriptclass_p.h>
-#include <private/qmllistscriptclass_p.h>
+#include "qmlmetaproperty_p.h"
+#include "qmlbinding_p.h"
+#include "qmlvme_p.h"
+#include "qmlenginedebug_p.h"
+#include "qmlstringconverters_p.h"
+#include "qmlxmlhttprequest_p.h"
+#include "qmlsqldatabase_p.h"
+#include "qmltypenamescriptclass_p.h"
+#include "qmllistscriptclass_p.h"
 #include <qmlscriptstring.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 #include <QtCore/qcryptographichash.h>
-#include <private/qmlworkerscript_p.h>
+#include "qmlworkerscript_p.h"
 
 #ifdef Q_OS_WIN // for %APPDATA%
 #include "qt_windows.h"
@@ -1207,7 +1207,7 @@ QmlEnginePrivate::Imports::~Imports()
 }
 
 #include <qmlmetatype.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmltypenamecache_p.h"
 static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache)
 {
     if (!cache)
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 9e0c1fc..93fe4a7 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -61,21 +61,21 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qstack.h>
 #include <private/qobject_p.h>
-#include <private/qmlclassfactory_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qpodvector_p.h>
+#include "qmlclassfactory_p.h"
+#include "qmlcompositetypemanager_p.h"
+#include "qpodvector_p.h"
 #include <qml.h>
-#include <private/qmlbasicscript_p.h>
-#include <private/qmlvaluetype_p.h>
+#include "qmlbasicscript_p.h"
+#include "qmlvaluetype_p.h"
 #include <qmlcontext.h>
 #include <qmlengine.h>
 #include <qmlexpression.h>
 #include <QtScript/qscriptengine.h>
-#include <private/qmlmetaproperty_p.h>
-#include <private/qmlpropertycache_p.h>
-#include <private/qmlobjectscriptclass_p.h>
-#include <private/qmlcontextscriptclass_p.h>
-#include <private/qmlvaluetypescriptclass_p.h>
+#include "qmlmetaproperty_p.h"
+#include "qmlpropertycache_p.h"
+#include "qmlobjectscriptclass_p.h"
+#include "qmlcontextscriptclass_p.h"
+#include "qmlvaluetypescriptclass_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h
index 8ba3d38..1804f6b 100644
--- a/src/declarative/qml/qmlenginedebug_p.h
+++ b/src/declarative/qml/qmlenginedebug_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qmldebugservice_p.h>
+#include "qmldebugservice_p.h"
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index bbd6022..3d9e0f7 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlinfo.h"
-#include <private/qmldeclarativedata_p.h>
+#include "qmldeclarativedata_p.h"
 #include <qmlcontext.h>
 #include <QtGui/qapplication.h>
 
diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp
index 1103ef2..981e653 100644
--- a/src/declarative/qml/qmlintegercache.cpp
+++ b/src/declarative/qml/qmlintegercache.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlintegercache_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <qmlmetatype.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlintegercache_p.h b/src/declarative/qml/qmlintegercache_p.h
index 2b10dcc..1592337 100644
--- a/src/declarative/qml/qmlintegercache_p.h
+++ b/src/declarative/qml/qmlintegercache_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include <private/qmlrefcount_p.h>
+#include "qmlrefcount_p.h"
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlcleanup_p.h>
+#include "qmlcleanup_p.h"
 #include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp
index a180e49..bb3eb21 100644
--- a/src/declarative/qml/qmllistscriptclass.cpp
+++ b/src/declarative/qml/qmllistscriptclass.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmllistscriptclass_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 8bde318..0e34305 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -43,7 +43,7 @@
 #include "qmlmetaproperty_p.h"
 #include "qmlcompositetypedata_p.h"
 #include <qml.h>
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <QStringList>
 #include "qmlbinding.h"
 #include <qmlcontext.h>
@@ -51,8 +51,8 @@
 #include <math.h>
 #include <QtCore/qdebug.h>
 #include <qmlengine.h>
-#include <private/qmlengine_p.h>
-#include <private/qmldeclarativedata_p.h>
+#include "qmlengine_p.h"
+#include "qmldeclarativedata_p.h"
 
 Q_DECLARE_METATYPE(QList<QObject *>);
 
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index d225afa..dfb05fb 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -55,7 +55,7 @@
 
 #include "qmlmetaproperty.h"
 #include <private/qobject_p.h>
-#include <private/qmlpropertycache_p.h>
+#include "qmlpropertycache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 5fb2f50..5172152 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qbitarray.h>
 #include <QtCore/qreadwritelock.h>
-#include <private/qmlproxymetaobject_p.h>
+#include "qmlproxymetaobject_p.h"
 
 #include <qmetatype.h>
 #include <qobjectdefs.h>
@@ -58,7 +58,7 @@
 #include <qlocale.h>
 #include <ctype.h>
 #include <QtCore/qcryptographichash.h>
-#include <private/qmlcustomparser_p.h>
+#include "qmlcustomparser_p.h"
 
 #ifdef QT_BOOTSTRAPPED
 # ifndef QT_NO_GEOM_VARIANT
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 1a6f724..5110ea0 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 
 #include "qmlobjectscriptclass_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <private/qguard_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmldeclarativedata_p.h>
-#include <private/qmltypenamescriptclass_p.h>
-#include <private/qmllistscriptclass_p.h>
+#include "qmlcontext_p.h"
+#include "qmldeclarativedata_p.h"
+#include "qmltypenamescriptclass_p.h"
+#include "qmllistscriptclass_p.h"
 #include <qmlbinding.h>
 #include <QtCore/qtimer.h>
 
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h
index 6169812..771c3eb 100644
--- a/src/declarative/qml/qmlobjectscriptclass_p.h
+++ b/src/declarative/qml/qmlobjectscriptclass_p.h
@@ -55,8 +55,8 @@
 
 #include <QtScript/qscriptclass.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlpropertycache_p.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmlpropertycache_p.h"
+#include "qmltypenamecache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp
index 402c93e..04e2926 100644
--- a/src/declarative/qml/qmlparser.cpp
+++ b/src/declarative/qml/qmlparser.cpp
@@ -46,14 +46,14 @@
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
-#include <private/qmlvme_p.h>
-#include <private/qfxperf_p_p.h>
+#include "qmlvme_p.h"
+#include "qfxperf_p_p.h"
 #include <qml.h>
-#include "private/qmlcomponent_p.h"
+#include "qmlcomponent_p.h"
 #include <qmlcomponent.h>
-#include "private/qmetaobjectbuilder_p.h"
-#include <private/qmlvmemetaobject_p.h>
-#include <private/qmlcompiler_p.h>
+#include "qmetaobjectbuilder_p.h"
+#include "qmlvmemetaobject_p.h"
+#include "qmlcompiler_p.h"
 #include "parser/qmljsast_p.h"
 #include "parser/qmljsengine_p.h"
 #include <QtDebug>
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index 73bb498..d4bf88e 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/QList>
 #include <QtCore/qstring.h>
 #include <qml.h>
-#include <private/qmlrefcount_p.h>
+#include "qmlrefcount_p.h"
 #include <private/qobject_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index b7a5fad..c5cdbaa 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlpropertycache_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <qmlbinding.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h
index c2e8abe..28dd66d 100644
--- a/src/declarative/qml/qmlpropertycache_p.h
+++ b/src/declarative/qml/qmlpropertycache_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include <private/qmlrefcount_p.h>
+#include "qmlrefcount_p.h"
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlcleanup_p.h>
+#include "qmlcleanup_p.h"
 #include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h
index 7f9163c..7a15bd9 100644
--- a/src/declarative/qml/qmlproxymetaobject_p.h
+++ b/src/declarative/qml/qmlproxymetaobject_p.h
@@ -55,7 +55,7 @@
 
 #include <QtCore/QMetaObject>
 #include <QtCore/QObject>
-#include <private/qmetaobjectbuilder_p.h>
+#include "qmetaobjectbuilder_p.h"
 #include <private/qobject_p.h>
 #include <qml.h>
 
diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp
index 32e2fef..dc90255 100644
--- a/src/declarative/qml/qmlrewrite.cpp
+++ b/src/declarative/qml/qmlrewrite.cpp
@@ -41,7 +41,7 @@
 
 #include "qmlrewrite_p.h"
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 23c050c..3ee7b50 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -55,7 +55,7 @@
 #include <QCoreApplication>
 #include <QtDebug>
 
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index 5a7e94c..3981d4c 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -41,7 +41,7 @@
 
 #include <QtCore/qobject.h>
 #include <qmlengine.h>
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptvalueiterator.h>
 #include <QtScript/qscriptcontext.h>
@@ -51,8 +51,8 @@
 #include <QtSql/qsqlquery.h>
 #include <QtSql/qsqlerror.h>
 #include <QtSql/qsqlrecord.h>
-#include <private/qmlrefcount_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlrefcount_p.h"
+#include "qmlengine_p.h"
 #include <QtCore/qstack.h>
 #include <QtCore/qcryptographichash.h>
 #include "qmlsqldatabase_p.h"
diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp
index 5c0d23b..ea2a4f3 100644
--- a/src/declarative/qml/qmltypenamecache.cpp
+++ b/src/declarative/qml/qmltypenamecache.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmltypenamecache_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h
index 6ff403d..619a788 100644
--- a/src/declarative/qml/qmltypenamecache_p.h
+++ b/src/declarative/qml/qmltypenamecache_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include <private/qmlrefcount_p.h>
+#include "qmlrefcount_p.h"
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlcleanup_p.h>
+#include "qmlcleanup_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp
index 8b2addf..9db3426 100644
--- a/src/declarative/qml/qmltypenamescriptclass.cpp
+++ b/src/declarative/qml/qmltypenamescriptclass.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qmltypenamescriptclass_p.h"
-#include <private/qmlengine_p.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmlengine_p.h"
+#include "qmltypenamecache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h
index f630854..cec134d 100644
--- a/src/declarative/qml/qmltypenamescriptclass_p.h
+++ b/src/declarative/qml/qmltypenamescriptclass_p.h
@@ -54,7 +54,7 @@
 //
 #include <QtScript/qscriptclass.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h
index 2af261d..770650a 100644
--- a/src/declarative/qml/qmlvaluetype_p.h
+++ b/src/declarative/qml/qmlvaluetype_p.h
@@ -58,7 +58,7 @@
 #include <QtCore/qvariant.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qfont.h>
-#include <QmlMetaProperty>
+#include <qmlmetaproperty.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp
index e939e80..3b1953a 100644
--- a/src/declarative/qml/qmlvaluetypescriptclass.cpp
+++ b/src/declarative/qml/qmlvaluetypescriptclass.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlvaluetypescriptclass_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index f2fb217..bee0ff1 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -41,13 +41,13 @@
 
 #include "qmlvme_p.h"
 #include "qmlcompiler_p.h"
-#include <private/qfxperf_p_p.h>
-#include <private/qmlboundsignal_p.h>
-#include <private/qmlstringconverters_p.h>
-#include "private/qmetaobjectbuilder_p.h"
-#include "private/qmldeclarativedata_p.h"
+#include "qfxperf_p_p.h"
+#include "qmlboundsignal_p.h"
+#include "qmlstringconverters_p.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qmldeclarativedata_p.h"
 #include <qml.h>
-#include <private/qmlcustomparser_p.h>
+#include "qmlcustomparser_p.h"
 #include <QStack>
 #include <QWidget>
 #include <QColor>
@@ -58,15 +58,15 @@
 #include <qmlcontext.h>
 #include <qmlcomponent.h>
 #include <qmlbinding.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcomponent_p.h>
-#include "private/qmlvmemetaobject_p.h"
+#include "qmlengine_p.h"
+#include "qmlcomponent_p.h"
+#include "qmlvmemetaobject_p.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtGui/qapplication.h>
-#include <private/qmlbinding_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlbindingoptimizations_p.h>
+#include "qmlbinding_p.h"
+#include "qmlcontext_p.h"
+#include "qmlbindingoptimizations_p.h"
 #include <qmlscriptstring.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h
index a15bd08..257b3b2 100644
--- a/src/declarative/qml/qmlvme_p.h
+++ b/src/declarative/qml/qmlvme_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/QString>
 #include <QtCore/QStack>
 #include <qmlerror.h>
-#include <private/qbitfield_p.h>
+#include "qbitfield_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp
index 3f5dd475..b7ee316 100644
--- a/src/declarative/qml/qmlvmemetaobject.cpp
+++ b/src/declarative/qml/qmlvmemetaobject.cpp
@@ -41,13 +41,13 @@
 
 #include "qmlvmemetaobject_p.h"
 #include <qml.h>
-#include <private/qmlrefcount_p.h>
+#include "qmlrefcount_p.h"
 #include <QColor>
 #include <QDate>
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
 #include <qmlexpression.h>
-#include <private/qmlcontext_p.h>
+#include "qmlcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp
index 889ac78..3216a6b 100644
--- a/src/declarative/qml/qmlwatcher.cpp
+++ b/src/declarative/qml/qmlwatcher.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qdebug.h>
 #include <qmlexpression.h>
-#include <private/qmldebugservice_p.h>
+#include "qmldebugservice_p.h"
 #include <qmlcontext.h>
 #include <qml.h>
 
diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp
index a6428dd..75c67cc 100644
--- a/src/declarative/qml/qmlworkerscript.cpp
+++ b/src/declarative/qml/qmlworkerscript.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
 #include <QtScript/qscriptengine.h>
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <QtCore/qmutex.h>
 #include <QtCore/qwaitcondition.h>
 #include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/qml/qmlworkerscript_p.h b/src/declarative/qml/qmlworkerscript_p.h
index 90861f8..b85238d 100644
--- a/src/declarative/qml/qmlworkerscript_p.h
+++ b/src/declarative/qml/qmlworkerscript_p.h
@@ -54,8 +54,8 @@
 //
 
 #include <QtCore/qthread.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlparserstatus.h>
+#include <qml.h>
+#include <qmlparserstatus.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtCore/qurl.h>
 
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
index 216db6e..f5100ef 100644
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ b/src/declarative/qml/qmlxmlhttprequest.cpp
@@ -41,14 +41,14 @@
 
 #include <QtCore/qobject.h>
 #include <qmlengine.h>
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptcontext.h>
 #include <QtScript/qscriptengine.h>
 #include <QtNetwork/qnetworkreply.h>
 #include <QtCore/qxmlstream.h>
-#include <private/qmlrefcount_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlrefcount_p.h"
+#include "qmlengine_p.h"
 #include <QtCore/qstack.h>
 #include "qmlxmlhttprequest_p.h"
 
diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp
index 8fcab2b..f62f810 100644
--- a/src/declarative/util/qfxperf.cpp
+++ b/src/declarative/util/qfxperf.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qfxperf_p_p.h"
+#include "qfxperf_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qfxperf_p_p.h b/src/declarative/util/qfxperf_p_p.h
index c16bf7b..e3f820c 100644
--- a/src/declarative/util/qfxperf_p_p.h
+++ b/src/declarative/util/qfxperf_p_p.h
@@ -52,7 +52,7 @@
 // We mean it.
 //
 
-#include "private/qperformancelog_p_p.h"
+#include "qperformancelog_p_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 475978f..c78deb0 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -47,7 +47,7 @@
 #include "qml.h"
 #include "qmlinfo.h"
 #include "qmlanimation_p_p.h"
-#include <private/qmlbehavior_p.h>
+#include "qmlbehavior_p.h"
 #include <QParallelAnimationGroup>
 #include <QSequentialAnimationGroup>
 #include <QtCore/qset.h>
@@ -55,10 +55,10 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
 #include <qmlexpression.h>
-#include <private/qmlstateoperations_p.h>
-#include <private/qmlstringconverters_p.h>
+#include "qmlstateoperations_p.h"
+#include "qmlstringconverters_p.h"
 #include <private/qvariantanimation_p.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 87b6703..ea48c19 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -45,9 +45,9 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/QAbstractAnimation>
 #include <QtGui/qcolor.h>
-#include <private/qmltransition_p.h>
+#include "qmltransition_p.h"
 #include <qmlpropertyvaluesource.h>
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 #include <qml.h>
 #include <qmlscriptstring.h>
 
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index 326e1c6..c1fe239 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -54,16 +54,16 @@
 //
 
 #include <private/qobject_p.h>
-#include <private/qmlnullablevalue_p_p.h>
+#include "qmlnullablevalue_p_p.h"
 #include <private/qvariantanimation_p.h>
 #include <QtCore/QPauseAnimation>
 #include <QtCore/QVariantAnimation>
 #include <QtCore/QAnimationGroup>
 #include <QtGui/QColor>
-#include <private/qmlanimation_p.h>
+#include "qmlanimation_p.h"
 #include <qml.h>
 #include <qmlcontext.h>
-#include <private/qmltimeline_p_p.h>
+#include "qmltimeline_p_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index 23d3838..10de9fc 100644
--- a/src/declarative/util/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <private/qobject_p.h>
-#include <private/qmlanimation_p.h>
-#include <private/qmltransition_p.h>
+#include "qmlanimation_p.h"
+#include "qmltransition_p.h"
 #include "qmlbehavior_p.h"
 #include <qmlcontext.h>
 #include <qmlinfo.h>
diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h
index 581a0a8..b6426a3 100644
--- a/src/declarative/util/qmlbehavior_p.h
+++ b/src/declarative/util/qmlbehavior_p.h
@@ -45,7 +45,7 @@
 #include <qmlpropertyvaluesource.h>
 #include <qmlpropertyvalueinterceptor.h>
 #include <qml.h>
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index 2f692d8..ae0a2a6 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -47,7 +47,7 @@
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptcontext.h>
 #include <QtScript/qscriptengine.h>
-#include <private/qmlnullablevalue_p_p.h>
+#include "qmlnullablevalue_p_p.h"
 #include "qmlbind_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 3e72ab8..59798a2 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -41,7 +41,7 @@
 
 #include "qmlconnection_p.h"
 #include <qmlexpression.h>
-#include "private/qmlboundsignal_p.h"
+#include "qmlboundsignal_p.h"
 #include "private/qobject_p.h"
 #include <qmlcontext.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index b326f63..5e81117 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -43,7 +43,7 @@
 #include <qmlmetaproperty.h>
 #include <math.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlanimation_p_p.h>
+#include "qmlanimation_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index bb26536..ba06e19 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -46,7 +46,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
-#include <QmlContext>
+#include <qmlcontext.h>
 #include <qmlengine.h>
 #include <QFontDatabase>
 
diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp
index 4adec81..8c7e80a 100644
--- a/src/declarative/util/qmllistaccessor.cpp
+++ b/src/declarative/util/qmllistaccessor.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/qdebug.h>
 
 // ### Remove me
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 8259dcd..2ba4c35 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -42,10 +42,10 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qstack.h>
 #include <QXmlStreamReader>
-#include <private/qmlcustomparser_p.h>
-#include <private/qmlparser_p.h>
+#include "qmlcustomparser_p.h"
+#include "qmlparser_p.h"
 #include "qmlopenmetaobject_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <qmlcontext.h>
 #include "qmllistmodel_p.h"
 #include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
index d626060..7354296 100644
--- a/src/declarative/util/qmllistmodel_p.h
+++ b/src/declarative/util/qmllistmodel_p.h
@@ -48,7 +48,7 @@
 #include <QtCore/QList>
 #include <QtCore/QVariant>
 #include <qml.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include <QtScript/qscriptvalue.h>
 
 
diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h
index 346c2f0..98e5b92 100644
--- a/src/declarative/util/qmlnumberformatter_p.h
+++ b/src/declarative/util/qmlnumberformatter_p.h
@@ -43,7 +43,7 @@
 #define QMLNUMBERFORMATTER_H
 
 #include <qml.h>
-#include <private/qnumberformat_p.h>
+#include "qnumberformat_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp
index 05ff80a..1bbfbda 100644
--- a/src/declarative/util/qmlopenmetaobject.cpp
+++ b/src/declarative/util/qmlopenmetaobject.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlopenmetaobject_p.h"
-#include "private/qmetaobjectbuilder_p.h"
+#include "qmetaobjectbuilder_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp
index b8a9bd7..49825db 100644
--- a/src/declarative/util/qmlpixmapcache.cpp
+++ b/src/declarative/util/qmlpixmapcache.cpp
@@ -44,7 +44,7 @@
 #include <QHash>
 #include <QNetworkReply>
 #include <QPixmapCache>
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <qmlengine.h>
 #include <QFile>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index 9ca6db8..532cc2d 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -44,8 +44,8 @@
 #include "qmlpropertychanges_p.h"
 #include <QtCore/qdebug.h>
 #include <qmlinfo.h>
-#include <private/qmlcustomparser_p.h>
-#include <private/qmlparser_p.h>
+#include "qmlcustomparser_p.h"
+#include "qmlparser_p.h"
 #include <qmlexpression.h>
 #include <qmlbinding.h>
 #include <qmlcontext.h>
diff --git a/src/declarative/util/qmlpropertychanges_p.h b/src/declarative/util/qmlpropertychanges_p.h
index 2c0cba9..461730d 100644
--- a/src/declarative/util/qmlpropertychanges_p.h
+++ b/src/declarative/util/qmlpropertychanges_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLPROPERTYCHANGES_H
 #define QMLPROPERTYCHANGES_H
 
-#include <private/qmlstateoperations_p.h>
+#include "qmlstateoperations_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlpropertymap.cpp b/src/declarative/util/qmlpropertymap.cpp
index c0e3340..0c398fd 100644
--- a/src/declarative/util/qmlpropertymap.cpp
+++ b/src/declarative/util/qmlpropertymap.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlpropertymap.h"
-#include <private/qmlopenmetaobject_p.h>
+#include "qmlopenmetaobject_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp
index d6961b0..ffecad0 100644
--- a/src/declarative/util/qmlspringfollow.cpp
+++ b/src/declarative/util/qmlspringfollow.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/qdebug.h>
 #include "private/qobject_p.h"
 #include "qmlspringfollow_p.h"
-#include "private/qmlanimation_p_p.h"
+#include "qmlanimation_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 5fde89a..a55308e 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -48,7 +48,7 @@
 #include "qmlanimation_p_p.h"
 #include "qmlstate_p.h"
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h
index 75eb3fd..5d3a7dd 100644
--- a/src/declarative/util/qmlstate_p_p.h
+++ b/src/declarative/util/qmlstate_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 #include <private/qobject_p.h>
-#include <private/qmlanimation_p_p.h>
-#include <private/qmltransitionmanager_p_p.h>
+#include "qmlanimation_p_p.h"
+#include "qmltransitionmanager_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index f206f5c..f6a0d1a 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -45,7 +45,7 @@
 #include "qmlstate_p_p.h"
 #include <qmlbinding.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstategroup_p.h b/src/declarative/util/qmlstategroup_p.h
index ddd27d7..82cc504 100644
--- a/src/declarative/util/qmlstategroup_p.h
+++ b/src/declarative/util/qmlstategroup_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLSTATEGROUP_H
 #define QMLSTATEGROUP_H
 
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 9727ca7..560c86b 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -46,8 +46,8 @@
 #include "qmlstateoperations_p.h"
 #include <QtCore/qdebug.h>
 #include <qmlinfo.h>
-#include <private/qmlgraphicsanchors_p_p.h>
-#include <private/qmlgraphicsitem_p.h>
+#include "qmlgraphicsanchors_p_p.h"
+#include "qmlgraphicsitem_p.h"
 #include <QtGui/qgraphicsitem.h>
 #include <QtCore/qmath.h>
 
diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h
index 589fe20..9e9dbd1 100644
--- a/src/declarative/util/qmlstateoperations_p.h
+++ b/src/declarative/util/qmlstateoperations_p.h
@@ -42,9 +42,9 @@
 #ifndef QMLSTATEOPERATIONS_H
 #define QMLSTATEOPERATIONS_H
 
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 #include <qmlgraphicsitem.h>
-#include <private/qmlgraphicsanchors_p.h>
+#include "qmlgraphicsanchors_p.h"
 #include <qmlscriptstring.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h
index 1891a6e..ebc8b79 100644
--- a/src/declarative/util/qmltransition_p.h
+++ b/src/declarative/util/qmltransition_p.h
@@ -43,7 +43,7 @@
 #define QMLTRANSITION_H
 
 #include <QtCore/qobject.h>
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 #include <qml.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index 1a164c7..da9a0dd 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qmlbinding.h>
-#include <private/qmltransitionmanager_p_p.h>
-#include <private/qmlstate_p_p.h>
+#include "qmltransitionmanager_p_p.h"
+#include "qmlstate_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmltransitionmanager_p_p.h b/src/declarative/util/qmltransitionmanager_p_p.h
index 9a05684..c7e609f 100644
--- a/src/declarative/util/qmltransitionmanager_p_p.h
+++ b/src/declarative/util/qmltransitionmanager_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qmlstateoperations_p.h>
+#include "qmlstateoperations_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index afeead2..dc14730 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -53,16 +53,16 @@
 
 #include "qml.h"
 #include "qmlgraphicsitem.h"
-#include "private/qperformancelog_p_p.h"
-#include "private/qfxperf_p_p.h"
+#include "qperformancelog_p_p.h"
+#include "qfxperf_p_p.h"
 
 #include "qmlview.h"
 #include <qmlengine.h>
 #include <qmlcontext.h>
-#include <private/qmldebug_p.h>
-#include <private/qmldebugservice_p.h>
+#include "qmldebug_p.h"
+#include "qmldebugservice_p.h"
 #include <QtCore/qabstractanimation.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 2fa1be8..2b46515 100644
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
@@ -43,7 +43,7 @@
 #define QMLXMLLISTMODEL_H
 
 #include <qml.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include <qmlinfo.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/widgets/graphicslayouts_p.h b/src/declarative/widgets/graphicslayouts_p.h
index c44cb79..32517b6 100644
--- a/src/declarative/widgets/graphicslayouts_p.h
+++ b/src/declarative/widgets/graphicslayouts_p.h
@@ -42,7 +42,7 @@
 #ifndef GRAPHICSLAYOUTS_H
 #define GRAPHICSLAYOUTS_H
 
-#include <private/graphicswidgets_p.h>
+#include "graphicswidgets_p.h"
 #include <QtGui/QGraphicsLinearLayout>
 #include <QtGui/QGraphicsGridLayout>