Clean up declarative includes

(This commit is in preparation of moving several files
to a separate library (QtQuick2).)

Don't add all subfolders to the includepath (from the
.pri files). There's no good reason to do that.

For headers (both public and private) that are in the
same folder as the file that includes them, prefer to use

 #include "foo.h"
 #include "bar_p.h"

For public headers that are outside the current folder
but have "unambiguous" names (e.g. qdeclarative prefix), use

 #include <foo.h>

For private headers that are outside the current folder, use

 #include <private/baz_p.h>

Also change

 #include <QtDeclarative/private/foo_p.h>

to

 #include <private/foo_p.h>

The header filenames already have a qdeclarative or qsg
prefix; there's no need to prefix by module name to
disambiguate.

Finally,

 #include "private/foo_p.h"

should be avoided. private/ is used for auto-generated
(forwarding) headers, which never reside in the current
(source) directory. Use angle brackets instead.

Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>

160 files changed, 516 insertions, 543 deletions

diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
index 7bfb5a1233..5bc0a2d92e 100644
--- a/src/declarative/debugger/debugger.pri
+++ b/src/declarative/debugger/debugger.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 SOURCES += \
     $$PWD/qdeclarativedebuggerstatus.cpp \
     $$PWD/qpacketprotocol.cpp \
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index 606ad2deae..5018e9535e 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativedebugclient_p.h"
+#include "qdeclarativedebugclient_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/qdeclarativedebuggerstatus.cpp b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
index 609e14497a..4f016b4afc 100644
--- a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
+++ b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativedebuggerstatus_p.h"
+#include "qdeclarativedebuggerstatus_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp
index cbe4a85c61..c91802db1f 100644
--- a/src/declarative/debugger/qdeclarativedebughelper.cpp
+++ b/src/declarative/debugger/qdeclarativedebughelper.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativedebughelper_p.h"
+#include "qdeclarativedebughelper_p.h"
 
 #include <QtCore/QAbstractAnimation>
 #include <QtDeclarative/QJSEngine>
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index eeb000bf69..5a888c7dc1 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativedebugserver_p.h"
-#include "private/qdeclarativedebugservice_p.h"
-#include "private/qdeclarativedebugservice_p_p.h"
-#include "private/qdeclarativeengine_p.h"
+#include "qdeclarativedebugserver_p.h"
+#include "qdeclarativedebugservice_p.h"
+#include "qdeclarativedebugservice_p_p.h"
+#include <private/qdeclarativeengine_p.h>
 
 #include <QtCore/QDir>
 #include <QtCore/QPluginLoader>
diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
index 832224ea33..a3e439dfd6 100644
--- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
+++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H
 #define QDECLARATIVEDEBUGSERVERCONNECTION_H
 
-#include <QtDeclarative/private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index ecd9e0fb85..be60ea4609 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativedebugservice_p.h"
-#include "private/qdeclarativedebugservice_p_p.h"
-#include "private/qdeclarativedebugserver_p.h"
+#include "qdeclarativedebugservice_p.h"
+#include "qdeclarativedebugservice_p_p.h"
+#include "qdeclarativedebugserver_p.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QStringList>
diff --git a/src/declarative/debugger/qdeclarativeenginedebug.cpp b/src/declarative/debugger/qdeclarativeenginedebug.cpp
index 237e2d6376..537e1e6a3d 100644
--- a/src/declarative/debugger/qdeclarativeenginedebug.cpp
+++ b/src/declarative/debugger/qdeclarativeenginedebug.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeenginedebug_p.h"
+#include "qdeclarativeenginedebug_p.h"
 
-#include "private/qdeclarativedebugclient_p.h"
+#include "qdeclarativedebugclient_p.h"
 
-#include <qdeclarativeenginedebugservice_p.h>
+#include "qdeclarativeenginedebugservice_p.h"
 
 #include <private/qobject_p.h>
 
diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
index 9ba99afb91..7fa577d7d9 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
@@ -39,20 +39,20 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeenginedebugservice_p.h"
-
-#include "private/qdeclarativeboundsignal_p.h"
-#include "qdeclarativeengine.h"
-#include "private/qdeclarativemetatype_p.h"
-#include "qdeclarativeproperty.h"
-#include "private/qdeclarativeproperty_p.h"
-#include "private/qdeclarativebinding_p.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativewatcher_p.h"
-#include "private/qdeclarativevaluetype_p.h"
-#include "private/qdeclarativevmemetaobject_p.h"
-#include "private/qdeclarativeexpression_p.h"
-#include "private/qdeclarativepropertychanges_p.h"
+#include "qdeclarativeenginedebugservice_p.h"
+
+#include <private/qdeclarativeboundsignal_p.h>
+#include <qdeclarativeengine.h>
+#include <private/qdeclarativemetatype_p.h>
+#include <qdeclarativeproperty.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativecontext_p.h>
+#include <private/qdeclarativewatcher_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include <private/qdeclarativevmemetaobject_p.h>
+#include <private/qdeclarativeexpression_p.h>
+#include <private/qdeclarativepropertychanges_p.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>
diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
index d0d9f44d7b..d4cd783b16 100644
--- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
+++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtDeclarative/private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
index f1ae354066..d19cae74a4 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp
+++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeinspectorservice_p.h"
-#include "private/qdeclarativeinspectorinterface_p.h"
+#include "qdeclarativeinspectorservice_p.h"
+#include "qdeclarativeinspectorinterface_p.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
index 98b2e9deeb..c660fb4b69 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h
+++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "private/qdeclarativedebugservice_p.h"
+#include "qdeclarativedebugservice_p.h"
 #include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/QList>
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp
index 9b95d06e1e..3abb369e63 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qpacketprotocol_p.h"
+#include "qpacketprotocol_p.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QElapsedTimer>
diff --git a/src/declarative/debugger/qv8debugservice.cpp b/src/declarative/debugger/qv8debugservice.cpp
index 157bb8cf84..ecdf5977c8 100644
--- a/src/declarative/debugger/qv8debugservice.cpp
+++ b/src/declarative/debugger/qv8debugservice.cpp
@@ -41,9 +41,9 @@
 
 #include "qv8debugservice_p.h"
 #include "qdeclarativedebugservice_p_p.h"
-#include "qv8debug_p.h"
-#include "qv8engine_p.h"
-#include "qdeclarativeengine_p.h"
+#include <private/qv8debug_p.h>
+#include <private/qv8engine_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 #include <QtCore/QEventLoop>
 #include <QtCore/QHash>
diff --git a/src/declarative/debugger/qv8debugservice_p.h b/src/declarative/debugger/qv8debugservice_p.h
index 861e5f5c05..d8101ae3ff 100644
--- a/src/declarative/debugger/qv8debugservice_p.h
+++ b/src/declarative/debugger/qv8debugservice_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "private/qdeclarativedebugservice_p.h"
+#include "qdeclarativedebugservice_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/debugger/qv8profilerservice.cpp b/src/declarative/debugger/qv8profilerservice.cpp
index 9195729c46..92a191688c 100644
--- a/src/declarative/debugger/qv8profilerservice.cpp
+++ b/src/declarative/debugger/qv8profilerservice.cpp
@@ -41,9 +41,8 @@
 
 #include "qv8profilerservice_p.h"
 #include "qdeclarativedebugservice_p_p.h"
-#include "qdeclarativeengine_p.h"
-#include "private/qv8profiler_p.h"
-#include "qjsconverter_p.h"
+#include <private/qdeclarativeengine_p.h>
+#include <private/qv8profiler_p.h>
 
 #include <QtCore/QHash>
 
diff --git a/src/declarative/debugger/qv8profilerservice_p.h b/src/declarative/debugger/qv8profilerservice_p.h
index 1e912d0b2f..ea5119cd50 100644
--- a/src/declarative/debugger/qv8profilerservice_p.h
+++ b/src/declarative/debugger/qv8profilerservice_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "private/qdeclarativedebugservice_p.h"
+#include <private/qdeclarativedebugservice_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/designer/designersupport.cpp b/src/declarative/designer/designersupport.cpp
index aaaeeb4ef0..d582ed1fe0 100644
--- a/src/declarative/designer/designersupport.cpp
+++ b/src/declarative/designer/designersupport.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "designersupport.h"
-#include "qsgitem_p.h"
+#include <private/qsgitem_p.h>
 
-#include <QtDeclarative/private/qsgshadereffectsource_p.h>
-#include <QtDeclarative/private/qsgrectangle_p.h>
-#include <QtDeclarative/private/qdeclarativeengine_p.h>
-#include <QtDeclarative/private/qsgview_p.h>
-#include <QtDeclarative/private/qdeclarativestategroup_p.h>
+#include <private/qsgshadereffectsource_p.h>
+#include <private/qsgrectangle_p.h>
+#include <private/qdeclarativeengine_p.h>
+#include <private/qsgview_p.h>
+#include <private/qdeclarativestategroup_p.h>
 #include <QtGui/QImage>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/context2d/context2d.pri b/src/declarative/items/context2d/context2d.pri
index 60fe28dd43..31ed75d82a 100644
--- a/src/declarative/items/context2d/context2d.pri
+++ b/src/declarative/items/context2d/context2d.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 SOURCES += \
     $$PWD/qsgcanvasitem.cpp \
     $$PWD/qsgcontext2d.cpp \
diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp
index 3445cf01d0..b3b4eab30d 100644
--- a/src/declarative/items/context2d/qsgcanvasitem.cpp
+++ b/src/declarative/items/context2d/qsgcanvasitem.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "private/qsgadaptationlayer_p.h"
+#include <private/qsgadaptationlayer_p.h>
 #include "qsgcanvasitem_p.h"
-#include "qsgitem_p.h"
+#include <private/qsgitem_p.h>
 #include "qsgcontext2d_p.h"
 #include "qsgcontext2dnode_p.h"
 #include "qsgcontext2dtexture_p.h"
-#include "qdeclarativepixmapcache_p.h"
+#include <private/qdeclarativepixmapcache_p.h>
 
 #include <qdeclarativeinfo.h>
-#include "qdeclarativeengine_p.h"
+#include <private/qdeclarativeengine_p.h>
 #include <QtCore/QBuffer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/context2d/qsgcanvasitem_p.h b/src/declarative/items/context2d/qsgcanvasitem_p.h
index a2dfb7968a..131a3f5fff 100644
--- a/src/declarative/items/context2d/qsgcanvasitem_p.h
+++ b/src/declarative/items/context2d/qsgcanvasitem_p.h
@@ -42,7 +42,7 @@
 #ifndef QSGCANVASITEM_P_H
 #define QSGCANVASITEM_P_H
 
-#include "qsgitem.h"
+#include <qsgitem.h>
 #include <private/qv8engine_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp
index a1248b856e..e75713de8a 100644
--- a/src/declarative/items/context2d/qsgcontext2d.cpp
+++ b/src/declarative/items/context2d/qsgcontext2d.cpp
@@ -42,24 +42,24 @@
 #include "qsgcontext2d_p.h"
 #include "qsgcontext2dcommandbuffer_p.h"
 #include "qsgcanvasitem_p.h"
