fix includes

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

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

104 files changed, 558 insertions, 413 deletions

diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp
index 81b0649..2a39aae 100644
--- a/src/declarative/qml/parser/qmljsast.cpp
+++ b/src/declarative/qml/parser/qmljsast.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsast_p.h>
-#include <private/qmljsastvisitor_p.h>
+#include "qmljsast_p.h"
+
+#include "qmljsastvisitor_p.h"
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h
index c8f540c..032fbb1 100644
--- a/src/declarative/qml/parser/qmljsast_p.h
+++ b/src/declarative/qml/parser/qmljsast_p.h
@@ -53,8 +53,9 @@
 // We mean it.
 //
 
-#include <private/qmljsastvisitor_p.h>
-#include <private/qmljsglobal_p.h>
+#include "qmljsastvisitor_p.h"
+#include "qmljsglobal_p.h"
+
 #include <QtCore/QString>
 
 QT_QML_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h
index b485138..f571a2e 100644
--- a/src/declarative/qml/parser/qmljsastfwd_p.h
+++ b/src/declarative/qml/parser/qmljsastfwd_p.h
@@ -42,8 +42,9 @@
 #ifndef QMLJSAST_FWD_P_H
 #define QMLJSAST_FWD_P_H
 
+#include "qmljsglobal_p.h"
+
 #include <QtCore/qglobal.h>
-#include <private/qmljsglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/declarative/qml/parser/qmljsastvisitor.cpp b/src/declarative/qml/parser/qmljsastvisitor.cpp
index 089fe76..1290c89 100644
--- a/src/declarative/qml/parser/qmljsastvisitor.cpp
+++ b/src/declarative/qml/parser/qmljsastvisitor.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsastvisitor_p.h>
+#include "qmljsastvisitor_p.h"
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h
index b49a151..1b50bcc 100644
--- a/src/declarative/qml/parser/qmljsastvisitor_p.h
+++ b/src/declarative/qml/parser/qmljsastvisitor_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include <private/qmljsastfwd_p.h>
-#include <private/qmljsglobal_p.h>
+#include "qmljsastfwd_p.h"
+#include "qmljsglobal_p.h"
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsengine_p.cpp b/src/declarative/qml/parser/qmljsengine_p.cpp
index ab317aa..b8ecd18 100644
--- a/src/declarative/qml/parser/qmljsengine_p.cpp
+++ b/src/declarative/qml/parser/qmljsengine_p.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsengine_p.h>
-#include <private/qmljsnodepool_p.h>
+#include "qmljsengine_p.h"
+
+#include "qmljsglobal_p.h"
+#include "qmljsnodepool_p.h"
+
 #include <qnumeric.h>
 #include <QHash>
 
diff --git a/src/declarative/qml/parser/qmljsengine_p.h b/src/declarative/qml/parser/qmljsengine_p.h
index 6ae470c..2c15af3 100644
--- a/src/declarative/qml/parser/qmljsengine_p.h
+++ b/src/declarative/qml/parser/qmljsengine_p.h
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
+#include "qmljsglobal_p.h"
+#include "qmljsastfwd_p.h"
+
 #include <QString>
 #include <QSet>
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsastfwd_p.h>
-
 QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index 9ad61e6..b8c6560 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -40,7 +40,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmljsgrammar_p.h>
+#include "qmljsgrammar_p.h"
 
 const char *const QmlJSGrammar::spell [] = {
   "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", 
diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp
index 2edd553..e9ea604 100644
--- a/src/declarative/qml/parser/qmljslexer.cpp
+++ b/src/declarative/qml/parser/qmljslexer.cpp
@@ -40,13 +40,14 @@
 ****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsengine_p.h>
-#include <private/qmljslexer_p.h>
-#include <private/qmljsgrammar_p.h>
+#include "qmljslexer_p.h"
+
+#include "qmljsglobal_p.h"
+#include "qmljsengine_p.h"
+#include "qmljsgrammar_p.h"
 
 #include <QtGui/qapplication.h>
 
diff --git a/src/declarative/qml/parser/qmljslexer_p.h b/src/declarative/qml/parser/qmljslexer_p.h
index b483316..b830071 100644
--- a/src/declarative/qml/parser/qmljslexer_p.h
+++ b/src/declarative/qml/parser/qmljslexer_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include <QtCore/QString>
+#include "qmljsglobal_p.h"
 
-#include <private/qmljsglobal_p.h>
+#include <QtCore/QString>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h
index e5d3e27..3da2678 100644
--- a/src/declarative/qml/parser/qmljsmemorypool_p.h
+++ b/src/declarative/qml/parser/qmljsmemorypool_p.h
@@ -53,11 +53,12 @@
 // We mean it.
 //
 
+#include "qmljsglobal_p.h"
+
 #include <QtCore/qglobal.h>
 #include <QtCore/qshareddata.h>
-#include <string.h>
 
-#include <private/qmljsglobal_p.h>
+#include <string.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h
index ffd1287..abe4cc8 100644
--- a/src/declarative/qml/parser/qmljsnodepool_p.h
+++ b/src/declarative/qml/parser/qmljsnodepool_p.h
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
+#include "qmljsglobal_p.h"
+#include "qmljsmemorypool_p.h"
+
 #include <QtCore/QHash>
 #include <QtCore/QString>
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsmemorypool_p.h>
-
 QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 472f67e..7a81557 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -41,21 +41,19 @@
 **
 ****************************************************************************/
 
+#include "qmljsparser_p.h"
+
+#include "qmljsengine_p.h"
+#include "qmljslexer_p.h"
+#include "qmljsast_p.h"
+#include "qmljsnodepool_p.h"
+
 #include <QtCore/QtDebug>
 #include <QtGui/QApplication>
+#include <QVarLengthArray>
 
 #include <string.h>
 
-#include <private/qmljsengine_p.h>
-#include <private/qmljslexer_p.h>
-#include <private/qmljsast_p.h>
-#include <private/qmljsnodepool_p.h>
-
-
-
-#include <private/qmljsparser_p.h>
-#include <QVarLengthArray>
-
 //
 // This file is automatically generated from qmljs.g.
 // Changes will be lost.
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 1f0c1a7..2cefb5c 100644
--- a/src/declarative/qml/parser/qmljsparser_p.h
+++ b/src/declarative/qml/parser/qmljsparser_p.h
@@ -60,10 +60,10 @@
 #ifndef QMLJSPARSER_P_H
 #define QMLJSPARSER_P_H
 
-#include <private/qmljsglobal_p.h>
-#include <private/qmljsgrammar_p.h>
-#include <private/qmljsast_p.h>
-#include <private/qmljsengine_p.h>
+#include "qmljsglobal_p.h"
+#include "qmljsgrammar_p.h"
+#include "qmljsast_p.h"
+#include "qmljsengine_p.h"
 
 #include <QtCore/QList>
 #include <QtCore/QString>
diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index 3187e41..11b9f80 100644
--- a/src/declarative/qml/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
@@ -39,7 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmetaobjectbuilder_p.h>
+#include "qmetaobjectbuilder_p.h"
+
 #ifndef Q_OS_WIN
 #include <stdint.h>
 #endif
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index 323525b..c009093 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -42,15 +42,16 @@
 #ifndef QML_H
 #define QML_H
 
+#include "qmlmetatype.h"
+#include "qmlmetaproperty.h"
+#include "qmlparserstatus.h"
+#include "qmlpropertyvaluesource.h"
+#include "qmllist.h"
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qmetaobject.h>
-#include <qmlmetatype.h>
-#include <qmlmetaproperty.h>
-#include <qmlparserstatus.h>
-#include <qmlpropertyvaluesource.h>
-#include <qmllist.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index 01cb97f..6a32df7 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -39,17 +39,20 @@
 **
 ****************************************************************************/
 
-#include <private/qmlbasicscript_p.h>
+#include "qmlbasicscript_p.h"
+
+#include "qmlengine_p.h"
+#include "qmlcontext_p.h"
+#include "qmlrefcount_p.h"
+#include "qmlglobal_p.h"
+
+#include <qfxperf_p_p.h>
+#include <qmljsast_p.h>
+#include <qmljsengine_p.h>
+
 #include <QColor>
 #include <QDebug>
-#include <private/qmlengine_p.h>
-#include <private/qmlcontext_p.h>
 #include <QStack>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlrefcount_p.h>
-#include <private/qmljsast_p.h>
-#include <private/qmljsengine_p.h>
-#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbasicscript_p.h b/src/declarative/qml/qmlbasicscript_p.h
index 57d4fa7..830d2bd 100644
--- a/src/declarative/qml/qmlbasicscript_p.h
+++ b/src/declarative/qml/qmlbasicscript_p.h
@@ -53,10 +53,11 @@
 // We mean it.
 //
 
+#include "qmlparser_p.h"
+
 #include <QtCore/QList>
 #include <QtCore/QByteArray>
 #include <QtCore/QVariant>
-#include <private/qmlparser_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index f9fc2d2..56d5807 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -39,17 +39,20 @@
 **
 ****************************************************************************/
 
-#include <qml.h>
 #include "qmlbinding.h"
-#include <private/qmlbinding_p.h>
-#include <qmlcontext.h>
-#include <qmlinfo.h>
+#include "qmlbinding_p.h"
+
+#include "qml.h"
+#include "qmlcontext.h"
+#include "qmlinfo.h"
+#include "qmlcontext_p.h"
+#include "qmldeclarativedata_p.h"
+#include "qmlstringconverters_p.h"
+
+#include <qfxperf_p_p.h>
+
 #include <QVariant>
-#include <private/qfxperf_p_p.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmldeclarativedata_p.h>
-#include <private/qmlstringconverters_p.h>
 
 Q_DECLARE_METATYPE(QList<QObject *>);
 
diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h
index ce768a6..6f2d4f1 100644
--- a/src/declarative/qml/qmlbinding.h
+++ b/src/declarative/qml/qmlbinding.h
@@ -42,10 +42,11 @@
 #ifndef QMLBINDING_H
 #define QMLBINDING_H
 
+#include "qml.h"
+#include "qmlpropertyvaluesource.h"
+#include "qmlexpression.h"
+
 #include <QtCore/QObject>
-#include <qml.h>
-#include <qmlpropertyvaluesource.h>
-#include <qmlexpression.h>
 #include <QtCore/QMetaProperty>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlbinding_p.h b/src/declarative/qml/qmlbinding_p.h
index 85d9ad6..945b659 100644
--- a/src/declarative/qml/qmlbinding_p.h
+++ b/src/declarative/qml/qmlbinding_p.h
@@ -53,9 +53,10 @@
 // We mean it.
 //
 
-#include <qmlbinding.h>
-#include <qmlmetaproperty.h>
-#include <private/qmlexpression_p.h>
+#include "qmlbinding.h"
+
+#include "qmlmetaproperty.h"
+#include "qmlexpression_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbindingoptimizations.cpp b/src/declarative/qml/qmlbindingoptimizations.cpp
index 136bf23..0f2e199 100644
--- a/src/declarative/qml/qmlbindingoptimizations.cpp
+++ b/src/declarative/qml/qmlbindingoptimizations.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmlbindingoptimizations_p.h>
-#include <private/qmlcontext_p.h>
+#include "qmlbindingoptimizations_p.h"
+
+#include "qmlcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h
index 2cdc07d..4ce145d 100644
--- a/src/declarative/qml/qmlbindingoptimizations_p.h
+++ b/src/declarative/qml/qmlbindingoptimizations_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include <private/qmlexpression_p.h>
-#include <qmlbinding.h>
+#include "qmlexpression_p.h"
+#include "qmlbinding.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp
index 1f41472..110a56c 100644
--- a/src/declarative/qml/qmlboundsignal.cpp
+++ b/src/declarative/qml/qmlboundsignal.cpp
@@ -39,16 +39,18 @@
 **
 ****************************************************************************/
 
-#include <private/qmlboundsignal_p.h>
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlexpression_p.h>
-#include <private/qmlcontext_p.h>
-#include <qmlmetatype.h>
-#include <qml.h>
-#include <qmlcontext.h>
+#include "qmlboundsignal_p.h"
+
+#include "qmetaobjectbuilder_p.h"
+#include "qmlengine_p.h"
+#include "qmlexpression_p.h"
+#include "qmlcontext_p.h"
+#include "qmlmetatype.h"
+#include "qml.h"
+#include "qmlcontext.h"
+#include "qmlglobal_p.h"
+
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -259,4 +261,4 @@ int QmlBoundSignalParameters::metaCall(QMetaObject::Call c, int id, void **a)
 
 QT_END_NAMESPACE
 
-#include "qmlboundsignal.moc"
+#include <qmlboundsignal.moc>
diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h
index 53a5a6b..971fc89 100644
--- a/src/declarative/qml/qmlboundsignal_p.h
+++ b/src/declarative/qml/qmlboundsignal_p.h
@@ -53,10 +53,12 @@
 // We mean it.
 //
 
-#include <qmlexpression.h>
-#include <private/qobject_p.h>
+#include "qmlexpression.h"
+
 #include <QtCore/qmetaobject.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlAbstractBoundSignal : public QObject
diff --git a/src/declarative/qml/qmlclassfactory.cpp b/src/declarative/qml/qmlclassfactory.cpp
index bad0890..3c19c2f 100644
--- a/src/declarative/qml/qmlclassfactory.cpp
+++ b/src/declarative/qml/qmlclassfactory.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmlclassfactory_p.h>
+#include "qmlclassfactory_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp
index 0a0175c..0da6452 100644
--- a/src/declarative/qml/qmlcleanup.cpp
+++ b/src/declarative/qml/qmlcleanup.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmlcleanup_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlcleanup_p.h"
+
+#include "qmlengine_p.h"
 
 /*!
 \internal
diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp
index c41ee3f..8b165c6 100644
--- a/src/declarative/qml/qmlcompileddata.cpp
+++ b/src/declarative/qml/qmlcompileddata.cpp
@@ -39,15 +39,17 @@
 **
 ****************************************************************************/
 
-#include <private/qmlcompiler_p.h>
+#include "qmlcompiler_p.h"
 #include "qmlengine.h"
 #include "qmlcomponent.h"
-#include <private/qmlcomponent_p.h>
+#include "qmlcomponent_p.h"
 #include "qmlcontext.h"
-#include <private/qmlcontext_p.h>
-#include <private/qobject_p.h>
+#include "qmlcontext_p.h"
+
 #include <QtCore/qdebug.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 int QmlCompiledData::pack(const char *data, size_t size)
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 578aa91..2404702 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -39,40 +39,42 @@
 **
 ****************************************************************************/
 
-#include <private/qmlcompiler_p.h>
-#include <private/qmlcompositetypedata_p.h>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlparser_p.h>
-#include <private/qmlscriptparser_p.h>
-#include <qmlpropertyvaluesource.h>
-#include <qmlcomponent.h>
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qmlbasicscript_p.h>
+#include "qmlcompiler_p.h"
+
+#include "qmlcompositetypedata_p.h"
+#include "qmlparser_p.h"
+#include "qmlscriptparser_p.h"
+#include "qmlpropertyvaluesource.h"
+#include "qmlcomponent.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qmlbasicscript_p.h"
+#include "qmlstringconverters_p.h"
+#include "qmlengine_p.h"
+#include "qmlengine.h"
+#include "qmlcontext.h"
+#include "qmlmetatype.h"
+#include "qmlcustomparser_p_p.h"
+#include "qmlcontext_p.h"
+#include "qmlcomponent_p.h"
+#include "parser/qmljsast_p.h"
+#include "qmlvmemetaobject_p.h"
+#include "qmlexpression_p.h"
+#include "qmlmetaproperty_p.h"
+#include "qmlrewrite_p.h"
+#include "qmlscriptstring.h"
+#include "qmlglobal_p.h"
+#include "qmlscriptparser_p.h"
+
+#include <qfxperf_p_p.h>
+
 #include <QColor>
 #include <QDebug>
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
 #include <QAtomicInt>
-#include <private/qmlstringconverters_p.h>
-#include <private/qmlengine_p.h>
-#include <qmlengine.h>
-#include <qmlcontext.h>
-#include <qmlmetatype.h>
 #include <QtCore/qdebug.h>
 #include <QtGui/qapplication.h>
-#include <private/qmlcustomparser_p_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlcomponent_p.h>
-#include "parser/qmljsast_p.h"
-#include <private/qmlvmemetaobject_p.h>
-#include <private/qmlexpression_p.h>
-#include <private/qmlmetaproperty_p.h>
-#include <private/qmlrewrite_p.h>
-#include <qmlscriptstring.h>
-#include <private/qmlglobal_p.h>
-
-#include <private/qmlscriptparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -2305,7 +2307,8 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
     return true;
 }
 