-#include "qsgitem_p.h"
-#include "qsgshadereffectsource_p.h"
+#include <private/qsgitem_p.h>
+#include <private/qsgshadereffectsource_p.h>
 #include <QtGui/qopenglframebufferobject.h>
 
 #include <QtCore/qdebug.h>
-#include "private/qsgcontext_p.h"
-#include "private/qdeclarativesvgparser_p.h"
-#include "private/qdeclarativepath_p.h"
+#include <private/qsgcontext_p.h>
+#include <private/qdeclarativesvgparser_p.h>
+#include <private/qdeclarativepath_p.h>
 
-#include "private/qsgimage_p_p.h"
+#include <private/qsgimage_p_p.h>
 
 #include <QtGui/qguiapplication.h>
 #include <qdeclarativeinfo.h>
 #include <QtCore/qmath.h>
-#include "qv8engine_p.h"
+#include <private/qv8engine_p.h>
 
-#include "qdeclarativeengine.h"
-#include "qv8domerrors_p.h"
+#include <qdeclarativeengine.h>
+#include <private/qv8domerrors_p.h>
 #include <QtCore/qnumeric.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
index dff4f9fe75..9dff4e809e 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
+++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
@@ -41,7 +41,7 @@
 
 #include "qsgcontext2dcommandbuffer_p.h"
 #include "qsgcanvasitem_p.h"
-#include "qdeclarative.h"
+#include <qdeclarative.h>
 #include <QtCore/QMutex>
 
 #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY))
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
index 95d0e9685e..cab82e2f67 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
+++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
@@ -43,7 +43,7 @@
 #define QSGCONTEXT2DCOMMANDBUFFER_P_H
 
 #include "qsgcontext2d_p.h"
-#include "qdeclarativepixmapcache_p.h"
+#include <private/qdeclarativepixmapcache_p.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/items/context2d/qsgcontext2dnode_p.h b/src/declarative/items/context2d/qsgcontext2dnode_p.h
index 957c14b138..88c3619095 100644
--- a/src/declarative/items/context2d/qsgcontext2dnode_p.h
+++ b/src/declarative/items/context2d/qsgcontext2dnode_p.h
@@ -42,8 +42,8 @@
 #ifndef QSGCONTEXT2DNODE_P_H
 #define QSGCONTEXT2DNODE_P_H
 
-#include "qsgnode.h"
-#include "qsgtexturematerial.h"
+#include <qsgnode.h>
+#include <qsgtexturematerial.h>
 
 #include "qsgcanvasitem_p.h"
 #include "qsgcontext2dtexture_p.h"
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture.cpp b/src/declarative/items/context2d/qsgcontext2dtexture.cpp
index 8e22cebe70..a57a5e5fba 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture.cpp
+++ b/src/declarative/items/context2d/qsgcontext2dtexture.cpp
@@ -42,8 +42,8 @@
 #include "qsgcontext2dtexture_p.h"
 #include "qsgcontext2dtile_p.h"
 #include "qsgcanvasitem_p.h"
-#include "qsgitem_p.h"
-#include "private/qsgtexture_p.h"
+#include <private/qsgitem_p.h>
+#include <private/qsgtexture_p.h>
 #include "qsgcontext2dcommandbuffer_p.h"
 #include <QOpenGLPaintDevice>
 
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture_p.h b/src/declarative/items/context2d/qsgcontext2dtexture_p.h
index 1555120320..dbc383d7fc 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture_p.h
+++ b/src/declarative/items/context2d/qsgcontext2dtexture_p.h
@@ -42,7 +42,7 @@
 #ifndef QSGCONTEXT2DTEXTURE_P_H
 #define QSGCONTEXT2DTEXTURE_P_H
 
-#include "qsgtexture.h"
+#include <qsgtexture.h>
 #include "qsgcanvasitem_p.h"
 #include "qsgcontext2d_p.h"
 
diff --git a/src/declarative/items/items.pri b/src/declarative/items/items.pri
index 355a762764..025f67ab90 100644
--- a/src/declarative/items/items.pri
+++ b/src/declarative/items/items.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += \
     $$PWD/qsgevents_p_p.h \
     $$PWD/qsgitemchangelistener_p.h \
diff --git a/src/declarative/items/qsganimation.cpp b/src/declarative/items/qsganimation.cpp
index e57edbd2c8..b0dc820763 100644
--- a/src/declarative/items/qsganimation.cpp
+++ b/src/declarative/items/qsganimation.cpp
@@ -43,8 +43,8 @@
 #include "qsganimation_p_p.h"
 #include "qsgstateoperations_p.h"
 
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativepath_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativepath_p.h>
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtCore/qmath.h>
diff --git a/src/declarative/items/qsgimplicitsizeitem.cpp b/src/declarative/items/qsgimplicitsizeitem.cpp
index 34890d876a..163b73b39c 100644
--- a/src/declarative/items/qsgimplicitsizeitem.cpp
+++ b/src/declarative/items/qsgimplicitsizeitem.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "private/qsgimplicitsizeitem_p.h"
-#include "private/qsgimplicitsizeitem_p_p.h"
+#include "qsgimplicitsizeitem_p.h"
+#include "qsgimplicitsizeitem_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/items/qsgimplicitsizeitem_p_p.h b/src/declarative/items/qsgimplicitsizeitem_p_p.h
index 30631de62c..3ddd69d7d3 100644
--- a/src/declarative/items/qsgimplicitsizeitem_p_p.h
+++ b/src/declarative/items/qsgimplicitsizeitem_p_p.h
@@ -54,9 +54,9 @@
 // We mean it.
 //
 
-#include "private/qsgitem_p.h"
-#include "private/qsgpainteditem_p.h"
-#include "private/qsgimplicitsizeitem_p.h"
+#include "qsgitem_p.h"
+#include "qsgpainteditem_p.h"
+#include "qsgimplicitsizeitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp
index 5a99ef78fb..bb471dd05a 100644
--- a/src/declarative/items/qsgitemsmodule.cpp
+++ b/src/declarative/items/qsgitemsmodule.cpp
@@ -73,9 +73,9 @@
 #include "qsganimation_p.h"
 #include <private/qsgshadereffect_p.h>
 #include <private/qsgshadereffectsource_p.h>
-//#include "private/qsgpincharea_p.h"
-#include "qsgcanvasitem_p.h"
-#include "qsgcontext2d_p.h"
+//#include <private/qsgpincharea_p.h>
+#include <private/qsgcanvasitem_p.h>
+#include <private/qsgcontext2d_p.h>
 #include "qsgsprite_p.h"
 #include "qsgspriteimage_p.h"
 #include "qsgdrag_p.h"
diff --git a/src/declarative/items/qsgloader_p_p.h b/src/declarative/items/qsgloader_p_p.h
index ea8c11d413..36059ca51a 100644
--- a/src/declarative/items/qsgloader_p_p.h
+++ b/src/declarative/items/qsgloader_p_p.h
@@ -57,7 +57,7 @@
 #include "qsgloader_p.h"
 #include "qsgimplicitsizeitem_p_p.h"
 #include "qsgitemchangelistener_p.h"
-#include "qdeclarativeincubator.h"
+#include <qdeclarativeincubator.h>
 
 #include <private/qv8_p.h>
 
diff --git a/src/declarative/items/qsgshadereffect.cpp b/src/declarative/items/qsgshadereffect.cpp
index f4ad80ea1e..81adf8d705 100644
--- a/src/declarative/items/qsgshadereffect.cpp
+++ b/src/declarative/items/qsgshadereffect.cpp
@@ -49,8 +49,8 @@
 #include <private/qsgtextureprovider_p.h>
 #include "qsgcanvas.h"
 
-#include <qsgimage_p.h>
-#include <qsgshadereffectsource_p.h>
+#include "qsgimage_p.h"
+#include "qsgshadereffectsource_p.h"
 
 #include <QtCore/qsignalmapper.h>
 #include <QtGui/qopenglframebufferobject.h>
diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp
index 3f1d95a4fc..e6e2d21773 100644
--- a/src/declarative/items/qsgtextinput.cpp
+++ b/src/declarative/items/qsgtextinput.cpp
@@ -49,7 +49,7 @@
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtGui/qevent.h>
 #include <QTextBoundaryFinder>
-#include <qsgtextnode_p.h>
+#include "qsgtextnode_p.h"
 #include <qsgsimplerectnode.h>
 
 #include <QtGui/qstylehints.h>
diff --git a/src/declarative/items/qsgtextnode_p.h b/src/declarative/items/qsgtextnode_p.h
index b49a8a18e4..7a9462c24e 100644
--- a/src/declarative/items/qsgtextnode_p.h
+++ b/src/declarative/items/qsgtextnode_p.h
@@ -43,7 +43,7 @@
 #define QSGTEXTNODE_P_H
 
 #include <qsgnode.h>
-#include <qsgtext_p.h>
+#include "qsgtext_p.h"
 #include <qglyphrun.h>
 
 #include <QtGui/qcolor.h>
diff --git a/src/declarative/items/qsgview_p.h b/src/declarative/items/qsgview_p.h
index 3f8d69e8c0..f2b962c28e 100644
--- a/src/declarative/items/qsgview_p.h
+++ b/src/declarative/items/qsgview_p.h
@@ -48,9 +48,8 @@
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qtimer.h>
 #include <QtCore/qpointer.h>
-#include <QtDeclarative/qsgview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/private/qsgcanvas_p.h>
+#include "qsgcanvas_p.h"
 
 #include "qsgitemchangelistener_p.h"
 
diff --git a/src/declarative/items/qsgvisualadaptormodel_p.h b/src/declarative/items/qsgvisualadaptormodel_p.h
index bc9d3881fc..43af78b37e 100644
--- a/src/declarative/items/qsgvisualadaptormodel_p.h
+++ b/src/declarative/items/qsgvisualadaptormodel_p.h
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractitemmodel.h>
 
-#include <QtDeclarative/private/qdeclarativerefcount_p.h>
+#include <private/qdeclarativerefcount_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/particles/particles.pri b/src/declarative/particles/particles.pri
index 4502cc499c..a3a8c90d85 100644
--- a/src/declarative/particles/particles.pri
+++ b/src/declarative/particles/particles.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += \
     $$PWD/qsgangledirection_p.h \
     $$PWD/qsgcustomparticle_p.h \
diff --git a/src/declarative/particles/qsgcustomparticle_p.h b/src/declarative/particles/qsgcustomparticle_p.h
index db3a78831b..99f63d5178 100644
--- a/src/declarative/particles/qsgcustomparticle_p.h
+++ b/src/declarative/particles/qsgcustomparticle_p.h
@@ -42,7 +42,7 @@
 #ifndef CUSTOM_PARTICLE_H
 #define CUSTOM_PARTICLE_H
 #include "qsgparticlepainter_p.h"
-#include <QtDeclarative/private/qsgshadereffectnode_p.h>
+#include <private/qsgshadereffectnode_p.h>
 #include <QSignalMapper>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/particles/qsggroupgoal.cpp b/src/declarative/particles/qsggroupgoal.cpp
index 7f0b938987..f380101bd6 100644
--- a/src/declarative/particles/qsggroupgoal.cpp
+++ b/src/declarative/particles/qsggroupgoal.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qsggroupgoal_p.h"
-#include "private/qsgspriteengine_p.h"
-#include "private/qsgsprite_p.h"
+#include <private/qsgspriteengine_p.h>
+#include <private/qsgsprite_p.h>
 #include "qsgimageparticle_p.h"
 #include <QDebug>
 
diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp
index d219fc3df8..02b3a7a92a 100644
--- a/src/declarative/particles/qsgimageparticle.cpp
+++ b/src/declarative/particles/qsgimageparticle.cpp
@@ -47,8 +47,8 @@
 #include <QFile>
 #include "qsgimageparticle_p.h"
 #include "qsgparticleemitter_p.h"
-#include "qsgsprite_p.h"
-#include "qsgspriteengine_p.h"
+#include <private/qsgsprite_p.h>
+#include <private/qsgspriteengine_p.h>
 #include <QOpenGLFunctions>
 #include <qsgengine.h>
 #include <private/qsgtexture_p.h>
diff --git a/src/declarative/particles/qsgitemparticle.cpp b/src/declarative/particles/qsgitemparticle.cpp
index 19e64b2cd6..20bd18d146 100644
--- a/src/declarative/particles/qsgitemparticle.cpp
+++ b/src/declarative/particles/qsgitemparticle.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qsgitemparticle_p.h"
-#include <QtDeclarative/private/qsgvisualitemmodel_p.h>
+#include <private/qsgvisualitemmodel_p.h>
 #include <qsgnode.h>
 #include <QTimer>
 #include <QDeclarativeComponent>
diff --git a/src/declarative/particles/qsgparticlegroup_p.h b/src/declarative/particles/qsgparticlegroup_p.h
index a809b63e8a..26bed55785 100644
--- a/src/declarative/particles/qsgparticlegroup_p.h
+++ b/src/declarative/particles/qsgparticlegroup_p.h
@@ -40,7 +40,7 @@
 ****************************************************************************/
 #ifndef QSGPARTICLEGROUP
 #define QSGPARTICLEGROUP
-#include "qsgspriteengine_p.h"
+#include <private/qsgspriteengine_p.h>
 #include "qsgparticlesystem_p.h"
 #include "qdeclarativeparserstatus.h"
 
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp
index fd4b75d7f9..1d4498891f 100644
--- a/src/declarative/particles/qsgparticlesystem.cpp
+++ b/src/declarative/particles/qsgparticlesystem.cpp
@@ -44,8 +44,8 @@
 #include "qsgparticleemitter_p.h"
 #include "qsgparticleaffector_p.h"
 #include "qsgparticlepainter_p.h"
-#include "qsgspriteengine_p.h"
-#include "qsgsprite_p.h"
+#include <private/qsgspriteengine_p.h>
+#include <private/qsgsprite_p.h>
 #include "qsgv8particledata_p.h"
 #include "qsgparticlegroup_p.h"
 
diff --git a/src/declarative/particles/qsgparticlesystem_p.h b/src/declarative/particles/qsgparticlesystem_p.h
index 0729727e43..c7399549f4 100644
--- a/src/declarative/particles/qsgparticlesystem_p.h
+++ b/src/declarative/particles/qsgparticlesystem_p.h
@@ -48,7 +48,7 @@
 #include <QHash>
 #include <QPointer>
 #include <QSignalMapper>
-#include <QtDeclarative/private/qsgsprite_p.h>
+#include <private/qsgsprite_p.h>
 #include <QAbstractAnimation>
 #include <QtDeclarative/qdeclarative.h>
 #include <private/qv8engine_p.h> //For QDeclarativeV8Handle
diff --git a/src/declarative/particles/qsgspritegoal.cpp b/src/declarative/particles/qsgspritegoal.cpp
index 1e8feec672..12d985f0c3 100644
--- a/src/declarative/particles/qsgspritegoal.cpp
+++ b/src/declarative/particles/qsgspritegoal.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qsgspritegoal_p.h"
-#include "private/qsgspriteengine_p.h"
-#include "private/qsgsprite_p.h"
+#include <private/qsgspriteengine_p.h>
+#include <private/qsgsprite_p.h>
 #include "qsgimageparticle_p.h"
 #include <QDebug>
 
diff --git a/src/declarative/qml/ftw/ftw.pri b/src/declarative/qml/ftw/ftw.pri
index 05ac36ddbe..c7750468d9 100644
--- a/src/declarative/qml/ftw/ftw.pri
+++ b/src/declarative/qml/ftw/ftw.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 HEADERS +=  \
     $$PWD/qbitfield_p.h \
     $$PWD/qintrusivelist_p.h \
diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri
index 4f1ff2fd21..3ae0a6d8eb 100644
--- a/src/declarative/qml/parser/parser.pri
+++ b/src/declarative/qml/parser/parser.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += \
     $$PWD/qdeclarativejsast_p.h \
     $$PWD/qdeclarativejsastfwd_p.h \
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index b84fe92820..609057dd88 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativebinding_p.h"
-#include "private/qdeclarativebinding_p_p.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativebinding_p_p.h"
 
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeinfo.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativecompiler_p.h"
-#include "private/qdeclarativedata_p.h"
-#include "private/qdeclarativestringconverters_p.h"
-#include "private/qdeclarativedebugtrace_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativedata_p.h"
+#include "qdeclarativestringconverters_p.h"
+#include <private/qdeclarativedebugtrace_p.h>
 
 #include <QVariant>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index fc9dd8758f..6f545fc2c6 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -57,7 +57,7 @@
 #include "qdeclarativepropertyvaluesource.h"
 #include "qdeclarativeexpression.h"
 #include "qdeclarativeproperty.h"
-#include "private/qdeclarativeproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QMetaProperty>
diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h
index 78c4e0e829..c704919f78 100644
--- a/src/declarative/qml/qdeclarativebinding_p_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "private/qdeclarativebinding_p.h"
+#include "qdeclarativebinding_p.h"
 
 #include "qdeclarativeproperty.h"
-#include "private/qdeclarativeexpression_p.h"
+#include "qdeclarativeexpression_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
index 11dec91158..6bbbb243fc 100644
--- a/src/declarative/qml/qdeclarativeboundsignal.cpp
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeboundsignal_p.h"
+#include "qdeclarativeboundsignal_p.h"
 
-#include "private/qmetaobjectbuilder_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativeexpression_p.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativemetatype_p.h"
+#include <private/qmetaobjectbuilder_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativemetatype_p.h"
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
-#include "private/qdeclarativeglobal_p.h"
-#include "private/qdeclarativedebugtrace_p.h"
-#include "private/qv8debugservice_p.h"
+#include "qdeclarativeglobal_p.h"
+#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qv8debugservice_p.h>
 
 #include <QtCore/qstringbuilder.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/qml/qdeclarativecleanup.cpp b/src/declarative/qml/qdeclarativecleanup.cpp
index d0d368773b..da7930fd07 100644
--- a/src/declarative/qml/qdeclarativecleanup.cpp
+++ b/src/declarative/qml/qdeclarativecleanup.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativecleanup_p.h"
+#include "qdeclarativecleanup_p.h"
 
-#include "private/qdeclarativeengine_p.h"
+#include "qdeclarativeengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp
index 6815967f57..cc976de500 100644
--- a/src/declarative/qml/qdeclarativecompileddata.cpp
+++ b/src/declarative/qml/qdeclarativecompileddata.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativecompiler_p.h"
+#include "qdeclarativecompiler_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativecomponent.h"
-#include "private/qdeclarativecomponent_p.h"
+#include "qdeclarativecomponent_p.h"
 #include "qdeclarativecontext.h"
-#include "private/qdeclarativecontext_p.h"
+#include "qdeclarativecontext_p.h"
 #ifdef QML_THREADED_VME_INTERPRETER
-#include "private/qdeclarativevme_p.h"
+#include "qdeclarativevme_p.h"
 #endif
 
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 32c6546d0a..06d543ab36 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -39,29 +39,29 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativecompiler_p.h"
+#include "qdeclarativecompiler_p.h"
 
 #include "qdeclarativepropertyvaluesource.h"
 #include "qdeclarativecomponent.h"
 #include <private/qmetaobjectbuilder_p.h>
-#include "private/qfastmetabuilder_p.h"
-#include "private/qdeclarativestringconverters_p.h"
-#include "private/qdeclarativeengine_p.h"
+#include <private/qfastmetabuilder_p.h>
+#include "qdeclarativestringconverters_p.h"
+#include "qdeclarativeengine_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativecontext.h"
-#include "private/qdeclarativemetatype_p.h"
-#include "private/qdeclarativecustomparser_p_p.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativecomponent_p.h"
-#include "parser/qdeclarativejsast_p.h"
-#include "private/qdeclarativevmemetaobject_p.h"
-#include "private/qdeclarativeexpression_p.h"
-#include "private/qdeclarativeproperty_p.h"
-#include "private/qdeclarativerewrite_p.h"
+#include "qdeclarativemetatype_p.h"
+#include "qdeclarativecustomparser_p_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativecomponent_p.h"
+#include <private/qdeclarativejsast_p.h>
+#include "qdeclarativevmemetaobject_p.h"
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativeproperty_p.h"
+#include "qdeclarativerewrite_p.h"
 #include "qdeclarativescriptstring.h"
-#include "private/qdeclarativeglobal_p.h"
-#include "private/qdeclarativebinding_p.h"
-#include "private/qv4compiler_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativebinding_p.h"
+#include <private/qv4compiler_p.h>
 
 #include <QColor>
 #include <QDebug>
@@ -3027,7 +3027,7 @@ bool QDeclarativeCompiler::checkValidId(QDeclarativeScript::Value *v, const QStr
     return true;
 }
 