-#include <private/qmljsparser_p.h>
+#include <qmljsparser_p.h>
+
 static QStringList astNodeToStringList(QmlJS::AST::Node *node)
 {
     if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) {
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index 8c48c63..809cc72 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -53,18 +53,19 @@
 // We mean it.
 //
 
+#include "qml.h"
+#include "qmlerror.h"
+#include "qmlinstruction_p.h"
+#include "qmlcompositetypemanager_p.h"
+#include "qmlparser_p.h"
+#include "qmlengine_p.h"
+#include "qbitfield_p.h"
+#include "qmlpropertycache_p.h"
+#include "qmlintegercache_p.h"
+#include "qmltypenamecache_p.h"
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qset.h>
-#include <qml.h>
-#include <qmlerror.h>
-#include <private/qmlinstruction_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qmlparser_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qbitfield_p.h>
-#include <private/qmlpropertycache_p.h>
-#include <private/qmlintegercache_p.h>
-#include <private/qmltypenamecache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 1e922b0..b66e026 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -40,25 +40,27 @@
 ****************************************************************************/
 
 #include "qmlcomponent.h"
-#include <private/qmlcomponent_p.h>
-#include <private/qmlcompiler_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlcompositetypedata_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlvme_p.h>
+#include "qmlcomponent_p.h"
+
+#include "qmlcompiler_p.h"
+#include "qmlcontext_p.h"
+#include "qmlcompositetypedata_p.h"
+#include "qmlengine_p.h"
+#include "qmlvme_p.h"
 #include "qml.h"
+#include "qmlengine.h"
+#include "qmlbinding.h"
+#include "qmlbinding_p.h"
+#include "qmlglobal_p.h"
+#include "qmlscriptparser_p.h"
+
+#include <qfxperf_p_p.h>
+
 #include <QStack>
-#include <private/qfxperf_p_p.h>
 #include <QStringList>
-#include <qmlengine.h>
 #include <QFileInfo>
-#include "qmlbinding.h"
 #include <QtCore/qdebug.h>
 #include <QApplication>
-#include <private/qmlbinding_p.h>
-#include <private/qmlglobal_p.h>
-
-#include <private/qmlscriptparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index 0abb58f..1cc5937 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -42,11 +42,12 @@
 #ifndef QMLCOMPONENT_H
 #define QMLCOMPONENT_H
 
+#include "qml.h"
+#include "qmlerror.h"
+
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtScript/qscriptvalue.h>
-#include <qml.h>
-#include <qmlerror.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index 61a8a10..1372d98 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -53,16 +53,19 @@
 // We mean it.
 //
 
+#include "qmlcomponent.h"
+
+#include "qmlengine_p.h"
+#include "qmlcompositetypemanager_p.h"
+#include "qbitfield_p.h"
+#include "qmlerror.h"
+#include "qml.h"
+
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QList>
+
 #include <private/qobject_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qbitfield_p.h>
-#include <qmlerror.h>
-#include <qmlcomponent.h>
-#include <qml.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h
index 0d2843d..c8b9f25 100644
--- a/src/declarative/qml/qmlcompositetypedata_p.h
+++ b/src/declarative/qml/qmlcompositetypedata_p.h
@@ -53,8 +53,9 @@
 // We mean it.
 //
 
+#include "qmlengine_p.h"
+
 #include <QtCore/qglobal.h>
-#include <private/qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index 2566e63..9590718 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -39,17 +39,19 @@
 **
 ****************************************************************************/
 
-#include <private/qmlcompositetypedata_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qmlscriptparser_p.h>
-#include <qmlengine.h>
+#include "qmlcompositetypemanager_p.h"
+
+#include "qmlcompositetypedata_p.h"
+#include "qmlscriptparser_p.h"
+#include "qmlengine.h"
+#include "qmlengine_p.h"
+#include "qmlcomponent.h"
+#include "qmlcomponent_p.h"
+#include "qmlcompiler_p.h"
+
 #include <QtNetwork/qnetworkreply.h>
-#include <private/qmlengine_p.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
-#include <qmlcomponent.h>
-#include <private/qmlcomponent_p.h>
-#include <private/qmlcompiler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
index 0abbfb5..0169bff 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -53,11 +53,12 @@
 // We mean it.
 //
 
+#include "qmlscriptparser_p.h"
+#include "qmlrefcount_p.h"
+#include "qmlerror.h"
+#include "qmlengine.h"
+
 #include <QtCore/qglobal.h>
-#include <private/qmlscriptparser_p.h>
-#include <private/qmlrefcount_p.h>
-#include <qmlerror.h>
-#include <qmlengine.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 1afe945..c3971ae 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -39,17 +39,20 @@
 **
 ****************************************************************************/
 
-#include <qmlcontext.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlexpression_p.h>
-#include <private/qmlengine_p.h>
-#include <qmlengine.h>
+#include "qmlcontext.h"
+#include "qmlcontext_p.h"
+
+#include "qmlexpression_p.h"
+#include "qmlengine_p.h"
+#include "qmlengine.h"
+#include "qmlbindingoptimizations_p.h"
+#include "qmlinfo.h"
+
 #include <qscriptengine.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlbindingoptimizations_p.h>
+
 #include <private/qscriptdeclarativeclass_p.h>
-#include <qmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index a70d5db..0229056 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -53,16 +53,19 @@
 // We mean it.
 //
 
-#include <qmlcontext.h>
-#include <private/qobject_p.h>
-#include <private/qmldeclarativedata_p.h>
+#include "qmlcontext.h"
+
+#include "qmldeclarativedata_p.h"
+#include "qmlengine_p.h"
+#include "qmlintegercache_p.h"
+#include "qmltypenamecache_p.h"
+
 #include <QtCore/qhash.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtCore/qset.h>
+
+#include <private/qobject_p.h>
 #include <private/qguard_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlintegercache_p.h>
-#include <private/qmltypenamecache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp
index d567da1..5635ceb 100644
--- a/src/declarative/qml/qmlcontextscriptclass.cpp
+++ b/src/declarative/qml/qmlcontextscriptclass.cpp
@@ -39,10 +39,11 @@
 **
 ****************************************************************************/
 
-#include <private/qmlcontextscriptclass_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmltypenamescriptclass_p.h>
+#include "qmlcontextscriptclass_p.h"
+
+#include "qmlengine_p.h"
+#include "qmlcontext_p.h"
+#include "qmltypenamescriptclass_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h
index 10b848a..a577d52 100644
--- a/src/declarative/qml/qmlcontextscriptclass_p.h
+++ b/src/declarative/qml/qmlcontextscriptclass_p.h
@@ -53,9 +53,11 @@
 // We mean it.
 //
 
+#include "qmltypenamecache_p.h"
+
 #include <QtScript/qscriptclass.h>
+
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmltypenamecache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp
index 9174fe6..9085440 100644
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ b/src/declarative/qml/qmlcustomparser.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <private/qmlcustomparser_p.h>
-#include <private/qmlcustomparser_p_p.h>
-#include <private/qmlparser_p.h>
+#include "qmlcustomparser_p.h"
+#include "qmlcustomparser_p_p.h"
+
+#include "qmlparser_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index 88a264f..9502b08 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -53,11 +53,12 @@
 // We mean it.
 //
 
+#include "qmlmetatype.h"
+#include "qmlerror.h"
+#include "qmlparser_p.h"
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qxmlstream.h>
-#include <qmlmetatype.h>
-#include <qmlerror.h>
-#include <private/qmlparser_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlcustomparser_p_p.h b/src/declarative/qml/qmlcustomparser_p_p.h
index e8673c9..c27a5bc 100644
--- a/src/declarative/qml/qmlcustomparser_p_p.h
+++ b/src/declarative/qml/qmlcustomparser_p_p.h
@@ -53,9 +53,11 @@
 // We mean it.
 //
 
+#include "qmlcustomparser_p.h"
+
+#include "qmlparser_p.h"
+
 #include <QtCore/qglobal.h>
-#include <private/qmlcustomparser_p.h>
-#include <private/qmlparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmldeclarativedata_p.h b/src/declarative/qml/qmldeclarativedata_p.h
index a6020d7..bdbb5c8 100644
--- a/src/declarative/qml/qmldeclarativedata_p.h
+++ b/src/declarative/qml/qmldeclarativedata_p.h
@@ -53,9 +53,10 @@
 // We mean it.
 //
 
-#include <private/qobject_p.h>
 #include <QtScript/qscriptvalue.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlCompiledData;
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 1b02199..8812c31 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -40,15 +40,17 @@
 ****************************************************************************/
 
 #include "qmldom.h"
-#include <private/qmldom_p.h>
-#include <private/qmlcompositetypedata_p.h>
-#include <private/qmlcompiler_p.h>
-#include <private/qmlengine_p.h>
+#include "qmldom_p.h"
+
+#include "qmlcompositetypedata_p.h"
+#include "qmlcompiler_p.h"
+#include "qmlengine_p.h"
+#include "qmlscriptparser_p.h"
+#include "qmlglobal_p.h"
+
 #include <QtCore/QByteArray>
 #include <QtCore/QDebug>
 #include <QtCore/QString>
-#include <private/qmlscriptparser_p.h>
-#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h
index ad28d0d..24710f1 100644
--- a/src/declarative/qml/qmldom.h
+++ b/src/declarative/qml/qmldom.h
@@ -42,9 +42,10 @@
 #ifndef QMLDOM_H
 #define QMLDOM_H
 
+#include "qmlerror.h"
+
 #include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
-#include <qmlerror.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmldom_p.h b/src/declarative/qml/qmldom_p.h
index 10bf312..df6a980 100644
--- a/src/declarative/qml/qmldom_p.h
+++ b/src/declarative/qml/qmldom_p.h
@@ -53,8 +53,9 @@
 // We mean it.
 //
 
+#include "qmlparser_p.h"
+
 #include <QtCore/QtGlobal>
-#include <private/qmlparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 88a8c45..ce5b4a4 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -39,14 +39,33 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qmetaobject.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qobject_p.h>
-#include <private/qmlcompiler_p.h>
-#include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlglobalscriptclass_p.h>
+#include "qmlengine_p.h"
+#include "qmlengine.h"
 
+#include "qmlcontext_p.h"
+#include "qmlcompiler_p.h"
+#include "qmlglobalscriptclass_p.h"
+#include "qml.h"
+#include "qmlbasicscript_p.h"
+#include "qmlcontext.h"
+#include "qmlexpression.h"
+#include "qmlcomponent.h"
+#include "qmlmetaproperty_p.h"
+#include "qmlbinding_p.h"
+#include "qmlvme_p.h"
+#include "qmlenginedebug_p.h"
+#include "qmlstringconverters_p.h"
+#include "qmlxmlhttprequest_p.h"
+#include "qmlsqldatabase_p.h"
+#include "qmltypenamescriptclass_p.h"
+#include "qmllistscriptclass_p.h"
+#include "qmlscriptstring.h"
+#include "qmlglobal_p.h"
+#include "qmlworkerscript_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QtCore/qmetaobject.h>
 #include <QScriptClass>
 #include <QNetworkReply>
 #include <QNetworkRequest>
@@ -57,13 +76,7 @@
 #include <QPair>
 #include <QDebug>
 #include <QMetaObject>
-#include "qml.h"
-#include <private/qfxperf_p_p.h>
 #include <QStack>
-#include <private/qmlbasicscript_p.h>
-#include "qmlengine.h"
-#include "qmlcontext.h"
-#include "qmlexpression.h"
 #include <QtCore/qthreadstorage.h>
 #include <QtCore/qthread.h>
 #include <QtCore/qcoreapplication.h>
@@ -72,24 +85,15 @@
 #include <QtGui/qvector3d.h>
 #include <QtGui/qsound.h>
 #include <QGraphicsObject>
-#include <qmlcomponent.h>
-#include <private/qmlmetaproperty_p.h>
-#include <private/qmlbinding_p.h>
-#include <private/qmlvme_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmlstringconverters_p.h>
-#include <private/qmlxmlhttprequest_p.h>
-#include <private/qmlsqldatabase_p.h>
-#include <private/qmltypenamescriptclass_p.h>
-#include <private/qmllistscriptclass_p.h>
-#include <qmlscriptstring.h>
-#include <private/qmlglobal_p.h>
 #include <QtCore/qcryptographichash.h>
-#include <private/qmlworkerscript_p.h>
+
+#include <private/qobject_p.h>
+#include <private/qscriptdeclarativeclass_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
-#include "qt_windows.h"
-#include "qlibrary.h"
+#include <qt_windows.h>
+#include <qlibrary.h>
+
 #define CSIDL_APPDATA		0x001a	// <username>\Application Data
 #endif
 
@@ -1215,8 +1219,9 @@ QmlEnginePrivate::Imports::~Imports()
         delete d;
 }
 