-#include <qdeclarativejsparser_p.h>
+#include <private/qdeclarativejsparser_p.h>
 
 static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node)
 {
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 86471a65a2..ef37335ad8 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -55,15 +55,15 @@
 
 #include "qdeclarative.h"
 #include "qdeclarativeerror.h"
-#include "private/qv8_p.h"
-#include "private/qdeclarativeinstruction_p.h"
-#include "private/qdeclarativescript_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qbitfield_p.h"
-#include "private/qdeclarativepropertycache_p.h"
-#include "private/qdeclarativeintegercache_p.h"
-#include "private/qdeclarativetypenamecache_p.h"
-#include "private/qdeclarativetypeloader_p.h"
+#include <private/qv8_p.h>
+#include "qdeclarativeinstruction_p.h"
+#include "qdeclarativescript_p.h"
+#include "qdeclarativeengine_p.h"
+#include <private/qbitfield_p.h>
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativeintegercache_p.h"
+#include "qdeclarativetypenamecache_p.h"
+#include "qdeclarativetypeloader_p.h"
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qset.h>
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index eafe8539df..580ce5b801 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -40,25 +40,25 @@
 ****************************************************************************/
 
 #include "qdeclarativecomponent.h"
-#include "private/qdeclarativecomponent_p.h"
+#include "qdeclarativecomponent_p.h"
 
-#include "private/qdeclarativecompiler_p.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativevme_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativevme_p.h"
 #include "qdeclarative.h"
 #include "qdeclarativeengine.h"
-#include "private/qdeclarativebinding_p.h"
-#include "private/qdeclarativebinding_p_p.h"
-#include "private/qdeclarativeglobal_p.h"
-#include "private/qdeclarativescript_p.h"
-#include "private/qdeclarativedebugtrace_p.h"
-#include "private/qdeclarativeenginedebugservice_p.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativebinding_p_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativescript_p.h"
+#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeenginedebugservice_p.h>
 #include "qdeclarativeincubator.h"
-#include "private/qdeclarativeincubator_p.h"
+#include "qdeclarativeincubator_p.h"
 
-#include "private/qv8engine_p.h"
-#include "private/qv8include_p.h"
+#include <private/qv8engine_p.h>
+#include <private/qv8include_p.h>
 
 #include <QStack>
 #include <QStringList>
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index bbbf8bdfb7..ea68291942 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -55,11 +55,11 @@
 
 #include "qdeclarativecomponent.h"
 
-#include "private/qv8_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativetypeloader_p.h"
-#include "private/qbitfield_p.h"
-#include "private/qdeclarativevme_p.h"
+#include <private/qv8_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativetypeloader_p.h"
+#include <private/qbitfield_p.h>
+#include "qdeclarativevme_p.h"
 #include "qdeclarativeerror.h"
 #include "qdeclarative.h"
 
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index fc5091e09d..d4662cf43a 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -40,15 +40,15 @@
 ****************************************************************************/
 
 #include "qdeclarativecontext.h"
-#include "private/qdeclarativecontext_p.h"
+#include "qdeclarativecontext_p.h"
 
-#include "private/qdeclarativecomponent_p.h"
-#include "private/qdeclarativeexpression_p.h"
-#include "private/qdeclarativeengine_p.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativeengine_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativeinfo.h"
-#include "private/qv4bindings_p.h"
-#include "private/qv8bindings_p.h"
+#include <private/qv4bindings_p.h>
+#include <private/qv8bindings_p.h>
 
 #include <qjsengine.h>
 #include <QtCore/qvarlengtharray.h>
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index 6fd8957f7d..ba4edb8e15 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -55,19 +55,19 @@
 
 #include "qdeclarativecontext.h"
 
-#include "private/qdeclarativedata_p.h"
-#include "private/qdeclarativeintegercache_p.h"
-#include "private/qdeclarativetypenamecache_p.h"
-#include "private/qdeclarativenotifier_p.h"
+#include "qdeclarativedata_p.h"
+#include "qdeclarativeintegercache_p.h"
+#include "qdeclarativetypenamecache_p.h"
+#include "qdeclarativenotifier_p.h"
 #include "qdeclarativelist.h"
-#include "private/qdeclarativescript_p.h"
+#include "qdeclarativescript_p.h"
 
 #include <QtCore/qhash.h>
 #include <QtDeclarative/qjsvalue.h>
 #include <QtCore/qset.h>
 
 #include <private/qobject_p.h>
-#include "private/qdeclarativeguard_p.h"
+#include "qdeclarativeguard_p.h"
 
 #include <private/qv8_p.h>
 
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index 4327110d18..e783d3ac75 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativecustomparser_p.h"
-#include "private/qdeclarativecustomparser_p_p.h"
+#include "qdeclarativecustomparser_p.h"
+#include "qdeclarativecustomparser_p_p.h"
 
-#include "private/qdeclarativecompiler_p.h"
+#include "qdeclarativecompiler_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index 9aca8030c7..94b68652f4 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "private/qdeclarativemetatype_p.h"
+#include "qdeclarativemetatype_p.h"
 #include "qdeclarativeerror.h"
-#include "private/qdeclarativescript_p.h"
-#include "private/qdeclarativebinding_p.h"
+#include "qdeclarativescript_p.h"
+#include "qdeclarativebinding_p.h"
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qxmlstream.h>
diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h
index cebad26b33..7a9c58db23 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "private/qdeclarativecustomparser_p.h"
+#include "qdeclarativecustomparser_p.h"
 
-#include "private/qdeclarativescript_p.h"
+#include "qdeclarativescript_p.h"
 
 #include <QtCore/qglobal.h>
 
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp
index 08d953f3e4..0af6775b6e 100644
--- a/src/declarative/qml/qdeclarativedirparser.cpp
+++ b/src/declarative/qml/qdeclarativedirparser.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativedirparser_p.h"
+#include "qdeclarativedirparser_p.h"
 #include "qdeclarativeerror.h"
-#include <private/qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 
 #include <QtCore/QTextStream>
 #include <QtCore/QFile>
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 383d37a3ed..dc32c4147a 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -39,37 +39,37 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeengine_p.h"
+#include "qdeclarativeengine_p.h"
 #include "qdeclarativeengine.h"
 
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativecompiler_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativecompiler_p.h"
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeexpression.h"
 #include "qdeclarativecomponent.h"
-#include "private/qdeclarativebinding_p_p.h"
-#include "private/qdeclarativevme_p.h"
-#include "private/qdeclarativeenginedebugservice_p.h"
-#include "private/qdeclarativestringconverters_p.h"
-#include "private/qdeclarativexmlhttprequest_p.h"
-#include "private/qdeclarativesqldatabase_p.h"
+#include "qdeclarativebinding_p_p.h"
+#include "qdeclarativevme_p.h"
+#include <private/qdeclarativeenginedebugservice_p.h>
+#include "qdeclarativestringconverters_p.h"
+#include "qdeclarativexmlhttprequest_p.h"
+#include "qdeclarativesqldatabase_p.h"
 #include "qdeclarativescriptstring.h"
-#include "private/qdeclarativeglobal_p.h"
-#include "private/qdeclarativeworkerscript_p.h"
-#include "private/qdeclarativecomponent_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativeworkerscript_p.h"
+#include "qdeclarativecomponent_p.h"
 #include "qdeclarativenetworkaccessmanagerfactory.h"
 #include "qdeclarativeimageprovider.h"
-#include "private/qdeclarativedirparser_p.h"
+#include "qdeclarativedirparser_p.h"
 #include "qdeclarativeextensioninterface.h"
-#include "private/qdeclarativelist_p.h"
-#include "private/qdeclarativetypenamecache_p.h"
-#include "private/qdeclarativenotifier_p.h"
-#include "private/qdeclarativedebugtrace_p.h"
-#include "private/qdeclarativeapplication_p.h"
-#include "private/qv8debugservice_p.h"
+#include "qdeclarativelist_p.h"
+#include "qdeclarativetypenamecache_p.h"
+#include "qdeclarativenotifier_p.h"
+#include <private/qdeclarativedebugtrace_p.h>
+#include <private/qdeclarativeapplication_p.h>
+#include <private/qv8debugservice_p.h>
 #include "qdeclarativeincubator.h"
-#include "private/qv8profilerservice_p.h"
+#include <private/qv8profilerservice_p.h>
 
 #include <QtCore/qmetaobject.h>
 #include <QNetworkAccessManager>
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 71d6220860..88eda390e3 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -55,20 +55,20 @@
 
 #include "qdeclarativeengine.h"
 
-#include "private/qdeclarativetypeloader_p.h"
-#include "private/qdeclarativeimport_p.h"
-#include "private/qpodvector_p.h"
+#include "qdeclarativetypeloader_p.h"
+#include "qdeclarativeimport_p.h"
+#include <private/qpodvector_p.h>
 #include "qdeclarative.h"
-#include "private/qdeclarativevaluetype_p.h"
+#include "qdeclarativevaluetype_p.h"
 #include "qdeclarativecontext.h"
-#include "private/qdeclarativecontext_p.h"
+#include "qdeclarativecontext_p.h"
 #include "qdeclarativeexpression.h"
 #include "qdeclarativeimageprovider.h"
-#include "private/qdeclarativeproperty_p.h"
-#include "private/qdeclarativepropertycache_p.h"
-#include "private/qdeclarativemetatype_p.h"
-#include "private/qdeclarativedirparser_p.h"
-#include "private/qintrusivelist_p.h"
+#include "qdeclarativeproperty_p.h"
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativemetatype_p.h"
+#include "qdeclarativedirparser_p.h"
+#include <private/qintrusivelist_p.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index c62314d94b..27979afb9c 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "qdeclarativeexpression.h"
-#include "private/qdeclarativeexpression_p.h"
+#include "qdeclarativeexpression_p.h"
 
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativerewrite_p.h"
-#include "private/qdeclarativescriptstring_p.h"
-#include "private/qdeclarativecompiler_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativerewrite_p.h"
+#include "qdeclarativescriptstring_p.h"
+#include "qdeclarativecompiler_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp
index 93703e2bdc..5816b3f8cb 100644
--- a/src/declarative/qml/qdeclarativefastproperties.cpp
+++ b/src/declarative/qml/qdeclarativefastproperties.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativefastproperties_p.h"
+#include "qdeclarativefastproperties_p.h"
 
-#include <private/qdeclarativedata_p.h>
-#include <private/qdeclarativenotifier_p.h>
+#include "qdeclarativedata_p.h"
+#include "qdeclarativenotifier_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 21e91de910..f94e9e4bae 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -52,7 +52,7 @@
 #include <private/qdeclarativeengine_p.h>
 
 #ifdef Q_OS_SYMBIAN
-#include "private/qcore_symbian_p.h"
+#include <private/qcore_symbian_p.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp
index c771a6d469..1417ed466a 100644
--- a/src/declarative/qml/qdeclarativeincubator.cpp
+++ b/src/declarative/qml/qdeclarativeincubator.cpp
@@ -43,8 +43,8 @@
 #include "qdeclarativecomponent.h"
 #include "qdeclarativeincubator_p.h"
 
-#include <private/qdeclarativecompiler_p.h>
-#include <private/qdeclarativeexpression_p.h>
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativeexpression_p.h"
 
 // XXX TODO 
 //   - check that the Component.onCompleted behavior is the same as 4.8 in the synchronous and 
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index d221eaeefb..4f1bae002d 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -41,11 +41,11 @@
 
 #include "qdeclarativeinfo.h"
 
-#include "private/qdeclarativedata_p.h"
+#include "qdeclarativedata_p.h"
 #include "qdeclarativecontext.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativemetatype_p.h"
-#include "private/qdeclarativeengine_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativemetatype_p.h"
+#include "qdeclarativeengine_p.h"
 
 #include <QCoreApplication>
 
diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp
index c47f68f5bf..5f8b253858 100644
--- a/src/declarative/qml/qdeclarativeinstruction.cpp
+++ b/src/declarative/qml/qdeclarativeinstruction.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeinstruction_p.h"
+#include "qdeclarativeinstruction_p.h"
 
-#include "private/qdeclarativecompiler_p.h"
+#include "qdeclarativecompiler_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp
index 16bf8d1dab..372c7a2b3b 100644
--- a/src/declarative/qml/qdeclarativeintegercache.cpp
+++ b/src/declarative/qml/qdeclarativeintegercache.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeintegercache_p.h"
+#include "qdeclarativeintegercache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h
index 1ac03ada66..ee2fbc2b66 100644
--- a/src/declarative/qml/qdeclarativeintegercache_p.h
+++ b/src/declarative/qml/qdeclarativeintegercache_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "private/qdeclarativerefcount_p.h"
-#include "private/qhashedstring_p.h"
+#include <private/qdeclarativerefcount_p.h>
+#include <private/qhashedstring_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp
index 458812a896..04cef6c737 100644
--- a/src/declarative/qml/qdeclarativelist.cpp
+++ b/src/declarative/qml/qdeclarativelist.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include "qdeclarativelist.h"
-#include "private/qdeclarativelist_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativeproperty_p.h"
+#include "qdeclarativelist_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeproperty_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativelist_p.h b/src/declarative/qml/qdeclarativelist_p.h
index 8a69504c28..10495e990c 100644
--- a/src/declarative/qml/qdeclarativelist_p.h
+++ b/src/declarative/qml/qdeclarativelist_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qdeclarativelist.h"
-#include "private/qdeclarativeguard_p.h"
+#include "qdeclarativeguard_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 0590b2c7e4..5577993fc5 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtDeclarative/qdeclarativeprivate.h>
-#include "private/qdeclarativemetatype_p.h"
+#include "qdeclarativemetatype_p.h"
 
 #include <private/qdeclarativeproxymetaobject_p.h>
 #include <private/qdeclarativecustomparser_p.h>
diff --git a/src/declarative/qml/qdeclarativenotifier.cpp b/src/declarative/qml/qdeclarativenotifier.cpp
index 77bce8e440..a195280316 100644
--- a/src/declarative/qml/qdeclarativenotifier.cpp
+++ b/src/declarative/qml/qdeclarativenotifier.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativenotifier_p.h"
-#include "private/qdeclarativeproperty_p.h"
+#include "qdeclarativenotifier_p.h"
+#include "qdeclarativeproperty_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h
index d9c334a4c1..1d0d4fc6f5 100644
--- a/src/declarative/qml/qdeclarativenotifier_p.h
+++ b/src/declarative/qml/qdeclarativenotifier_p.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVENOTIFIER_P_H
 #define QDECLARATIVENOTIFIER_P_H
 
-#include "private/qdeclarativedata_p.h"
-#include "private/qdeclarativeguard_p.h"
+#include "qdeclarativedata_p.h"
+#include "qdeclarativeguard_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index e43cd6f9e2..a402d24fe8 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -40,21 +40,21 @@
 ****************************************************************************/
 
 #include "qdeclarativeproperty.h"
-#include "private/qdeclarativeproperty_p.h"
+#include "qdeclarativeproperty_p.h"
 
 #include "qdeclarative.h"
-#include "private/qdeclarativebinding_p.h"
+#include "qdeclarativebinding_p.h"
 #include "qdeclarativecontext.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativeboundsignal_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativeboundsignal_p.h"
 #include "qdeclarativeengine.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativedata_p.h"
-#include "private/qdeclarativestringconverters_p.h"
-#include "private/qdeclarativelist_p.h"
-#include "private/qdeclarativecompiler_p.h"
-#include "private/qdeclarativevmemetaobject_p.h"
-#include "private/qdeclarativeexpression_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativedata_p.h"
+#include "qdeclarativestringconverters_p.h"
+#include "qdeclarativelist_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativevmemetaobject_p.h"
+#include "qdeclarativeexpression_p.h"
 
 #include <QStringList>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
index 6337750335..cf2022cb0a 100644
--- a/src/declarative/qml/qdeclarativepropertycache.cpp
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativepropertycache_p.h"
+#include "qdeclarativepropertycache_p.h"
 
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativebinding_p.h"
-#include "private/qv8engine_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativebinding_p.h"
+#include <private/qv8engine_p.h>
 
 #include <private/qmetaobject_p.h>
 
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index f1161b2e6f..068db589bd 100644
--- a/src/declarative/qml/qdeclarativepropertycache_p.h
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -53,11 +53,11 @@
 // We mean it.
 //
 
-#include "private/qdeclarativerefcount_p.h"
-#include "private/qdeclarativecleanup_p.h"
-#include "private/qdeclarativenotifier_p.h"
+#include <private/qdeclarativerefcount_p.h>
+#include "qdeclarativecleanup_p.h"
+#include "qdeclarativenotifier_p.h"
 
-#include "private/qhashedstring_p.h"
+#include <private/qhashedstring_p.h>
 #include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp
index 3263ae5af2..f4029fc76b 100644
--- a/src/declarative/qml/qdeclarativeproxymetaobject.cpp
+++ b/src/declarative/qml/qdeclarativeproxymetaobject.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeproxymetaobject_p.h"
-#include "private/qdeclarativeproperty_p.h"
+#include "qdeclarativeproxymetaobject_p.h"
+#include "qdeclarativeproperty_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativerewrite.cpp b/src/declarative/qml/qdeclarativerewrite.cpp
index be399dd074..98bd34f9ed 100644
--- a/src/declarative/qml/qdeclarativerewrite.cpp
+++ b/src/declarative/qml/qdeclarativerewrite.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativerewrite_p.h"
+#include "qdeclarativerewrite_p.h"
 
-#include "private/qdeclarativeglobal_p.h"
+#include "qdeclarativeglobal_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qdeclarativescript.cpp b/src/declarative/qml/qdeclarativescript.cpp
index 2bc358a579..fb4f26a781 100644
--- a/src/declarative/qml/qdeclarativescript.cpp
+++ b/src/declarative/qml/qdeclarativescript.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativescript_p.h"
+#include "qdeclarativescript_p.h"
 
 #include "parser/qdeclarativejsengine_p.h"
 #include "parser/qdeclarativejsparser_p.h"
@@ -47,7 +47,7 @@
 #include "parser/qdeclarativejsmemorypool_p.h"
 #include "parser/qdeclarativejsastvisitor_p.h"
 #include "parser/qdeclarativejsast_p.h"
-#include "private/qdeclarativerewrite_p.h"
+#include <private/qdeclarativerewrite_p.h>
 
 #include <QStack>
 #include <QCoreApplication>
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
index 7fc62078f3..dff87b2f78 100644
--- a/src/declarative/qml/qdeclarativesqldatabase.cpp
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -39,12 +39,11 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativesqldatabase_p.h"
+#include "qdeclarativesqldatabase_p.h"
 
 #include "qdeclarativeengine.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativerefcount_p.h"
-#include "private/qdeclarativeengine_p.h"
+#include "qdeclarativeengine_p.h"
+#include <private/qdeclarativerefcount_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtSql/qsqldatabase.h>
diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp
index b949adf5ec..51bb3a4517 100644
--- a/src/declarative/qml/qdeclarativestringconverters.cpp
+++ b/src/declarative/qml/qdeclarativestringconverters.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativestringconverters_p.h"
+#include "qdeclarativestringconverters_p.h"
 
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector3d.h>
diff --git a/src/declarative/qml/qdeclarativetypenamecache.cpp b/src/declarative/qml/qdeclarativetypenamecache.cpp
index 31ad48a0dd..8ff6532bd5 100644
--- a/src/declarative/qml/qdeclarativetypenamecache.cpp
+++ b/src/declarative/qml/qdeclarativetypenamecache.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativetypenamecache_p.h"
+#include "qdeclarativetypenamecache_p.h"
 
-#include "private/qdeclarativeengine_p.h"
+#include "qdeclarativeengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativetypenamecache_p.h b/src/declarative/qml/qdeclarativetypenamecache_p.h
index 219d07a5eb..a0a3d53d87 100644
--- a/src/declarative/qml/qdeclarativetypenamecache_p.h
+++ b/src/declarative/qml/qdeclarativetypenamecache_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "private/qdeclarativerefcount_p.h"
-#include "private/qdeclarativecleanup_p.h"
-#include "private/qdeclarativemetatype_p.h"
+#include <private/qdeclarativerefcount_p.h>
+#include "qdeclarativecleanup_p.h"
+#include "qdeclarativemetatype_p.h"
 
 #include <private/qhashedstring_p.h>
 
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index 3e77f4b503..9f43d0ef72 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativevaluetype_p.h"
+#include "qdeclarativevaluetype_p.h"
 
-#include "private/qdeclarativemetatype_p.h"
-#include "private/qfont_p.h"
+#include "qdeclarativemetatype_p.h"
+#include <private/qfont_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 41d5e7cb8f..1feab4147b 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -54,8 +54,8 @@
 //
 
 #include "qdeclarativeproperty.h"
-#include "private/qdeclarativeproperty_p.h"
-#include "private/qdeclarativenullablevalue_p_p.h"
+#include "qdeclarativeproperty_p.h"
+#include "qdeclarativenullablevalue_p_p.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index d407fae1ce..b7abef4aef 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -39,29 +39,29 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativevme_p.h"
+#include "qdeclarativevme_p.h"
 
-#include "private/qdeclarativecompiler_p.h"
-#include "private/qdeclarativeboundsignal_p.h"
-#include "private/qdeclarativestringconverters_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativeboundsignal_p.h"
+#include "qdeclarativestringconverters_p.h"
 #include <private/qmetaobjectbuilder_p.h>
-#include "private/qfastmetabuilder_p.h"
-#include "private/qdeclarativedata_p.h"
+#include <private/qfastmetabuilder_p.h>
+#include "qdeclarativedata_p.h"
 #include "qdeclarative.h"
-#include "private/qdeclarativecustomparser_p.h"
+#include "qdeclarativecustomparser_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativecomponent.h"
-#include "private/qdeclarativebinding_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativecomponent_p.h"
-#include "private/qdeclarativevmemetaobject_p.h"
-#include "private/qdeclarativebinding_p_p.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qv4bindings_p.h"
-#include "private/qv8bindings_p.h"
-#include "private/qdeclarativeglobal_p.h"
-#include "private/qfinitestack_p.h"
+#include "qdeclarativebinding_p.h"
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativevmemetaobject_p.h"
+#include "qdeclarativebinding_p_p.h"
+#include "qdeclarativecontext_p.h"
+#include <private/qv4bindings_p.h>
+#include <private/qv8bindings_p.h>
+#include "qdeclarativeglobal_p.h"
+#include <private/qfinitestack_p.h>
 #include "qdeclarativescriptstring.h"
 #include "qdeclarativescriptstring_p.h"
 
diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h
index 19db2ef217..b74bc547bf 100644
--- a/src/declarative/qml/qdeclarativevme_p.h
+++ b/src/declarative/qml/qdeclarativevme_p.h
@@ -54,9 +54,9 @@
 //
 
 #include "qdeclarativeerror.h"
-#include "private/qbitfield_p.h"
-#include "private/qdeclarativeinstruction_p.h"
-#include "private/qrecursionwatcher_p.h"
+#include <private/qbitfield_p.h>
+#include "qdeclarativeinstruction_p.h"
+#include <private/qrecursionwatcher_p.h>
 
 #include <QtCore/QStack>
 #include <QtCore/QString>
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index abf73490d1..9cdec020a7 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativevmemetaobject_p.h"
+#include "qdeclarativevmemetaobject_p.h"
 
 #include "qdeclarative.h"
-#include "private/qdeclarativerefcount_p.h"
+#include <private/qdeclarativerefcount_p.h>
 #include "qdeclarativeexpression.h"
-#include "private/qdeclarativeexpression_p.h"
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativebinding_p.h"
+#include "qdeclarativeexpression_p.h"
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativebinding_p.h"
 
 Q_DECLARE_METATYPE(QJSValue);
 
diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h
index 0c02b7632c..400961b27f 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject_p.h
+++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h
@@ -65,11 +65,11 @@
 
 #include <private/qobject_p.h>
 
-#include "private/qdeclarativeguard_p.h"
-#include "private/qdeclarativecompiler_p.h"
-#include "private/qdeclarativecontext_p.h"
+#include "qdeclarativeguard_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativecontext_p.h"
 
-#include "private/qv8gccallback_p.h"
+#include <private/qv8gccallback_p.h>
 
 #include <private/qv8_p.h>
 
diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp
index 33f0358003..42c0b5cc72 100644
--- a/src/declarative/qml/qdeclarativewatcher.cpp
+++ b/src/declarative/qml/qdeclarativewatcher.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativewatcher_p.h"
+#include "qdeclarativewatcher_p.h"
 
 #include "qdeclarativeexpression.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarative.h"
 
-#include <qdeclarativedebugservice_p.h>
-#include "private/qdeclarativeproperty_p.h"
-#include "private/qdeclarativevaluetype_p.h"
+#include <private/qdeclarativedebugservice_p.h>
+#include "qdeclarativeproperty_p.h"
+#include "qdeclarativevaluetype_p.h"
 
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index c6425d087c..98aaddceef 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeworkerscript_p.h"
-#include "private/qdeclarativelistmodel_p.h"
-#include "private/qdeclarativelistmodelworkeragent_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativeexpression_p.h"
+#include "qdeclarativeworkerscript_p.h"
+#include <private/qdeclarativelistmodel_p.h>
+#include <private/qdeclarativelistmodelworkeragent_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeexpression_p.h"
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 23f21c91e3..0009163036 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativexmlhttprequest_p.h"
+#include "qdeclarativexmlhttprequest_p.h"
 
 #include <private/qv8engine_p.h>
 
 #include "qdeclarativeengine.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativerefcount_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativeexpression_p.h"
+#include "qdeclarativeengine_p.h"
+#include <private/qdeclarativerefcount_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeexpression_p.h"
 #include "qdeclarativeglobal_p.h"
-#include "qv8domerrors_p.h"
+#include <private/qv8domerrors_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtDeclarative/qjsvalue.h>
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 608b212915..b14e547f40 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -1,4 +1,3 @@
-INCLUDEPATH += $$PWD
 SOURCES += \
     $$PWD/qdeclarativeinstruction.cpp \
     $$PWD/qdeclarativevmemetaobject.cpp \
diff --git a/src/declarative/qml/rewriter/rewriter.pri b/src/declarative/qml/rewriter/rewriter.pri
index a9fa1b5772..e51ee5ba4e 100644
--- a/src/declarative/qml/rewriter/rewriter.pri
+++ b/src/declarative/qml/rewriter/rewriter.pri
@@ -1,4 +1,2 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += $$PWD/textwriter_p.h
 SOURCES += $$PWD/textwriter.cpp
diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp
index d3a68d0ecc..e4b4597ebf 100644
--- a/src/declarative/qml/rewriter/textwriter.cpp
+++ b/src/declarative/qml/rewriter/textwriter.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/textwriter_p.h"
+#include "textwriter_p.h"
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/v4/qv4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp
index b5229ae89c..2e8a360f36 100644
--- a/src/declarative/qml/v4/qv4bindings.cpp
+++ b/src/declarative/qml/v4/qv4bindings.cpp
@@ -41,10 +41,10 @@
 
 // #define REGISTER_CLEANUP_DEBUG
 
-#include "private/qv4bindings_p.h"
-#include "private/qv4program_p.h"
-#include "private/qv4compiler_p.h"
-#include "private/qv4compiler_p_p.h"
+#include "qv4bindings_p.h"
+#include "qv4program_p.h"
+#include "qv4compiler_p.h"
+#include "qv4compiler_p_p.h"
 
 #include <private/qdeclarativefastproperties_p.h>
 #include <private/qdeclarativedebugtrace_p.h>
diff --git a/src/declarative/qml/v4/qv4ir_p.h b/src/declarative/qml/v4/qv4ir_p.h
index 86b0d9d03e..9dbd22047a 100644
--- a/src/declarative/qml/v4/qv4ir_p.h
+++ b/src/declarative/qml/v4/qv4ir_p.h
@@ -60,7 +60,7 @@
 #include <private/qdeclarativeengine_p.h>
 #include <private/qv4compiler_p.h>
 
-#include <qdeclarativepool_p.h>
+#include <private/qdeclarativepool_p.h>
 #include <QtCore/qvarlengtharray.h>
 
 // #define DEBUG_IR_STRUCTURE
diff --git a/src/declarative/qml/v4/v4.pri b/src/declarative/qml/v4/v4.pri
index a96975d44e..b6784851d8 100644
--- a/src/declarative/qml/v4/v4.pri
+++ b/src/declarative/qml/v4/v4.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += \
     $$PWD/qv4compiler_p.h \
     $$PWD/qv4compiler_p_p.h \
diff --git a/src/declarative/qml/v8/qjsvalueiterator_impl_p.h b/src/declarative/qml/v8/qjsvalueiterator_impl_p.h
index 68075e55f3..102c7879d8 100644
--- a/src/declarative/qml/v8/qjsvalueiterator_impl_p.h
+++ b/src/declarative/qml/v8/qjsvalueiterator_impl_p.h
@@ -24,9 +24,9 @@
 #ifndef QJSVALUEITERATOR_IMPL_P_H
 #define QJSVALUEITERATOR_IMPL_P_H
 
-#include <qjsvalueiterator_p.h>
-#include <qv8engine_p.h>
-#include <qjsconverter_p.h>
+#include "qjsvalueiterator_p.h"
+#include <private/qv8engine_p.h>
+#include "qjsconverter_p.h"
 
 inline QJSValueIteratorPrivate::QJSValueIteratorPrivate(const QJSValuePrivate* value)
     : m_object(const_cast<QJSValuePrivate*>(value))
diff --git a/src/declarative/qml/v8/qv8bindings_p.h b/src/declarative/qml/v8/qv8bindings_p.h
index 60b1afd551..f7581a41aa 100644
--- a/src/declarative/qml/v8/qv8bindings_p.h
+++ b/src/declarative/qml/v8/qv8bindings_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "private/qdeclarativepropertycache_p.h"
-#include "private/qdeclarativeexpression_p.h"
-#include "private/qdeclarativebinding_p.h"
+#include <private/qdeclarativepropertycache_p.h>
+#include <private/qdeclarativeexpression_p.h>
+#include <private/qdeclarativebinding_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/v8/qv8variantwrapper.cpp b/src/declarative/qml/v8/qv8variantwrapper.cpp
index 4b2acfc965..fbf083273d 100644
--- a/src/declarative/qml/v8/qv8variantwrapper.cpp
+++ b/src/declarative/qml/v8/qv8variantwrapper.cpp
@@ -41,7 +41,7 @@
 
 #include "qv8variantwrapper_p.h"
 #include "qv8engine_p.h"
-#include "qdeclarativeengine_p.h"
+#include <private/qdeclarativeengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/v8/script.pri b/src/declarative/qml/v8/script.pri
index 68a8c64c27..587ab6f42d 100644
--- a/src/declarative/qml/v8/script.pri
+++ b/src/declarative/qml/v8/script.pri
@@ -1,6 +1,3 @@
-
-INCLUDEPATH += $$PWD
-
 SOURCES += \
     $$PWD/qjsengine.cpp \
     $$PWD/qjsvalue.cpp \
diff --git a/src/declarative/qml/v8/v8.pri b/src/declarative/qml/v8/v8.pri
index 104f34fd25..c4372ab82a 100644
--- a/src/declarative/qml/v8/v8.pri
+++ b/src/declarative/qml/v8/v8.pri
@@ -1,5 +1,4 @@
 INCLUDEPATH += $$PWD/../../../3rdparty/javascriptcore
-INCLUDEPATH += $$PWD
 
 include(script.pri)
 
diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp
index 45aef3481d..b22631afae 100644
--- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp
@@ -45,7 +45,7 @@
 #include "qsgnodeupdater_p.h"
 #include "qsggeometry_p.h"
 
-#include "private/qsgadaptationlayer_p.h"
+#include <private/qsgadaptationlayer_p.h>
 
 #include <QOpenGLShaderProgram>
 #include <qopenglframebufferobject.h>
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
index a5bdf36d16..9004549a3a 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
@@ -44,7 +44,7 @@
 
 #include <private/qsgadaptationlayer_p.h>
 #include "qsgtexture.h"
-#include <qsgtext_p.h>
+#include <private/qsgtext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/scenegraph/scenegraph.pri b/src/declarative/scenegraph/scenegraph.pri
index d29a3bc561..d4e0707ba3 100644
--- a/src/declarative/scenegraph/scenegraph.pri
+++ b/src/declarative/scenegraph/scenegraph.pri
@@ -1,4 +1,3 @@
-INCLUDEPATH += $$PWD/coreapi $$PWD/convenience $$PWD/3d
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
 
 # Core API
diff --git a/src/declarative/scenegraph/util/qsgtextureprovider.cpp b/src/declarative/scenegraph/util/qsgtextureprovider.cpp
index 49d157d480..5605f28602 100644
--- a/src/declarative/scenegraph/util/qsgtextureprovider.cpp
+++ b/src/declarative/scenegraph/util/qsgtextureprovider.cpp
@@ -41,8 +41,8 @@
 
 #include "qsgtextureprovider_p.h"
 
-#include <qsgimage_p.h>
-#include <qsgshadereffectsource_p.h>
+#include <private/qsgimage_p.h>
+#include <private/qsgshadereffectsource_p.h>
 
 #ifndef GL_CLAMP_TO_EDGE
 #define GL_CLAMP_TO_EDGE 0x812F
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index bbb5e33aa2..2fe2aa014a 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -39,23 +39,23 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeanimation_p.h"
-#include "private/qdeclarativeanimation_p_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
 
-#include "private/qdeclarativebehavior_p.h"
-#include "private/qdeclarativestateoperations_p.h"
-#include "private/qdeclarativecontext_p.h"
+#include <private/qdeclarativebehavior_p.h>
+#include <private/qdeclarativestateoperations_p.h>
+#include <private/qdeclarativecontext_p.h>
 
 #include <qdeclarativepropertyvaluesource.h>
 #include <qdeclarative.h>
 #include <qdeclarativeinfo.h>
 #include <qdeclarativeexpression.h>
-#include <qdeclarativestringconverters_p.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativemetatype_p.h>
-#include <qdeclarativevaluetype_p.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativestringconverters_p.h>
+#include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativemetatype_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 #include <qvariant.h>
 #include <qcolor.h>
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 30f05ececa..ac2cb3c8e8 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVEANIMATION_H
 #define QDECLARATIVEANIMATION_H
 
-#include "private/qdeclarativetransition_p.h"
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativestate_p.h"
 #include <QtGui/qvector3d.h>
 
 #include <qdeclarativepropertyvaluesource.h>
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index 17caa9a52f..a14356d0c7 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "private/qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p.h"
 
-#include "private/qdeclarativenullablevalue_p_p.h"
-#include "private/qdeclarativetimeline_p_p.h"
+#include <private/qdeclarativenullablevalue_p_p.h>
+#include <private/qdeclarativetimeline_p_p.h>
 
 #include <qdeclarative.h>
 #include <qdeclarativecontext.h>
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 71bbc7f2ac..3b0ec86ec2 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativebehavior_p.h"
+#include "qdeclarativebehavior_p.h"
 
-#include "private/qdeclarativeanimation_p.h"
-#include "private/qdeclarativetransition_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativetransition_p.h"
 
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativeguard_p.h>
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 #include <private/qobject_p.h>
 
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
index 732754bc31..233be2b232 100644
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEBEHAVIOR_H
 #define QDECLARATIVEBEHAVIOR_H
 
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativestate_p.h"
 
 #include <qdeclarativepropertyvaluesource.h>
 #include <qdeclarativepropertyvalueinterceptor.h>
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index ba120b959a..5d62830cdd 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativebind_p.h"
+#include "qdeclarativebind_p.h"
 
-#include "private/qdeclarativenullablevalue_p_p.h"
-#include "private/qdeclarativeproperty_p.h"
-#include "private/qdeclarativebinding_p.h"
-#include "private/qdeclarativeguard_p.h"
+#include <private/qdeclarativenullablevalue_p_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativeguard_p.h>
 
 #include <qdeclarativeengine.h>
 #include <qdeclarativecontext.h>
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index adb9b15fe7..c57363fdfe 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeconnections_p.h"
+#include "qdeclarativeconnections_p.h"
 
 #include <qdeclarativeexpression.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativeboundsignal_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativeboundsignal_p.h>
 #include <qdeclarativecontext.h>
-#include <qdeclarativecontext_p.h>
+#include <private/qdeclarativecontext_p.h>
 #include <qdeclarativeinfo.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index f7a7738172..e95bd11a7b 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativefontloader_p.h"
+#include "qdeclarativefontloader_p.h"
 
 #include <qdeclarativecontext.h>
 #include <qdeclarativeengine.h>
diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp
index e85b1ed8d0..0063514e59 100644
--- a/src/declarative/util/qdeclarativelistaccessor.cpp
+++ b/src/declarative/util/qdeclarativelistaccessor.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativelistaccessor_p.h"
+#include "qdeclarativelistaccessor_p.h"
 
-#include <qdeclarativemetatype_p.h>
+#include <private/qdeclarativemetatype_p.h>
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdebug.h>
 
 // ### Remove me
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index cf1dd3b894..4e67182048 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativelistmodel_p_p.h"
-#include "private/qdeclarativelistmodelworkeragent_p.h"
-#include "private/qdeclarativeopenmetaobject_p.h"
-#include "parser/qdeclarativejsast_p.h"
-#include "parser/qdeclarativejsengine_p.h"
-
-#include <qdeclarativecustomparser_p.h>
-#include <qdeclarativescript_p.h>
-#include <qdeclarativeengine_p.h>
+#include "qdeclarativelistmodel_p_p.h"
+#include "qdeclarativelistmodelworkeragent_p.h"
+#include "qdeclarativeopenmetaobject_p.h"
+#include <private/qdeclarativejsast_p.h>
+#include <private/qdeclarativejsengine_p.h>
+
+#include <private/qdeclarativecustomparser_p.h>
+#include <private/qdeclarativescript_p.h>
+#include <private/qdeclarativeengine_p.h>
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index 971f0d8d82..99cab4cab9 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "private/qdeclarativelistmodel_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativeopenmetaobject_p.h"
-#include "qdeclarative.h"
+#include "qdeclarativelistmodel_p.h"
+#include <private/qdeclarativeengine_p.h>
+#include "qdeclarativeopenmetaobject_p.h"
+#include <qdeclarative.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
index c6855d354b..b27e3e387f 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativelistmodelworkeragent_p.h"
-#include "private/qdeclarativelistmodel_p_p.h"
-#include "private/qdeclarativedata_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "qdeclarativeinfo.h"
+#include "qdeclarativelistmodelworkeragent_p.h"
+#include "qdeclarativelistmodel_p_p.h"
+#include <private/qdeclarativedata_p.h>
+#include <private/qdeclarativeengine_p.h>
+#include <qdeclarativeinfo.h>
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index d814029334..12505e942c 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarative.h"
+#include <qdeclarative.h>
 
 #include <QtGui/qevent.h>
 #include <QMutex>
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp
index 695d28a717..d4dd8242c4 100644
--- a/src/declarative/util/qdeclarativeopenmetaobject.cpp
+++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeopenmetaobject_p.h"
-#include "private/qdeclarativepropertycache_p.h"
-#include "private/qdeclarativedata_p.h"
+#include "qdeclarativeopenmetaobject_p.h"
+#include <private/qdeclarativepropertycache_p.h>
+#include <private/qdeclarativedata_p.h>
 #include <private/qmetaobjectbuilder_p.h>
 #include <qdebug.h>
 
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp
index 4973ee212a..1d46574f02 100644
--- a/src/declarative/util/qdeclarativepackage.cpp
+++ b/src/declarative/util/qdeclarativepackage.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativepackage_p.h"
+#include "qdeclarativepackage_p.h"
 
 #include <private/qobject_p.h>
 #include <private/qdeclarativeguard_p.h>
diff --git a/src/declarative/util/qdeclarativepath.cpp b/src/declarative/util/qdeclarativepath.cpp
index 05d56e0c1b..146fbf9950 100644
--- a/src/declarative/util/qdeclarativepath.cpp
+++ b/src/declarative/util/qdeclarativepath.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativepath_p.h"
-#include "private/qdeclarativepath_p_p.h"
-#include "private/qdeclarativesvgparser_p.h"
+#include "qdeclarativepath_p.h"
+#include "qdeclarativepath_p_p.h"
+#include "qdeclarativesvgparser_p.h"
 
 #include <QSet>
 #include <QTime>
diff --git a/src/declarative/util/qdeclarativepath_p.h b/src/declarative/util/qdeclarativepath_p.h
index e9972404da..e449e23085 100644
--- a/src/declarative/util/qdeclarativepath_p.h
+++ b/src/declarative/util/qdeclarativepath_p.h
@@ -44,7 +44,7 @@
 
 #include <qdeclarative.h>
 
-#include "private/qdeclarativenullablevalue_p_p.h"
+#include <private/qdeclarativenullablevalue_p_p.h>
 #include <private/qbezier_p.h>
 
 #include <QtCore/QObject>
diff --git a/src/declarative/util/qdeclarativepath_p_p.h b/src/declarative/util/qdeclarativepath_p_p.h
index c7313ea225..910b7627d3 100644
--- a/src/declarative/util/qdeclarativepath_p_p.h
+++ b/src/declarative/util/qdeclarativepath_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "private/qdeclarativepath_p.h"
+#include "qdeclarativepath_p.h"
 
 #include <qdeclarative.h>
 #include <QtCore/QStringList>
diff --git a/src/declarative/util/qdeclarativepathinterpolator.cpp b/src/declarative/util/qdeclarativepathinterpolator.cpp
index db6ef155b7..569884d33a 100644
--- a/src/declarative/util/qdeclarativepathinterpolator.cpp
+++ b/src/declarative/util/qdeclarativepathinterpolator.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativepathinterpolator_p.h"
 
-#include "private/qdeclarativepath_p.h"
+#include "qdeclarativepath_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 276219eb45..556524cc60 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativepixmapcache_p.h"
-#include "qdeclarativenetworkaccessmanagerfactory.h"
-#include "qdeclarativeimageprovider.h"
+#include "qdeclarativepixmapcache_p.h"
+#include <qdeclarativenetworkaccessmanagerfactory.h>
+#include <qdeclarativeimageprovider.h>
 
 #include <qdeclarativeengine.h>
 #include <private/qdeclarativeglobal_p.h>
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 3684b38048..fc559431c2 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -39,23 +39,23 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativepropertychanges_p.h"
+#include "qdeclarativepropertychanges_p.h"
 
-#include "private/qdeclarativeopenmetaobject_p.h"
-#include "private/qdeclarativerewrite_p.h"
-#include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativecompiler_p.h"
+#include "qdeclarativeopenmetaobject_p.h"
+#include <private/qdeclarativerewrite_p.h>
+#include <private/qdeclarativeengine_p.h>
+#include <private/qdeclarativecompiler_p.h>
 
 #include <qdeclarativeinfo.h>
-#include <qdeclarativecustomparser_p.h>
-#include <qdeclarativescript_p.h>
+#include <private/qdeclarativecustomparser_p.h>
+#include <private/qdeclarativescript_p.h>
 #include <qdeclarativeexpression.h>
-#include <qdeclarativebinding_p.h>
+#include <private/qdeclarativebinding_p.h>
 #include <qdeclarativecontext.h>
-#include <qdeclarativeguard_p.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativecontext_p.h>
-#include <qdeclarativestate_p_p.h>
+#include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativecontext_p.h>
+#include <private/qdeclarativestate_p_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h
index fe3dc39626..6d3e032b57 100644
--- a/src/declarative/util/qdeclarativepropertychanges_p.h
+++ b/src/declarative/util/qdeclarativepropertychanges_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEPROPERTYCHANGES_H
 #define QDECLARATIVEPROPERTYCHANGES_H
 
-#include "private/qdeclarativestateoperations_p.h"
+#include "qdeclarativestateoperations_p.h"
 #include <private/qdeclarativecustomparser_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp
index 6e0c12da30..1149683ea6 100644
--- a/src/declarative/util/qdeclarativepropertymap.cpp
+++ b/src/declarative/util/qdeclarativepropertymap.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativepropertymap.h"
 
 #include <private/qmetaobjectbuilder_p.h>
-#include "private/qdeclarativeopenmetaobject_p.h"
+#include "qdeclarativeopenmetaobject_p.h"
 
 #include <QDebug>
 
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index dd7bfe2231..45c6885fbb 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativesmoothedanimation_p.h"
-#include "private/qdeclarativesmoothedanimation_p_p.h"
+#include "qdeclarativesmoothedanimation_p.h"
+#include "qdeclarativesmoothedanimation_p_p.h"
 
-#include "private/qdeclarativeanimation_p_p.h"
+#include "qdeclarativeanimation_p_p.h"
 
 #include <qdeclarativeproperty.h>
-#include "private/qdeclarativeproperty_p.h"
+#include <private/qdeclarativeproperty_p.h>
 
-#include "private/qdeclarativeglobal_p.h"
+#include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h
index b1cb44f974..9417383c1e 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVESMOOTHEDANIMATION_H
 
 #include <qdeclarative.h>
-#include "private/qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p.h"
 
 #include <QtCore/qobject.h>
 
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
index 224dc75f2f..08b1450342 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "private/qdeclarativesmoothedanimation_p.h"
-#include "private/qdeclarativeanimation_p.h"
+#include "qdeclarativesmoothedanimation_p.h"
+#include "qdeclarativeanimation_p.h"
 
-#include "private/qdeclarativeanimation_p_p.h"
+#include "qdeclarativeanimation_p_p.h"
 
 #include <qparallelanimationgroup.h>
 
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp
index 619811f789..b0b12c7ba4 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativespringanimation_p.h"
+#include "qdeclarativespringanimation_p.h"
 
-#include "private/qdeclarativeanimation_p_p.h"
-#include <qdeclarativeproperty_p.h>
+#include "qdeclarativeanimation_p_p.h"
+#include <private/qdeclarativeproperty_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/util/qdeclarativespringanimation_p.h b/src/declarative/util/qdeclarativespringanimation_p.h
index bb9762b3a8..14a34b47c5 100644
--- a/src/declarative/util/qdeclarativespringanimation_p.h
+++ b/src/declarative/util/qdeclarativespringanimation_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVESPRINGANIMATION_H
 
 #include <qdeclarative.h>
-#include "private/qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p.h"
 
 #include <QtCore/qobject.h>
 
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 4779208c5f..e5e245f715 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativestate_p_p.h"
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativestate_p_p.h"
+#include "qdeclarativestate_p.h"
 
-#include "private/qdeclarativetransition_p.h"
-#include "private/qdeclarativestategroup_p.h"
-#include "private/qdeclarativestateoperations_p.h"
-#include "private/qdeclarativeanimation_p.h"
-#include "private/qdeclarativeanimation_p_p.h"
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativestategroup_p.h"
+#include "qdeclarativestateoperations_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
 
-#include <qdeclarativebinding_p.h>
-#include <qdeclarativeglobal_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 2479413511..5ddd0d5e8a 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativestate_p.h"
 
-#include "private/qdeclarativeanimation_p_p.h"
-#include "private/qdeclarativetransitionmanager_p_p.h"
+#include "qdeclarativeanimation_p_p.h"
+#include "qdeclarativetransitionmanager_p_p.h"
 
 #include <private/qdeclarativeproperty_p.h>
 #include <private/qdeclarativeguard_p.h>
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index a349ea9e85..c29aaa723c 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativestategroup_p.h"
+#include "qdeclarativestategroup_p.h"
 
-#include "private/qdeclarativetransition_p.h"
-#include "private/qdeclarativestate_p_p.h"
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativestate_p_p.h"
 
-#include <qdeclarativebinding_p.h>
-#include <qdeclarativeglobal_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qstringbuilder.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h
index e539f3fb16..c59325580b 100644
--- a/src/declarative/util/qdeclarativestategroup_p.h
+++ b/src/declarative/util/qdeclarativestategroup_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVESTATEGROUP_H
 #define QDECLARATIVESTATEGROUP_H
 
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativestate_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 89cc947d2c..ec79120e7a 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativestateoperations_p.h"
+#include "qdeclarativestateoperations_p.h"
 
 #include <qdeclarative.h>
 #include <qdeclarativecontext.h>
 #include <qdeclarativeexpression.h>
 #include <qdeclarativeinfo.h>
-#include <qdeclarativeguard_p.h>
-#include <qdeclarativenullablevalue_p_p.h>
-#include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativeproperty_p.h"
-#include "private/qdeclarativebinding_p.h"
-#include "private/qdeclarativestate_p_p.h"
+#include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativenullablevalue_p_p.h>
+#include <private/qdeclarativecontext_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include "qdeclarativestate_p_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qmath.h>
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
index 9d30bf7578..68d3338972 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVESTATEOPERATIONS_H
 #define QDECLARATIVESTATEOPERATIONS_H
 
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativestate_p.h"
 #include <qdeclarativescriptstring.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp
index b3d6c877c4..872bad6589 100644
--- a/src/declarative/util/qdeclarativestyledtext.cpp
+++ b/src/declarative/util/qdeclarativestyledtext.cpp
@@ -45,7 +45,7 @@
 #include <QTextLayout>
 #include <QDebug>
 #include <qmath.h>
-#include "private/qdeclarativestyledtext_p.h"
+#include "qdeclarativestyledtext_p.h"
 
 /*
     QDeclarativeStyledText supports few tags:
diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp
index b4216cb75d..61d8406141 100644
--- a/src/declarative/util/qdeclarativesystempalette.cpp
+++ b/src/declarative/util/qdeclarativesystempalette.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativesystempalette_p.h"
+#include "qdeclarativesystempalette_p.h"
 
 #include <QGuiApplication>
 
diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp
index ce7044a245..7066d3d062 100644
--- a/src/declarative/util/qdeclarativetimeline.cpp
+++ b/src/declarative/util/qdeclarativetimeline.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativetimeline_p_p.h"
+#include "qdeclarativetimeline_p_p.h"
 
 #include <QDebug>
 #include <QMutex>
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index de37f60bf5..a4a2362680 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativetimer_p.h"
+#include "qdeclarativetimer_p.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qpauseanimation.h>
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index df22a57c1d..b0f8cbd76b 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativestate_p.h"
-#include "private/qdeclarativestategroup_p.h"
-#include "private/qdeclarativestate_p_p.h"
-#include "private/qdeclarativestateoperations_p.h"
-#include "private/qdeclarativeanimation_p.h"
-#include "private/qdeclarativeanimation_p_p.h"
-#include "private/qdeclarativetransitionmanager_p_p.h"
+#include "qdeclarativestate_p.h"
+#include "qdeclarativestategroup_p.h"
+#include "qdeclarativestate_p_p.h"
+#include "qdeclarativestateoperations_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
+#include "qdeclarativetransitionmanager_p_p.h"
 
 #include <QParallelAnimationGroup>
 
diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h
index db102582d2..a53346e148 100644
--- a/src/declarative/util/qdeclarativetransition_p.h
+++ b/src/declarative/util/qdeclarativetransition_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVETRANSITION_H
 #define QDECLARATIVETRANSITION_H
 
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativestate_p.h"
 
 #include <qdeclarative.h>
 
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 30504cb241..57336f59fc 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativetransitionmanager_p_p.h"
+#include "qdeclarativetransitionmanager_p_p.h"
 
-#include "private/qdeclarativestate_p_p.h"
-#include "private/qdeclarativestate_p.h"
+#include "qdeclarativestate_p_p.h"
+#include "qdeclarativestate_p.h"
 
-#include <qdeclarativebinding_p.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativeproperty_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativeproperty_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
index c3645ad293..94a2dd1539 100644
--- a/src/declarative/util/qdeclarativetransitionmanager_p_p.h
+++ b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "private/qdeclarativestateoperations_p.h"
+#include "qdeclarativestateoperations_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 18fefa4bd3..0a8f04b0de 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -39,31 +39,31 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativeutilmodule_p.h"
-#include "private/qdeclarativeanimation_p.h"
-#include "private/qdeclarativeanimation_p_p.h"
-#include "private/qdeclarativebehavior_p.h"
-#include "private/qdeclarativebind_p.h"
-#include "private/qdeclarativeconnections_p.h"
-#include "private/qdeclarativesmoothedanimation_p.h"
-#include "private/qdeclarativefontloader_p.h"
-#include "private/qdeclarativelistaccessor_p.h"
-#include "private/qdeclarativelistmodel_p.h"
-#include "private/qdeclarativepackage_p.h"
-#include "private/qdeclarativepropertychanges_p.h"
-#include "private/qdeclarativespringanimation_p.h"
-#include "private/qdeclarativestategroup_p.h"
-#include "private/qdeclarativestateoperations_p.h"
-#include "private/qdeclarativestate_p.h"
-#include "private/qdeclarativestate_p_p.h"
-#include "private/qdeclarativesystempalette_p.h"
-#include "private/qdeclarativetimer_p.h"
-#include "private/qdeclarativetransition_p.h"
-#include "private/qdeclarativeapplication_p.h"
-#include "qdeclarativeinfo.h"
-#include "private/qdeclarativetypenotavailable_p.h"
+#include "qdeclarativeutilmodule_p.h"
+#include "qdeclarativeanimation_p.h"
+#include "qdeclarativeanimation_p_p.h"
+#include "qdeclarativebehavior_p.h"
+#include "qdeclarativebind_p.h"
+#include "qdeclarativeconnections_p.h"
+#include "qdeclarativesmoothedanimation_p.h"
+#include "qdeclarativefontloader_p.h"
+#include "qdeclarativelistaccessor_p.h"
+#include "qdeclarativelistmodel_p.h"
+#include "qdeclarativepackage_p.h"
+#include "qdeclarativepropertychanges_p.h"
+#include "qdeclarativespringanimation_p.h"
+#include "qdeclarativestategroup_p.h"
+#include "qdeclarativestateoperations_p.h"
+#include "qdeclarativestate_p.h"
+#include "qdeclarativestate_p_p.h"
+#include "qdeclarativesystempalette_p.h"
+#include "qdeclarativetimer_p.h"
+#include "qdeclarativetransition_p.h"
+#include "qdeclarativeapplication_p.h"
+#include <qdeclarativeinfo.h>
+#include <private/qdeclarativetypenotavailable_p.h>
 #ifndef QT_NO_XMLPATTERNS
-#include "private/qdeclarativexmllistmodel_p.h"
+#include "qdeclarativexmllistmodel_p.h"
 #endif
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/QInputPanel>
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 2dd7b5710a..d757516c91 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "private/qdeclarativexmllistmodel_p.h"
+#include "qdeclarativexmllistmodel_p.h"
 
 #include <qdeclarativecontext.h>
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 #include <QDebug>
 #include <QStringList>
diff --git a/src/declarative/util/qlistmodelinterface.cpp b/src/declarative/util/qlistmodelinterface.cpp
index 56fc8eeb51..4461456516 100644
--- a/src/declarative/util/qlistmodelinterface.cpp
+++ b/src/declarative/util/qlistmodelinterface.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qlistmodelinterface_p.h"
+#include "qlistmodelinterface_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index ae67a8618d..1d71225bf5 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 SOURCES += \
     $$PWD/qdeclarativeapplication.cpp \
     $$PWD/qdeclarativeutilmodule.cpp\