-#include <qmlmetatype.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmlmetatype.h"
+#include "qmltypenamecache_p.h"
+
 static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache)
 {
     if (!cache)
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 4eb9843..68dcb2d 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -53,6 +53,22 @@
 // We mean it.
 //
 
+#include "qmlengine.h"
+
+#include "qmlclassfactory_p.h"
+#include "qmlcompositetypemanager_p.h"
+#include "qpodvector_p.h"
+#include "qml.h"
+#include "qmlbasicscript_p.h"
+#include "qmlvaluetype_p.h"
+#include "qmlcontext.h"
+#include "qmlexpression.h"
+#include "qmlmetaproperty_p.h"
+#include "qmlpropertycache_p.h"
+#include "qmlobjectscriptclass_p.h"
+#include "qmlcontextscriptclass_p.h"
+#include "qmlvaluetypescriptclass_p.h"
+
 #include <QtScript/QScriptClass>
 #include <QtScript/QScriptValue>
 #include <QtScript/QScriptString>
@@ -60,22 +76,9 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qstack.h>
-#include <private/qobject_p.h>
-#include <private/qmlclassfactory_p.h>
-#include <private/qmlcompositetypemanager_p.h>
-#include <private/qpodvector_p.h>
-#include <qml.h>
-#include <private/qmlbasicscript_p.h>
-#include <private/qmlvaluetype_p.h>
-#include <qmlcontext.h>
-#include <qmlengine.h>
-#include <qmlexpression.h>
 #include <QtScript/qscriptengine.h>
-#include <private/qmlmetaproperty_p.h>
-#include <private/qmlpropertycache_p.h>
-#include <private/qmlobjectscriptclass_p.h>
-#include <private/qmlcontextscriptclass_p.h>
-#include <private/qmlvaluetypescriptclass_p.h>
+
+#include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 68c0607..034e4f5 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -39,16 +39,18 @@
 **
 ****************************************************************************/
 
-#include <private/qmlenginedebug_p.h>
-#include <private/qmlboundsignal_p.h>
+#include "qmlenginedebug_p.h"
+
+#include "qmlboundsignal_p.h"
+#include "qmlengine.h"
+#include "qmlmetatype.h"
+#include "qmlmetaproperty.h"
+#include "qmlbinding.h"
+#include "qmlcontext_p.h"
+#include "qmlwatcher_p.h"
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>
-#include <qmlengine.h>
-#include <qmlmetatype.h>
-#include <qmlmetaproperty.h>
-#include <qmlbinding.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlwatcher_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h
index 8ba3d38..c173fdc 100644
--- a/src/declarative/qml/qmlenginedebug_p.h
+++ b/src/declarative/qml/qmlenginedebug_p.h
@@ -53,7 +53,8 @@
 // We mean it.
 //
 
-#include <private/qmldebugservice_p.h>
+#include <qmldebugservice_p.h>
+
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
diff --git a/src/declarative/qml/qmlerror.cpp b/src/declarative/qml/qmlerror.cpp
index 3532cf5..7cb68cf 100644
--- a/src/declarative/qml/qmlerror.cpp
+++ b/src/declarative/qml/qmlerror.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qmlerror.h"
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 276b118..ab9f9ea 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -40,13 +40,16 @@
 ****************************************************************************/
 
 #include "qmlexpression.h"
-#include <private/qmlexpression_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlrewrite_p.h>
-#include "QtCore/qdebug.h"
-#include <private/qmlcompiler_p.h>
+#include "qmlexpression_p.h"
+
+#include "qmlengine_p.h"
+#include "qmlcontext_p.h"
+#include "qmlrewrite_p.h"
+#include "qmlcompiler_p.h"
+
+#include <QtCore/qdebug.h>
 #include <QtScript/qscriptprogram.h>
+
 #include <private/qscriptdeclarativeclass_p.h>
 
 Q_DECLARE_METATYPE(QList<QObject *>);
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index 34783b2..c019f21 100644
--- a/src/declarative/qml/qmlexpression.h
+++ b/src/declarative/qml/qmlexpression.h
@@ -42,9 +42,10 @@
 #ifndef QMLEXPRESSION_H
 #define QMLEXPRESSION_H
 
+#include "qmlerror.h"
+
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
-#include <qmlerror.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index 6beeaec..57a3ce2 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -53,12 +53,15 @@
 // We mean it.
 //
 
-#include <private/qmlbasicscript_p.h>
 #include "qmlexpression.h"
-#include <private/qmlengine_p.h>
-#include <private/qguard_p.h>
+
+#include "qmlbasicscript_p.h"
+#include "qmlengine_p.h"
+
 #include <QtScript/qscriptvalue.h>
 
+#include <private/qguard_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlAbstractExpression
diff --git a/src/declarative/qml/qmlglobalscriptclass.cpp b/src/declarative/qml/qmlglobalscriptclass.cpp
index bb81d37..478a874 100644
--- a/src/declarative/qml/qmlglobalscriptclass.cpp
+++ b/src/declarative/qml/qmlglobalscriptclass.cpp
@@ -39,7 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmlglobalscriptclass_p.h>
+#include "qmlglobalscriptclass_p.h"
+
 #include <QtScript/qscriptstring.h>
 #include <QtScript/qscriptengine.h>
 #include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index bbd6022..2dbc968 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -40,8 +40,10 @@
 ****************************************************************************/
 
 #include "qmlinfo.h"
-#include <private/qmldeclarativedata_p.h>
-#include <qmlcontext.h>
+
+#include "qmldeclarativedata_p.h"
+#include "qmlcontext.h"
+
 #include <QtGui/qapplication.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp
index 322ae9c..010010d 100644
--- a/src/declarative/qml/qmlinstruction.cpp
+++ b/src/declarative/qml/qmlinstruction.cpp
@@ -39,8 +39,10 @@
 **
 ****************************************************************************/
 
-#include <private/qmlinstruction_p.h>
-#include <private/qmlcompiler_p.h>
+#include "qmlinstruction_p.h"
+
+#include "qmlcompiler_p.h"
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp
index 673d683..1968873 100644
--- a/src/declarative/qml/qmlintegercache.cpp
+++ b/src/declarative/qml/qmlintegercache.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <private/qmlintegercache_p.h>
-#include <private/qmlengine_p.h>
-#include <qmlmetatype.h>
+#include "qmlintegercache_p.h"
+
+#include "qmlengine_p.h"
+#include "qmlmetatype.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlintegercache_p.h b/src/declarative/qml/qmlintegercache_p.h
index 2b10dcc..d9df52a 100644
--- a/src/declarative/qml/qmlintegercache_p.h
+++ b/src/declarative/qml/qmlintegercache_p.h
@@ -53,11 +53,13 @@
 // We mean it.
 //
 
-#include <private/qmlrefcount_p.h>
-#include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlcleanup_p.h>
+#include "qmlrefcount_p.h"
+#include "qmlcleanup_p.h"
+
 #include <QtCore/qhash.h>
 
+#include <private/qscriptdeclarativeclass_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlType;
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
index e51b078..ad2d874 100644
--- a/src/declarative/qml/qmllist.h
+++ b/src/declarative/qml/qmllist.h
@@ -42,7 +42,7 @@
 #ifndef QMLLIST_H
 #define QMLLIST_H
 
-#include <qmlprivate.h>
+#include "qmlprivate.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp
index 6e67864..d93498d 100644
--- a/src/declarative/qml/qmllistscriptclass.cpp
+++ b/src/declarative/qml/qmllistscriptclass.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmllistscriptclass_p.h>
-#include <private/qmlengine_p.h>
+#include "qmllistscriptclass_p.h"
+
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 44fa3d6..2b3b385 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -40,19 +40,23 @@
 ****************************************************************************/
 
 #include "qmlmetaproperty.h"
-#include <private/qmlmetaproperty_p.h>
-#include <private/qmlcompositetypedata_p.h>
-#include <qml.h>
-#include <private/qfxperf_p_p.h>
-#include <QStringList>
+#include "qmlmetaproperty_p.h"
+
+#include "qmlcompositetypedata_p.h"
+#include "qml.h"
 #include "qmlbinding.h"
-#include <qmlcontext.h>
-#include <private/qmlboundsignal_p.h>
-#include <math.h>
+#include "qmlcontext.h"
+#include "qmlboundsignal_p.h"
+#include "qmlengine.h"
+#include "qmlengine_p.h"
+#include "qmldeclarativedata_p.h"
+
+#include <qfxperf_p_p.h>
+
+#include <QStringList>
 #include <QtCore/qdebug.h>
-#include <qmlengine.h>
-#include <private/qmlengine_p.h>
-#include <private/qmldeclarativedata_p.h>
+
+#include <math.h>
 
 Q_DECLARE_METATYPE(QList<QObject *>);
 
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index 4315c71..b4d72bb 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -54,8 +54,10 @@
 //
 
 #include "qmlmetaproperty.h"
+
+#include "qmlpropertycache_p.h"
+
 #include <private/qobject_p.h>
-#include <private/qmlpropertycache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 46d967b..edf8974 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -40,13 +40,15 @@
 ****************************************************************************/
 
 #include "qmlmetatype.h"
+
+#include "qmlproxymetaobject_p.h"
+#include "qmlcustomparser_p.h"
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qbitarray.h>
 #include <QtCore/qreadwritelock.h>
-#include <private/qmlproxymetaobject_p.h>
-
 #include <qmetatype.h>
 #include <qobjectdefs.h>
 #include <qdatetime.h>
@@ -56,10 +58,10 @@
 #include <qstringlist.h>
 #include <qvector.h>
 #include <qlocale.h>
-#include <ctype.h>
 #include <QtCore/qcryptographichash.h>
 #include <QtScript/qscriptvalue.h>
-#include <private/qmlcustomparser_p.h>
+
+#include <ctype.h>
 
 #ifdef QT_BOOTSTRAPPED
 # ifndef QT_NO_GEOM_VARIANT
@@ -921,6 +923,7 @@ QList<QmlType*> QmlMetaType::qmlTypes()
 #include <QtGui/qsizepolicy.h>
 #include <QtGui/qkeysequence.h>
 #include <QtGui/qpen.h>
+
 //#include <QtGui/qtextlength.h>
 #include <QtGui/qtextformat.h>
 #include <QtGui/qmatrix.h>
@@ -930,6 +933,7 @@ QList<QmlType*> QmlMetaType::qmlTypes()
 #include <QtGui/qvector3d.h>
 #include <QtGui/qvector4d.h>
 #include <QtGui/qquaternion.h>
+
 Q_DECLARE_METATYPE(QScriptValue);
 
 /*!
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 99d6743..d17b44f 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -42,13 +42,14 @@
 #ifndef QMLMETATYPE_H
 #define QMLMETATYPE_H
 
+#include "qmlprivate.h"
+#include "qmlparserstatus.h"
+#include "qmlpropertyvaluesource.h"
+#include "qmlpropertyvalueinterceptor.h"
+
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qbitarray.h>
-#include <qmlprivate.h>
-#include <qmlparserstatus.h>
-#include <qmlpropertyvaluesource.h>
-#include <qmlpropertyvalueinterceptor.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index fb3dd07..86ee29c 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -39,16 +39,19 @@
 **
 ****************************************************************************/
 
-#include <private/qmlobjectscriptclass_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qguard_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmldeclarativedata_p.h>
-#include <private/qmltypenamescriptclass_p.h>
-#include <private/qmllistscriptclass_p.h>
-#include <qmlbinding.h>
+#include "qmlobjectscriptclass_p.h"
+
+#include "qmlengine_p.h"
+#include "qmlcontext_p.h"
+#include "qmldeclarativedata_p.h"
+#include "qmltypenamescriptclass_p.h"
+#include "qmllistscriptclass_p.h"
+#include "qmlbinding.h"
+
 #include <QtCore/qtimer.h>
 
+#include <private/qguard_p.h>
+
 QT_BEGIN_NAMESPACE
 
 struct ObjectData : public QScriptDeclarativeClass::Object {
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h
index 6169812..d8ef1d2 100644
--- a/src/declarative/qml/qmlobjectscriptclass_p.h
+++ b/src/declarative/qml/qmlobjectscriptclass_p.h
@@ -53,10 +53,12 @@
 // We mean it.
 //
 
+#include "qmlpropertycache_p.h"
+#include "qmltypenamecache_p.h"
+
 #include <QtScript/qscriptclass.h>
+
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlpropertycache_p.h>
-#include <private/qmltypenamecache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp
index d92529b..02a9e70 100644
--- a/src/declarative/qml/qmlparser.cpp
+++ b/src/declarative/qml/qmlparser.cpp
@@ -39,23 +39,26 @@
 **
 ****************************************************************************/
 
-#include <private/qmlparser_p.h>
+#include "qmlparser_p.h"
+
+#include "qmlpropertyvaluesource.h"
+#include "qmlvme_p.h"
+#include "qml.h"
+#include "qmlcomponent_p.h"
+#include "qmlcomponent.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qmlvmemetaobject_p.h"
+#include "qmlcompiler_p.h"
+#include "parser/qmljsast_p.h"
+#include "parser/qmljsengine_p.h"
+
+#include <qfxperf_p_p.h>
+
 #include <QStack>
-#include <qmlpropertyvaluesource.h>
 #include <QColor>
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
-#include <private/qmlvme_p.h>
-#include <private/qfxperf_p_p.h>
-#include <qml.h>
-#include <private/qmlcomponent_p.h>
-#include <qmlcomponent.h>
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qmlvmemetaobject_p.h>
-#include <private/qmlcompiler_p.h>
-#include "parser/qmljsast_p.h"
-#include "parser/qmljsengine_p.h"
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index 73bb498..aa7a762 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -53,11 +53,13 @@
 // We mean it.
 //
 
+#include "qml.h"
+#include "qmlrefcount_p.h"
+
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
 #include <QtCore/qstring.h>
-#include <qml.h>
-#include <private/qmlrefcount_p.h>
+
 #include <private/qobject_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlprivate.h b/src/declarative/qml/qmlprivate.h
index 0eec43c..dd98110 100644
--- a/src/declarative/qml/qmlprivate.h
+++ b/src/declarative/qml/qmlprivate.h
@@ -43,6 +43,7 @@
 #define QMLPRIVATE_H
 
 #include <QtCore/qglobal.h>
+
 #ifndef Q_OS_WIN
 #include <stdint.h>
 #endif
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index 7efeb82..7e3a1c4 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <private/qmlpropertycache_p.h>
-#include <private/qmlengine_p.h>
-#include <qmlbinding.h>
+#include "qmlpropertycache_p.h"
+
+#include "qmlengine_p.h"
+#include "qmlbinding.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h
index e4efc04..7cee606 100644
--- a/src/declarative/qml/qmlpropertycache_p.h
+++ b/src/declarative/qml/qmlpropertycache_p.h
@@ -53,11 +53,13 @@
 // We mean it.
 //
 
-#include <private/qmlrefcount_p.h>
-#include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlcleanup_p.h>
+#include "qmlrefcount_p.h"
+#include "qmlcleanup_p.h"
+
 #include <QtCore/qvector.h>
 
+#include <private/qscriptdeclarativeclass_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlEngine;
diff --git a/src/declarative/qml/qmlpropertyvalueinterceptor.cpp b/src/declarative/qml/qmlpropertyvalueinterceptor.cpp
index c8a3f74..9d0d7f6 100644
--- a/src/declarative/qml/qmlpropertyvalueinterceptor.cpp
+++ b/src/declarative/qml/qmlpropertyvalueinterceptor.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qmlpropertyvalueinterceptor.h"
+
 #include "qml.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlpropertyvaluesource.cpp b/src/declarative/qml/qmlpropertyvaluesource.cpp
index 7c42e2f..50f2f8c 100644
--- a/src/declarative/qml/qmlpropertyvaluesource.cpp
+++ b/src/declarative/qml/qmlpropertyvaluesource.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qmlpropertyvaluesource.h"
+
 #include "qml.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlproxymetaobject.cpp b/src/declarative/qml/qmlproxymetaobject.cpp
index 72e8504..983c350 100644
--- a/src/declarative/qml/qmlproxymetaobject.cpp
+++ b/src/declarative/qml/qmlproxymetaobject.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmlproxymetaobject_p.h>
+#include "qmlproxymetaobject_p.h"
 
 #include <QDebug>
 
diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h
index 7f9163c..f983030 100644
--- a/src/declarative/qml/qmlproxymetaobject_p.h
+++ b/src/declarative/qml/qmlproxymetaobject_p.h
@@ -53,11 +53,13 @@
 // We mean it.
 //
 
+#include "qmetaobjectbuilder_p.h"
+#include "qml.h"
+
 #include <QtCore/QMetaObject>
 #include <QtCore/QObject>
-#include <private/qmetaobjectbuilder_p.h>
+
 #include <private/qobject_p.h>
-#include <qml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlrefcount.cpp b/src/declarative/qml/qmlrefcount.cpp
index dbe84ad..9422625 100644
--- a/src/declarative/qml/qmlrefcount.cpp
+++ b/src/declarative/qml/qmlrefcount.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <private/qmlrefcount_p.h>
+#include "qmlrefcount_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp
index 6674095..34bd198 100644
--- a/src/declarative/qml/qmlrewrite.cpp
+++ b/src/declarative/qml/qmlrewrite.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
-#include <private/qmlrewrite_p.h>
+#include "qmlrewrite_p.h"
+
+#include "qmlglobal_p.h"
+
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 89336f3..35234ec 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -39,24 +39,23 @@
 **
 ****************************************************************************/
 
-#include <private/qmlscriptparser_p.h>
-#include <private/qmlparser_p.h>
+#include "qmlscriptparser_p.h"
 
+#include "qmlparser_p.h"
 #include "parser/qmljsengine_p.h"
 #include "parser/qmljsparser_p.h"
 #include "parser/qmljslexer_p.h"
 #include "parser/qmljsnodepool_p.h"
 #include "parser/qmljsastvisitor_p.h"
 #include "parser/qmljsast_p.h"
+#include "qmlrewrite_p.h"
 
-#include <private/qmlrewrite_p.h>
+#include <qfxperf_p_p.h>
 
 #include <QStack>
 #include <QCoreApplication>
 #include <QtDebug>
 
-#include <private/qfxperf_p_p.h>
-
 QT_BEGIN_NAMESPACE
 
 using namespace QmlJS;
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index d6f57c3..16888aa 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -52,10 +52,11 @@
 // We mean it.
 //
 
+#include "qmlerror.h"
+#include "qmlparser_p.h"
+
 #include <QtCore/QList>
 #include <QtCore/QUrl>
-#include <qmlerror.h>
-#include <private/qmlparser_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index 8c4c7bf..be6ef16 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -39,9 +39,14 @@
 **
 ****************************************************************************/
 
+#include "qmlsqldatabase_p.h"
+
+#include "qmlengine.h"
+#include "qmlengine_p.h"
+#include "qmlrefcount_p.h"
+#include "qmlengine_p.h"
+
 #include <QtCore/qobject.h>
-#include <qmlengine.h>
-#include <private/qmlengine_p.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptvalueiterator.h>
 #include <QtScript/qscriptcontext.h>
@@ -51,11 +56,8 @@
 #include <QtSql/qsqlquery.h>
 #include <QtSql/qsqlerror.h>
 #include <QtSql/qsqlrecord.h>
-#include <private/qmlrefcount_p.h>
-#include <private/qmlengine_p.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qcryptographichash.h>
-#include <private/qmlsqldatabase_p.h>
 #include <QtCore/qsettings.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/qml/qmlstringconverters.cpp b/src/declarative/qml/qmlstringconverters.cpp
index 872feba..c68654f 100644
--- a/src/declarative/qml/qmlstringconverters.cpp
+++ b/src/declarative/qml/qmlstringconverters.cpp
@@ -39,13 +39,14 @@
 **
 ****************************************************************************/
 
+#include "qmlstringconverters_p.h"
+
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector3d.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qvariant.h>
-#include <private/qmlstringconverters_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlstringconverters_p.h b/src/declarative/qml/qmlstringconverters_p.h
index a31f06a..380a904 100644
--- a/src/declarative/qml/qmlstringconverters_p.h
+++ b/src/declarative/qml/qmlstringconverters_p.h
@@ -54,6 +54,8 @@
 //
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qvariant.h>
+
 class QColor;
 class QPointF;
 class QSizeF;
diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp
index 1a38aa5..7e68492 100644
--- a/src/declarative/qml/qmltypenamecache.cpp
+++ b/src/declarative/qml/qmltypenamecache.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmltypenamecache_p.h>
-#include <private/qmlengine_p.h>
+#include "qmltypenamecache_p.h"
+
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h
index 6ff403d..754399f 100644
--- a/src/declarative/qml/qmltypenamecache_p.h
+++ b/src/declarative/qml/qmltypenamecache_p.h
@@ -53,9 +53,10 @@
 // We mean it.
 //
 
-#include <private/qmlrefcount_p.h>
+#include "qmlrefcount_p.h"
+#include "qmlcleanup_p.h"
+
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlcleanup_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp
index 1f13f20..72106ae 100644
--- a/src/declarative/qml/qmltypenamescriptclass.cpp
+++ b/src/declarative/qml/qmltypenamescriptclass.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <private/qmltypenamescriptclass_p.h>
-#include <private/qmlengine_p.h>
-#include <private/qmltypenamecache_p.h>
+#include "qmltypenamescriptclass_p.h"
+
+#include "qmlengine_p.h"
+#include "qmltypenamecache_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h
index f630854..e72c05c 100644
--- a/src/declarative/qml/qmltypenamescriptclass_p.h
+++ b/src/declarative/qml/qmltypenamescriptclass_p.h
@@ -52,9 +52,11 @@
 //
 // We mean it.
 //
+#include "qmlengine_p.h"
+
 #include <QtScript/qscriptclass.h>
+
 #include <private/qscriptdeclarativeclass_p.h>
-#include <private/qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp
index 8a05312..6d08cd1 100644
--- a/src/declarative/qml/qmlvaluetype.cpp
+++ b/src/declarative/qml/qmlvaluetype.cpp
@@ -39,7 +39,8 @@
 **
 ****************************************************************************/
 
-#include <private/qmlvaluetype_p.h>
+#include "qmlvaluetype_p.h"
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h
index 770650a..800edee 100644
--- a/src/declarative/qml/qmlvaluetype_p.h
+++ b/src/declarative/qml/qmlvaluetype_p.h
@@ -53,12 +53,13 @@
 // We mean it.
 //
 
+#include "qmlmetaproperty.h"
+
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qvariant.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qfont.h>
-#include <qmlmetaproperty.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp
index b3b09be..57f999f 100644
--- a/src/declarative/qml/qmlvaluetypescriptclass.cpp
+++ b/src/declarative/qml/qmlvaluetypescriptclass.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qmlvaluetypescriptclass_p.h>
-#include <private/qmlengine_p.h>
+#include "qmlvaluetypescriptclass_p.h"
+
+#include "qmlengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvaluetypescriptclass_p.h b/src/declarative/qml/qmlvaluetypescriptclass_p.h
index 19020b2..98d0251 100644
--- a/src/declarative/qml/qmlvaluetypescriptclass_p.h
+++ b/src/declarative/qml/qmlvaluetypescriptclass_p.h
@@ -53,6 +53,7 @@
 // We mean it.
 //
 #include <QtScript/qscriptclass.h>
+
 #include <private/qscriptdeclarativeclass_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index d080268..116163a 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -39,36 +39,39 @@
 **
 ****************************************************************************/
 
-#include <private/qmlvme_p.h>
-#include <private/qmlcompiler_p.h>
-#include <private/qfxperf_p_p.h>
-#include <private/qmlboundsignal_p.h>
-#include <private/qmlstringconverters_p.h>
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qmldeclarativedata_p.h>
-#include <qml.h>
-#include <private/qmlcustomparser_p.h>
+#include "qmlvme_p.h"
+
+#include "qmlcompiler_p.h"
+#include "qmlboundsignal_p.h"
+#include "qmlstringconverters_p.h"
+#include "qmetaobjectbuilder_p.h"
+#include "qmldeclarativedata_p.h"
+#include "qml.h"
+#include "qmlcustomparser_p.h"
+#include "qmlengine.h"
+#include "qmlcontext.h"
+#include "qmlcomponent.h"
+#include "qmlbinding.h"
+#include "qmlengine_p.h"
+#include "qmlcomponent_p.h"
+#include "qmlvmemetaobject_p.h"
+#include "qmlbinding_p.h"
+#include "qmlcontext_p.h"
+#include "qmlbindingoptimizations_p.h"
+#include "qmlglobal_p.h"
+#include "qmlscriptstring.h"
+
+#include <qfxperf_p_p.h>
+
 #include <QStack>
 #include <QWidget>
 #include <QColor>
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
-#include <qmlengine.h>
-#include <qmlcontext.h>
-#include <qmlcomponent.h>
-#include <qmlbinding.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlcomponent_p.h>
-#include <private/qmlvmemetaobject_p.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtGui/qapplication.h>
-#include <private/qmlbinding_p.h>
-#include <private/qmlcontext_p.h>
-#include <private/qmlbindingoptimizations_p.h>
-#include <private/qmlglobal_p.h>
-#include <qmlscriptstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h
index f4f54ee..9c45dc1 100644
--- a/src/declarative/qml/qmlvme_p.h
+++ b/src/declarative/qml/qmlvme_p.h
@@ -53,10 +53,11 @@
 // We mean it.
 //
 
+#include "qmlerror.h"
+#include "qbitfield_p.h"
+
 #include <QtCore/QString>
 #include <QtCore/QStack>
-#include <qmlerror.h>
-#include <private/qbitfield_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp
index 5e19347..8588eff 100644
--- a/src/declarative/qml/qmlvmemetaobject.cpp
+++ b/src/declarative/qml/qmlvmemetaobject.cpp
@@ -39,15 +39,17 @@
 **
 ****************************************************************************/
 
-#include <private/qmlvmemetaobject_p.h>
-#include <qml.h>
-#include <private/qmlrefcount_p.h>
+#include "qmlvmemetaobject_p.h"
+
+#include "qml.h"
+#include "qmlrefcount_p.h"
+#include "qmlexpression.h"
+#include "qmlcontext_p.h"
+
 #include <QColor>
 #include <QDate>
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
-#include <qmlexpression.h>
-#include <private/qmlcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h
index f78cfaa..e737721 100644
--- a/src/declarative/qml/qmlvmemetaobject_p.h
+++ b/src/declarative/qml/qmlvmemetaobject_p.h
@@ -53,10 +53,12 @@
 // We mean it.
 //
 
-#include <qml.h>
+#include "qml.h"
+
 #include <QtCore/QMetaObject>
 #include <QtCore/QBitArray>
 #include <QtCore/QPair>
+
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp
index 2ecb1d9..507c11d 100644
--- a/src/declarative/qml/qmlwatcher.cpp
+++ b/src/declarative/qml/qmlwatcher.cpp
@@ -39,14 +39,16 @@
 **
 ****************************************************************************/
 
+#include "qmlwatcher_p.h"
+
+#include "qmlexpression.h"
+#include "qmlcontext.h"
+#include "qml.h"
+
+#include <qmldebugservice_p.h>
+
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qdebug.h>
-#include <qmlexpression.h>
-#include <private/qmldebugservice_p.h>
-#include <qmlcontext.h>
-#include <qml.h>
-
-#include <private/qmlwatcher_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -180,4 +182,4 @@ void QmlWatcher::addPropertyWatch(int id, QObject *object, quint32 debugId, cons
 
 QT_END_NAMESPACE
 
-#include "qmlwatcher.moc"
+#include <qmlwatcher.moc>
diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp
index 0437bd6..2a3dbce 100644
--- a/src/declarative/qml/qmlworkerscript.cpp
+++ b/src/declarative/qml/qmlworkerscript.cpp
@@ -39,12 +39,14 @@
 **
 ****************************************************************************/
 
-#include <private/qmlworkerscript_p.h>
+#include "qmlworkerscript_p.h"
+
+#include "qmlengine_p.h"
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
 #include <QtScript/qscriptengine.h>
-#include <private/qmlengine_p.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/qwaitcondition.h>
 #include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/qml/qmlworkerscript_p.h b/src/declarative/qml/qmlworkerscript_p.h
index 96394ae..51efc4b 100644
--- a/src/declarative/qml/qmlworkerscript_p.h
+++ b/src/declarative/qml/qmlworkerscript_p.h
@@ -53,9 +53,10 @@
 // We mean it.
 //
 
+#include "qml.h"
+#include "qmlparserstatus.h"
+
 #include <QtCore/qthread.h>
-#include <qml.h>
-#include <qmlparserstatus.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtCore/qurl.h>
 
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
index 18d3c55..d1705a1 100644
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ b/src/declarative/qml/qmlxmlhttprequest.cpp
@@ -39,19 +39,20 @@
 **
 ****************************************************************************/
 
+#include "qmlxmlhttprequest_p.h"
+
+#include "qmlengine.h"
+#include "qmlengine_p.h"
+#include "qmlrefcount_p.h"
+#include "qmlengine_p.h"
+
 #include <QtCore/qobject.h>
-#include <qmlengine.h>
-#include <private/qmlengine_p.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptcontext.h>
 #include <QtScript/qscriptengine.h>
 #include <QtNetwork/qnetworkreply.h>
 #include <QtCore/qxmlstream.h>
-#include <private/qmlrefcount_p.h>
-#include <private/qmlengine_p.h>
 #include <QtCore/qstack.h>
-#include <private/qmlxmlhttprequest_p.h>
-
 #include <QtCore/qdebug.h>
 
 // From DOM-Level-3-Core spec
@@ -1590,4 +1591,4 @@ void qt_add_qmlxmlhttprequest(QScriptEngine *engine)
     engine->globalObject().setProperty(QLatin1String("DOMException"), domExceptionPrototype);
 }
 
-#include "qmlxmlhttprequest.moc"
+#include <qmlxmlhttprequest.moc>
diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp
index 1f66393..237d33f 100644
--- a/src/declarative/qml/rewriter/rewriter.cpp
+++ b/src/declarative/qml/rewriter/rewriter.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/rewriter_p.h>
-#include <private/qmljsast_p.h>
+#include "rewriter_p.h"
+
+#include <qmljsast_p.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/rewriter/rewriter_p.h b/src/declarative/qml/rewriter/rewriter_p.h
index 731621d..57e7ea2 100644
--- a/src/declarative/qml/rewriter/rewriter_p.h
+++ b/src/declarative/qml/rewriter/rewriter_p.h
@@ -42,12 +42,13 @@
 #ifndef REWRITER_H
 #define REWRITER_H
 
+#include "textwriter_p.h"
+
+#include <qmljsastvisitor_p.h>
+
 #include <QtCore/QList>
 #include <QtCore/QString>
 
-#include <private/textwriter_p.h>
-#include <private/qmljsastvisitor_p.h>
-
 QT_BEGIN_HEADER
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp
index 876db4d..8f89f12 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/rewriter/textwriter_p.h b/src/declarative/qml/rewriter/textwriter_p.h
index f7b8b26..a19fa5e 100644
--- a/src/declarative/qml/rewriter/textwriter_p.h
+++ b/src/declarative/qml/rewriter/textwriter_p.h
@@ -42,12 +42,12 @@
 #ifndef TEXTWRITER_H
 #define TEXTWRITER_H
 
+#include <qmljsglobal_p.h>
+
 #include <QtCore/QString>
 #include <QtCore/QList>
 #include <QtGui/QTextCursor>
 
-#include <private/qmljsglobal_p.h>
-
 QT_BEGIN_HEADER
 QT_QML_BEGIN_NAMESPACE