Undo most of 913dd563064e8047fe738fc9c79135adfb928977

It seems we're going to have to so a syncqt/configure in Qt modules.

86 files changed, 275 insertions, 275 deletions

diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp
index 6986bd2..81b0649 100644
--- a/src/declarative/qml/parser/qmljsast.cpp
+++ b/src/declarative/qml/parser/qmljsast.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmljsast_p.h"
-#include "qmljsastvisitor_p.h"
+#include <private/qmljsast_p.h>
+#include <private/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 388bc12..d3ba0e4 100644
--- a/src/declarative/qml/parser/qmljsast_p.h
+++ b/src/declarative/qml/parser/qmljsast_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qmljsastvisitor_p.h"
-#include "qmljsglobal_p.h"
+#include <private/qmljsastvisitor_p.h>
+#include <private/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 b558a23..b485138 100644
--- a/src/declarative/qml/parser/qmljsastfwd_p.h
+++ b/src/declarative/qml/parser/qmljsastfwd_p.h
@@ -43,7 +43,7 @@
 #define QMLJSAST_FWD_P_H
 
 #include <QtCore/qglobal.h>
-#include "qmljsglobal_p.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 1290c89..089fe76 100644
--- a/src/declarative/qml/parser/qmljsastvisitor.cpp
+++ b/src/declarative/qml/parser/qmljsastvisitor.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmljsastvisitor_p.h"
+#include <private/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 7db84b0..cb76b3a 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 "qmljsastfwd_p.h"
-#include "qmljsglobal_p.h"
+#include <private/qmljsastfwd_p.h>
+#include <private/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 cee90a3..ab317aa 100644
--- a/src/declarative/qml/parser/qmljsengine_p.cpp
+++ b/src/declarative/qml/parser/qmljsengine_p.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qmljsglobal_p.h"
-#include "qmljsengine_p.h"
-#include "qmljsnodepool_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsengine_p.h>
+#include <private/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 a60c515..2fd0421 100644
--- a/src/declarative/qml/parser/qmljsengine_p.h
+++ b/src/declarative/qml/parser/qmljsengine_p.h
@@ -56,8 +56,8 @@
 #include <QString>
 #include <QSet>
 
-#include "qmljsglobal_p.h"
-#include "qmljsastfwd_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsastfwd_p.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp
index b8c6560..9ad61e6 100644
--- a/src/declarative/qml/parser/qmljsgrammar.cpp
+++ b/src/declarative/qml/parser/qmljsgrammar.cpp
@@ -40,7 +40,7 @@
 **
 ****************************************************************************/
 
-#include "qmljsgrammar_p.h"
+#include <private/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 d316f93..2edd553 100644
--- a/src/declarative/qml/parser/qmljslexer.cpp
+++ b/src/declarative/qml/parser/qmljslexer.cpp
@@ -43,10 +43,10 @@
 #include "config.h"
 #endif
 
-#include "qmljsglobal_p.h"
-#include "qmljsengine_p.h"
-#include "qmljslexer_p.h"
-#include "qmljsgrammar_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsengine_p.h>
+#include <private/qmljslexer_p.h>
+#include <private/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 f499750..96c8921 100644
--- a/src/declarative/qml/parser/qmljslexer_p.h
+++ b/src/declarative/qml/parser/qmljslexer_p.h
@@ -55,7 +55,7 @@
 
 #include <QtCore/QString>
 
-#include "qmljsglobal_p.h"
+#include <private/qmljsglobal_p.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h
index 24a2145..ca60ef1 100644
--- a/src/declarative/qml/parser/qmljsmemorypool_p.h
+++ b/src/declarative/qml/parser/qmljsmemorypool_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/qshareddata.h>
 #include <string.h>
 
-#include "qmljsglobal_p.h"
+#include <private/qmljsglobal_p.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h
index ca4d729..573a947 100644
--- a/src/declarative/qml/parser/qmljsnodepool_p.h
+++ b/src/declarative/qml/parser/qmljsnodepool_p.h
@@ -56,8 +56,8 @@
 #include <QtCore/QHash>
 #include <QtCore/QString>
 
-#include "qmljsglobal_p.h"
-#include "qmljsmemorypool_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsmemorypool_p.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp
index 453503b..472f67e 100644
--- a/src/declarative/qml/parser/qmljsparser.cpp
+++ b/src/declarative/qml/parser/qmljsparser.cpp
@@ -46,14 +46,14 @@
 
 #include <string.h>
 
-#include "qmljsengine_p.h"
-#include "qmljslexer_p.h"
-#include "qmljsast_p.h"
-#include "qmljsnodepool_p.h"
+#include <private/qmljsengine_p.h>
+#include <private/qmljslexer_p.h>
+#include <private/qmljsast_p.h>
+#include <private/qmljsnodepool_p.h>
 
 
 
-#include "qmljsparser_p.h"
+#include <private/qmljsparser_p.h>
 #include <QVarLengthArray>
 
 //
diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h
index 7fad58a..aab6c7e 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 "qmljsglobal_p.h"
-#include "qmljsgrammar_p.h"
-#include "qmljsast_p.h"
-#include "qmljsengine_p.h"
+#include <private/qmljsglobal_p.h>
+#include <private/qmljsgrammar_p.h>
+#include <private/qmljsast_p.h>
+#include <private/qmljsengine_p.h>
 
 #include <QtCore/QList>
 #include <QtCore/QString>
diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index c421c76..3187e41 100644
--- a/src/declarative/qml/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmetaobjectbuilder_p.h"
+#include <private/qmetaobjectbuilder_p.h>
 #ifndef Q_OS_WIN
 #include <stdint.h>
 #endif
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index a27c4fb..01cb97f 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "qmlbasicscript_p.h"
+#include <private/qmlbasicscript_p.h>
 #include <QColor>
 #include <QDebug>
-#include "qmlengine_p.h"
-#include "qmlcontext_p.h"
+#include <private/qmlengine_p.h>
+#include <private/qmlcontext_p.h>
 #include <QStack>
-#include "qfxperf_p_p.h"
-#include "qmlrefcount_p.h"
-#include "qmljsast_p.h"
-#include "qmljsengine_p.h"
-#include "qmlglobal_p.h"
+#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 4c4b178..57d4fa7 100644
--- a/src/declarative/qml/qmlbasicscript_p.h
+++ b/src/declarative/qml/qmlbasicscript_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/QList>
 #include <QtCore/QByteArray>
 #include <QtCore/QVariant>
-#include "qmlparser_p.h"
+#include <private/qmlparser_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index bb9a803..f0bfd98 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -41,15 +41,15 @@
 
 #include <qml.h>
 #include "qmlbinding.h"
-#include "qmlbinding_p.h"
+#include <private/qmlbinding_p.h>
 #include <qmlcontext.h>
 #include <qmlinfo.h>
 #include <QVariant>
-#include "qfxperf_p_p.h"
+#include <private/qfxperf_p_p.h>
 #include <QtCore/qdebug.h>
-#include "qmlcontext_p.h"
-#include "qmldeclarativedata_p.h"
-#include "qmlstringconverters_p.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_p.h b/src/declarative/qml/qmlbinding_p.h
index 30a31ab..85d9ad6 100644
--- a/src/declarative/qml/qmlbinding_p.h
+++ b/src/declarative/qml/qmlbinding_p.h
@@ -55,7 +55,7 @@
 
 #include <qmlbinding.h>
 #include <qmlmetaproperty.h>
-#include "qmlexpression_p.h"
+#include <private/qmlexpression_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbindingoptimizations.cpp b/src/declarative/qml/qmlbindingoptimizations.cpp
index 5c67241..136bf23 100644
--- a/src/declarative/qml/qmlbindingoptimizations.cpp
+++ b/src/declarative/qml/qmlbindingoptimizations.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlbindingoptimizations_p.h"
-#include "qmlcontext_p.h"
+#include <private/qmlbindingoptimizations_p.h>
+#include <private/qmlcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h
index 1e3723f..2cdc07d 100644
--- a/src/declarative/qml/qmlbindingoptimizations_p.h
+++ b/src/declarative/qml/qmlbindingoptimizations_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qmlexpression_p.h"
+#include <private/qmlexpression_p.h>
 #include <qmlbinding.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp
index 78bcd49..1f41472 100644
--- a/src/declarative/qml/qmlboundsignal.cpp
+++ b/src/declarative/qml/qmlboundsignal.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "qmlboundsignal_p.h"
-#include "qmetaobjectbuilder_p.h"
-#include "qmlengine_p.h"
-#include "qmlexpression_p.h"
-#include "qmlcontext_p.h"
+#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 <QtCore/qdebug.h>
-#include "qmlglobal_p.h"
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlclassfactory.cpp b/src/declarative/qml/qmlclassfactory.cpp
index 3c19c2f..bad0890 100644
--- a/src/declarative/qml/qmlclassfactory.cpp
+++ b/src/declarative/qml/qmlclassfactory.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmlclassfactory_p.h"
+#include <private/qmlclassfactory_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp
index 6b98191..0a0175c 100644
--- a/src/declarative/qml/qmlcleanup.cpp
+++ b/src/declarative/qml/qmlcleanup.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlcleanup_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlcleanup_p.h>
+#include <private/qmlengine_p.h>
 
 /*!
 \internal
diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp
index 9b931c5..c4a0b59 100644
--- a/src/declarative/qml/qmlcompileddata.cpp
+++ b/src/declarative/qml/qmlcompileddata.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qmlcompiler_p.h"
+#include <private/qmlcompiler_p.h>
 #include "qmlengine.h"
 #include "qmlcomponent.h"
-#include "qmlcomponent_p.h"
+#include <private/qmlcomponent_p.h>
 #include "qmlcontext.h"
-#include "qmlcontext_p.h"
+#include <private/qmlcontext_p.h>
 #include <private/qobject_p.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 8edf023..7a31673 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -39,40 +39,40 @@
 **
 ****************************************************************************/
 
-#include "qmlcompiler_p.h"
-#include "qmlcompositetypedata_p.h"
-#include "qfxperf_p_p.h"
-#include "qmlparser_p.h"
-#include "qmlscriptparser_p.h"
+#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 "qmetaobjectbuilder_p.h"
-#include "qmlbasicscript_p.h"
+#include <private/qmetaobjectbuilder_p.h>
+#include <private/qmlbasicscript_p.h>
 #include <QColor>
 #include <QDebug>
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
 #include <QAtomicInt>
-#include "qmlstringconverters_p.h"
-#include "qmlengine_p.h"
+#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 "qmlcustomparser_p_p.h"
-#include "qmlcontext_p.h"
-#include "qmlcomponent_p.h"
+#include <private/qmlcustomparser_p_p.h>
+#include <private/qmlcontext_p.h>
+#include <private/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 <private/qmlvmemetaobject_p.h>
+#include <private/qmlexpression_p.h>
+#include <private/qmlmetaproperty_p.h>
+#include <private/qmlrewrite_p.h>
 #include <qmlscriptstring.h>
-#include "qmlglobal_p.h"
+#include <private/qmlglobal_p.h>
 
-#include "qmlscriptparser_p.h"
+#include <private/qmlscriptparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -2307,7 +2307,7 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode)
     return true;
 }
 
-#include "qmljsparser_p.h"
+#include <private/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 991ae81..542fb48 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -57,14 +57,14 @@
 #include <QtCore/qset.h>
 #include <qml.h>
 #include <qmlerror.h>
-#include "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 <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 2e8e4ce..1e922b0 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -40,25 +40,25 @@
 ****************************************************************************/
 
 #include "qmlcomponent.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 <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 "qml.h"
 #include <QStack>
-#include "qfxperf_p_p.h"
+#include <private/qfxperf_p_p.h>
 #include <QStringList>
 #include <qmlengine.h>
 #include <QFileInfo>
 #include "qmlbinding.h"
 #include <QtCore/qdebug.h>
 #include <QApplication>
-#include "qmlbinding_p.h"
-#include "qmlglobal_p.h"
+#include <private/qmlbinding_p.h>
+#include <private/qmlglobal_p.h>
 
-#include "qmlscriptparser_p.h"
+#include <private/qmlscriptparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index c9dfac8..61a8a10 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -57,9 +57,9 @@
 #include <QtCore/QStringList>
 #include <QtCore/QList>
 #include <private/qobject_p.h>
-#include "qmlengine_p.h"
-#include "qmlcompositetypemanager_p.h"
-#include "qbitfield_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>
diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h
index 96531982..0d2843d 100644
--- a/src/declarative/qml/qmlcompositetypedata_p.h
+++ b/src/declarative/qml/qmlcompositetypedata_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qglobal.h>
-#include "qmlengine_p.h"
+#include <private/qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index ca07d84..fa68951 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "qmlcompositetypedata_p.h"
-#include "qmlcompositetypemanager_p.h"
-#include "qmlscriptparser_p.h"
+#include <private/qmlcompositetypedata_p.h>
+#include <private/qmlcompositetypemanager_p.h>
+#include <private/qmlscriptparser_p.h>
 #include <qmlengine.h>
 #include <QtNetwork/qnetworkreply.h>
-#include "qmlengine_p.h"
+#include <private/qmlengine_p.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
 #include <qmlcomponent.h>
-#include "qmlcomponent_p.h"
-#include "qmlcompiler_p.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 f81e594..0abbfb5 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -54,8 +54,8 @@
 //
 
 #include <QtCore/qglobal.h>
-#include "qmlscriptparser_p.h"
-#include "qmlrefcount_p.h"
+#include <private/qmlscriptparser_p.h>
+#include <private/qmlrefcount_p.h>
 #include <qmlerror.h>
 #include <qmlengine.h>
 
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index be483c9..38cbcfa 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -40,14 +40,14 @@
 ****************************************************************************/
 
 #include <qmlcontext.h>
-#include "qmlcontext_p.h"
-#include "qmlexpression_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlcontext_p.h>
+#include <private/qmlexpression_p.h>
+#include <private/qmlengine_p.h>
 #include <qmlengine.h>
 #include <qscriptengine.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qdebug.h>
-#include "qmlbindingoptimizations_p.h"
+#include <private/qmlbindingoptimizations_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
 #include <qmlinfo.h>
 
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 4ad524d..c8d0b2d 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -55,14 +55,14 @@
 
 #include <qmlcontext.h>
 #include <private/qobject_p.h>
-#include "qmldeclarativedata_p.h"
+#include <private/qmldeclarativedata_p.h>
 #include <QtCore/qhash.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtCore/qset.h>
 #include <private/qguard_p.h>
-#include "qmlengine_p.h"
-#include "qmlintegercache_p.h"
-#include "qmltypenamecache_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 c740ce7..d567da1 100644
--- a/src/declarative/qml/qmlcontextscriptclass.cpp
+++ b/src/declarative/qml/qmlcontextscriptclass.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qmlcontextscriptclass_p.h"
-#include "qmlengine_p.h"
-#include "qmlcontext_p.h"
-#include "qmltypenamescriptclass_p.h"
+#include <private/qmlcontextscriptclass_p.h>
+#include <private/qmlengine_p.h>
+#include <private/qmlcontext_p.h>
+#include <private/qmltypenamescriptclass_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h
index d24dfa6..10b848a 100644
--- a/src/declarative/qml/qmlcontextscriptclass_p.h
+++ b/src/declarative/qml/qmlcontextscriptclass_p.h
@@ -55,7 +55,7 @@
 
 #include <QtScript/qscriptclass.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include "qmltypenamecache_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 32a745c..9174fe6 100644
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ b/src/declarative/qml/qmlcustomparser.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qmlcustomparser_p.h"
-#include "qmlcustomparser_p_p.h"
-#include "qmlparser_p.h"
+#include <private/qmlcustomparser_p.h>
+#include <private/qmlcustomparser_p_p.h>
+#include <private/qmlparser_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index 9b09280..88a264f 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/qxmlstream.h>
 #include <qmlmetatype.h>
 #include <qmlerror.h>
-#include "qmlparser_p.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 2e0f14a..e8673c9 100644
--- a/src/declarative/qml/qmlcustomparser_p_p.h
+++ b/src/declarative/qml/qmlcustomparser_p_p.h
@@ -54,8 +54,8 @@
 //
 
 #include <QtCore/qglobal.h>
-#include "qmlcustomparser_p.h"
-#include "qmlparser_p.h"
+#include <private/qmlcustomparser_p.h>
+#include <private/qmlparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 596294f..1b02199 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -40,15 +40,15 @@
 ****************************************************************************/
 
 #include "qmldom.h"
-#include "qmldom_p.h"
-#include "qmlcompositetypedata_p.h"
-#include "qmlcompiler_p.h"
-#include "qmlengine_p.h"
+#include <private/qmldom_p.h>
+#include <private/qmlcompositetypedata_p.h>
+#include <private/qmlcompiler_p.h>
+#include <private/qmlengine_p.h>
 #include <QtCore/QByteArray>
 #include <QtCore/QDebug>
 #include <QtCore/QString>
-#include "qmlscriptparser_p.h"
-#include "qmlglobal_p.h"
+#include <private/qmlscriptparser_p.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmldom_p.h b/src/declarative/qml/qmldom_p.h
index cb0d884..10bf312 100644
--- a/src/declarative/qml/qmldom_p.h
+++ b/src/declarative/qml/qmldom_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/QtGlobal>
-#include "qmlparser_p.h"
+#include <private/qmlparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index f136017..06743cc 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 
 #include <QtCore/qmetaobject.h>
-#include "qmlengine_p.h"
-#include "qmlcontext_p.h"
+#include <private/qmlengine_p.h>
+#include <private/qmlcontext_p.h>
 #include <private/qobject_p.h>
-#include "qmlcompiler_p.h"
+#include <private/qmlcompiler_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include "qmlglobalscriptclass_p.h"
+#include <private/qmlglobalscriptclass_p.h>
 
 #include <QScriptClass>
 #include <QNetworkReply>
@@ -58,9 +58,9 @@
 #include <QDebug>
 #include <QMetaObject>
 #include "qml.h"
-#include "qfxperf_p_p.h"
+#include <private/qfxperf_p_p.h>
 #include <QStack>
-#include "qmlbasicscript_p.h"
+#include <private/qmlbasicscript_p.h>
 #include "qmlengine.h"
 #include "qmlcontext.h"
 #include "qmlexpression.h"
@@ -73,19 +73,19 @@
 #include <QtGui/qsound.h>
 #include <QGraphicsObject>
 #include <qmlcomponent.h>
-#include "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 <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 "qmlglobal_p.h"
+#include <private/qmlglobal_p.h>
 #include <QtCore/qcryptographichash.h>
-#include "qmlworkerscript_p.h"
+#include <private/qmlworkerscript_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
 #include "qt_windows.h"
@@ -1211,7 +1211,7 @@ QmlEnginePrivate::Imports::~Imports()
 }
 
 #include <qmlmetatype.h>
-#include "qmltypenamecache_p.h"
+#include <private/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 9267a66..4eb9843 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -61,21 +61,21 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qstack.h>
 #include <private/qobject_p.h>
-#include "qmlclassfactory_p.h"
-#include "qmlcompositetypemanager_p.h"
-#include "qpodvector_p.h"
+#include <private/qmlclassfactory_p.h>
+#include <private/qmlcompositetypemanager_p.h>
+#include <private/qpodvector_p.h>
 #include <qml.h>
-#include "qmlbasicscript_p.h"
-#include "qmlvaluetype_p.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 "qmlmetaproperty_p.h"
-#include "qmlpropertycache_p.h"
-#include "qmlobjectscriptclass_p.h"
-#include "qmlcontextscriptclass_p.h"
-#include "qmlvaluetypescriptclass_p.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>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 6871236..68c0607 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "qmlenginedebug_p.h"
-#include "qmlboundsignal_p.h"
+#include <private/qmlenginedebug_p.h>
+#include <private/qmlboundsignal_p.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>
 #include <qmlengine.h>
 #include <qmlmetatype.h>
 #include <qmlmetaproperty.h>
 #include <qmlbinding.h>
-#include "qmlcontext_p.h"
-#include "qmlwatcher_p.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 1804f6b..8ba3d38 100644
--- a/src/declarative/qml/qmlenginedebug_p.h
+++ b/src/declarative/qml/qmlenginedebug_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qmldebugservice_p.h"
+#include <private/qmldebugservice_p.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 2239d77..d7a6496 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 
 #include "qmlexpression.h"
-#include "qmlexpression_p.h"
-#include "qmlengine_p.h"
-#include "qmlcontext_p.h"
-#include "qmlrewrite_p.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 "qmlcompiler_p.h"
+#include <private/qmlcompiler_p.h>
 #include <QtScript/qscriptprogram.h>
 #include <private/qscriptdeclarativeclass_p.h>
 
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index dbb12ba..98ef856 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "qmlbasicscript_p.h"
+#include <private/qmlbasicscript_p.h>
 #include "qmlexpression.h"
-#include "qmlengine_p.h"
+#include <private/qmlengine_p.h>
 #include <private/qguard_p.h>
 #include <QtScript/qscriptvalue.h>
 
diff --git a/src/declarative/qml/qmlglobalscriptclass.cpp b/src/declarative/qml/qmlglobalscriptclass.cpp
index fd270e3..bb81d37 100644
--- a/src/declarative/qml/qmlglobalscriptclass.cpp
+++ b/src/declarative/qml/qmlglobalscriptclass.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmlglobalscriptclass_p.h"
+#include <private/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 3d9e0f7..bbd6022 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlinfo.h"
-#include "qmldeclarativedata_p.h"
+#include <private/qmldeclarativedata_p.h>
 #include <qmlcontext.h>
 #include <QtGui/qapplication.h>
 
diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp
index 65d070c..322ae9c 100644
--- a/src/declarative/qml/qmlinstruction.cpp
+++ b/src/declarative/qml/qmlinstruction.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlinstruction_p.h"
-#include "qmlcompiler_p.h"
+#include <private/qmlinstruction_p.h>
+#include <private/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 981e653..673d683 100644
--- a/src/declarative/qml/qmlintegercache.cpp
+++ b/src/declarative/qml/qmlintegercache.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlintegercache_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlintegercache_p.h>
+#include <private/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 1592337..2b10dcc 100644
--- a/src/declarative/qml/qmlintegercache_p.h
+++ b/src/declarative/qml/qmlintegercache_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "qmlrefcount_p.h"
+#include <private/qmlrefcount_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include "qmlcleanup_p.h"
+#include <private/qmlcleanup_p.h>
 #include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp
index bb3eb21..6e67864 100644
--- a/src/declarative/qml/qmllistscriptclass.cpp
+++ b/src/declarative/qml/qmllistscriptclass.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmllistscriptclass_p.h"
-#include "qmlengine_p.h"
+#include <private/qmllistscriptclass_p.h>
+#include <private/qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 0e34305..5a1c327 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -40,19 +40,19 @@
 ****************************************************************************/
 
 #include "qmlmetaproperty.h"
-#include "qmlmetaproperty_p.h"
-#include "qmlcompositetypedata_p.h"
+#include <private/qmlmetaproperty_p.h>
+#include <private/qmlcompositetypedata_p.h>
 #include <qml.h>
-#include "qfxperf_p_p.h"
+#include <private/qfxperf_p_p.h>
 #include <QStringList>
 #include "qmlbinding.h"
 #include <qmlcontext.h>
-#include "qmlboundsignal_p.h"
+#include <private/qmlboundsignal_p.h>
 #include <math.h>
 #include <QtCore/qdebug.h>
 #include <qmlengine.h>
-#include "qmlengine_p.h"
-#include "qmldeclarativedata_p.h"
+#include <private/qmlengine_p.h>
+#include <private/qmldeclarativedata_p.h>
 
 Q_DECLARE_METATYPE(QList<QObject *>);
 
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index dfb05fb..d225afa 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -55,7 +55,7 @@
 
 #include "qmlmetaproperty.h"
 #include <private/qobject_p.h>
-#include "qmlpropertycache_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 06927457..46d967b 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qbitarray.h>
 #include <QtCore/qreadwritelock.h>
-#include "qmlproxymetaobject_p.h"
+#include <private/qmlproxymetaobject_p.h>
 
 #include <qmetatype.h>
 #include <qobjectdefs.h>
@@ -59,7 +59,7 @@
 #include <ctype.h>
 #include <QtCore/qcryptographichash.h>
 #include <QtScript/qscriptvalue.h>
-#include "qmlcustomparser_p.h"
+#include <private/qmlcustomparser_p.h>
 
 #ifdef QT_BOOTSTRAPPED
 # ifndef QT_NO_GEOM_VARIANT
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 7c4ce5b..fb3dd07 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qmlobjectscriptclass_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlobjectscriptclass_p.h>
+#include <private/qmlengine_p.h>
 #include <private/qguard_p.h>
-#include "qmlcontext_p.h"
-#include "qmldeclarativedata_p.h"
-#include "qmltypenamescriptclass_p.h"
-#include "qmllistscriptclass_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 <QtCore/qtimer.h>
 
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h
index 771c3eb..6169812 100644
--- a/src/declarative/qml/qmlobjectscriptclass_p.h
+++ b/src/declarative/qml/qmlobjectscriptclass_p.h
@@ -55,8 +55,8 @@
 
 #include <QtScript/qscriptclass.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include "qmlpropertycache_p.h"
-#include "qmltypenamecache_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 04e2926..d92529b 100644
--- a/src/declarative/qml/qmlparser.cpp
+++ b/src/declarative/qml/qmlparser.cpp
@@ -39,21 +39,21 @@
 **
 ****************************************************************************/
 
-#include "qmlparser_p.h"
+#include <private/qmlparser_p.h>
 #include <QStack>
 #include <qmlpropertyvaluesource.h>
 #include <QColor>
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
-#include "qmlvme_p.h"
-#include "qfxperf_p_p.h"
+#include <private/qmlvme_p.h>
+#include <private/qfxperf_p_p.h>
 #include <qml.h>
-#include "qmlcomponent_p.h"
+#include <private/qmlcomponent_p.h>
 #include <qmlcomponent.h>
-#include "qmetaobjectbuilder_p.h"
-#include "qmlvmemetaobject_p.h"
-#include "qmlcompiler_p.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>
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index d4bf88e..73bb498 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/QList>
 #include <QtCore/qstring.h>
 #include <qml.h>
-#include "qmlrefcount_p.h"
+#include <private/qmlrefcount_p.h>
 #include <private/qobject_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index 0e7da84..89d66b1 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlpropertycache_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlpropertycache_p.h>
+#include <private/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 9265910..8f19a8b 100644
--- a/src/declarative/qml/qmlpropertycache_p.h
+++ b/src/declarative/qml/qmlpropertycache_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "qmlrefcount_p.h"
+#include <private/qmlrefcount_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include "qmlcleanup_p.h"
+#include <private/qmlcleanup_p.h>
 #include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlproxymetaobject.cpp b/src/declarative/qml/qmlproxymetaobject.cpp
index 983c350..72e8504 100644
--- a/src/declarative/qml/qmlproxymetaobject.cpp
+++ b/src/declarative/qml/qmlproxymetaobject.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmlproxymetaobject_p.h"
+#include <private/qmlproxymetaobject_p.h>
 
 #include <QDebug>
 
diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h
index 7a15bd9..7f9163c 100644
--- a/src/declarative/qml/qmlproxymetaobject_p.h
+++ b/src/declarative/qml/qmlproxymetaobject_p.h
@@ -55,7 +55,7 @@
 
 #include <QtCore/QMetaObject>
 #include <QtCore/QObject>
-#include "qmetaobjectbuilder_p.h"
+#include <private/qmetaobjectbuilder_p.h>
 #include <private/qobject_p.h>
 #include <qml.h>
 
diff --git a/src/declarative/qml/qmlrefcount.cpp b/src/declarative/qml/qmlrefcount.cpp
index 9422625..dbe84ad 100644
--- a/src/declarative/qml/qmlrefcount.cpp
+++ b/src/declarative/qml/qmlrefcount.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmlrefcount_p.h"
+#include <private/qmlrefcount_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp
index 5fcebf4d..6674095 100644
--- a/src/declarative/qml/qmlrewrite.cpp
+++ b/src/declarative/qml/qmlrewrite.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qmlrewrite_p.h"
+#include <private/qmlrewrite_p.h>
 #include <QtCore/qdebug.h>
-#include "qmlglobal_p.h"
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 3ee7b50..89336f3 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlscriptparser_p.h"
-#include "qmlparser_p.h"
+#include <private/qmlscriptparser_p.h>
+#include <private/qmlparser_p.h>
 
 #include "parser/qmljsengine_p.h"
 #include "parser/qmljsparser_p.h"
@@ -49,13 +49,13 @@
 #include "parser/qmljsastvisitor_p.h"
 #include "parser/qmljsast_p.h"
 
-#include "qmlrewrite_p.h"
+#include <private/qmlrewrite_p.h>
 
 #include <QStack>
 #include <QCoreApplication>
 #include <QtDebug>
 
-#include "qfxperf_p_p.h"
+#include <private/qfxperf_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index cb3e9e9..d6f57c3 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -55,7 +55,7 @@
 #include <QtCore/QList>
 #include <QtCore/QUrl>
 #include <qmlerror.h>
-#include "qmlparser_p.h"
+#include <private/qmlparser_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index 3981d4c..8c4c7bf 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -41,7 +41,7 @@
 
 #include <QtCore/qobject.h>
 #include <qmlengine.h>
-#include "qmlengine_p.h"
+#include <private/qmlengine_p.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptvalueiterator.h>
 #include <QtScript/qscriptcontext.h>
@@ -51,11 +51,11 @@
 #include <QtSql/qsqlquery.h>
 #include <QtSql/qsqlerror.h>
 #include <QtSql/qsqlrecord.h>
-#include "qmlrefcount_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlrefcount_p.h>
+#include <private/qmlengine_p.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qcryptographichash.h>
-#include "qmlsqldatabase_p.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 0f6ada9..872feba 100644
--- a/src/declarative/qml/qmlstringconverters.cpp
+++ b/src/declarative/qml/qmlstringconverters.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qvariant.h>
-#include "qmlstringconverters_p.h"
+#include <private/qmlstringconverters_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp
index ea2a4f3..1a38aa5 100644
--- a/src/declarative/qml/qmltypenamecache.cpp
+++ b/src/declarative/qml/qmltypenamecache.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmltypenamecache_p.h"
-#include "qmlengine_p.h"
+#include <private/qmltypenamecache_p.h>
+#include <private/qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h
index 619a788..6ff403d 100644
--- a/src/declarative/qml/qmltypenamecache_p.h
+++ b/src/declarative/qml/qmltypenamecache_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "qmlrefcount_p.h"
+#include <private/qmlrefcount_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include "qmlcleanup_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 9db3426..1f13f20 100644
--- a/src/declarative/qml/qmltypenamescriptclass.cpp
+++ b/src/declarative/qml/qmltypenamescriptclass.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qmltypenamescriptclass_p.h"
-#include "qmlengine_p.h"
-#include "qmltypenamecache_p.h"
+#include <private/qmltypenamescriptclass_p.h>
+#include <private/qmlengine_p.h>
+#include <private/qmltypenamecache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h
index cec134d..f630854 100644
--- a/src/declarative/qml/qmltypenamescriptclass_p.h
+++ b/src/declarative/qml/qmltypenamescriptclass_p.h
@@ -54,7 +54,7 @@
 //
 #include <QtScript/qscriptclass.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include "qmlengine_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 859a93a..8a05312 100644
--- a/src/declarative/qml/qmlvaluetype.cpp
+++ b/src/declarative/qml/qmlvaluetype.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmlvaluetype_p.h"
+#include <private/qmlvaluetype_p.h>
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp
index 3b1953a..b3b09be 100644
--- a/src/declarative/qml/qmlvaluetypescriptclass.cpp
+++ b/src/declarative/qml/qmlvaluetypescriptclass.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qmlvaluetypescriptclass_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlvaluetypescriptclass_p.h>
+#include <private/qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 87672d0..3968d8d 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qmlvme_p.h"
-#include "qmlcompiler_p.h"
-#include "qfxperf_p_p.h"
-#include "qmlboundsignal_p.h"
-#include "qmlstringconverters_p.h"
-#include "qmetaobjectbuilder_p.h"
-#include "qmldeclarativedata_p.h"
+#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 "qmlcustomparser_p.h"
+#include <private/qmlcustomparser_p.h>
 #include <QStack>
 #include <QWidget>
 #include <QColor>
@@ -58,16 +58,16 @@
 #include <qmlcontext.h>
 #include <qmlcomponent.h>
 #include <qmlbinding.h>
-#include "qmlengine_p.h"
-#include "qmlcomponent_p.h"
-#include "qmlvmemetaobject_p.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 "qmlbinding_p.h"
-#include "qmlcontext_p.h"
-#include "qmlbindingoptimizations_p.h"
-#include "qmlglobal_p.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 a61d05a..f4f54ee 100644
--- a/src/declarative/qml/qmlvme_p.h
+++ b/src/declarative/qml/qmlvme_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/QString>
 #include <QtCore/QStack>
 #include <qmlerror.h>
-#include "qbitfield_p.h"
+#include <private/qbitfield_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp
index b7ee316..5e19347 100644
--- a/src/declarative/qml/qmlvmemetaobject.cpp
+++ b/src/declarative/qml/qmlvmemetaobject.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qmlvmemetaobject_p.h"
+#include <private/qmlvmemetaobject_p.h>
 #include <qml.h>
-#include "qmlrefcount_p.h"
+#include <private/qmlrefcount_p.h>
 #include <QColor>
 #include <QDate>
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
 #include <qmlexpression.h>
-#include "qmlcontext_p.h"
+#include <private/qmlcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp
index 3216a6b..2ecb1d9 100644
--- a/src/declarative/qml/qmlwatcher.cpp
+++ b/src/declarative/qml/qmlwatcher.cpp
@@ -42,11 +42,11 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qdebug.h>
 #include <qmlexpression.h>
-#include "qmldebugservice_p.h"
+#include <private/qmldebugservice_p.h>
 #include <qmlcontext.h>
 #include <qml.h>
 
-#include "qmlwatcher_p.h"
+#include <private/qmlwatcher_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp
index a41d9c5..0437bd6 100644
--- a/src/declarative/qml/qmlworkerscript.cpp
+++ b/src/declarative/qml/qmlworkerscript.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qmlworkerscript_p.h"
+#include <private/qmlworkerscript_p.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
 #include <QtScript/qscriptengine.h>
-#include "qmlengine_p.h"
+#include <private/qmlengine_p.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/qwaitcondition.h>
 #include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
index f5100ef..18d3c55 100644
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ b/src/declarative/qml/qmlxmlhttprequest.cpp
@@ -41,16 +41,16 @@
 
 #include <QtCore/qobject.h>
 #include <qmlengine.h>
-#include "qmlengine_p.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 "qmlrefcount_p.h"
-#include "qmlengine_p.h"
+#include <private/qmlrefcount_p.h>
+#include <private/qmlengine_p.h>
 #include <QtCore/qstack.h>
-#include "qmlxmlhttprequest_p.h"
+#include <private/qmlxmlhttprequest_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp
index ae1db30..1f66393 100644
--- a/src/declarative/qml/rewriter/rewriter.cpp
+++ b/src/declarative/qml/rewriter/rewriter.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "rewriter_p.h"
-#include "qmljsast_p.h"
+#include <private/rewriter_p.h>
+#include <private/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 ed9be16..731621d 100644
--- a/src/declarative/qml/rewriter/rewriter_p.h
+++ b/src/declarative/qml/rewriter/rewriter_p.h
@@ -45,8 +45,8 @@
 #include <QtCore/QList>
 #include <QtCore/QString>
 
-#include "textwriter_p.h"
-#include "qmljsastvisitor_p.h"
+#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 8f89f12..876db4d 100644
--- a/src/declarative/qml/rewriter/textwriter.cpp
+++ b/src/declarative/qml/rewriter/textwriter.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "textwriter_p.h"
+#include <private/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 14c4726..f7b8b26 100644
--- a/src/declarative/qml/rewriter/textwriter_p.h
+++ b/src/declarative/qml/rewriter/textwriter_p.h
@@ -46,7 +46,7 @@
 #include <QtCore/QList>
 #include <QtGui/QTextCursor>
 
-#include "qmljsglobal_p.h"
+#include <private/qmljsglobal_p.h>
 
 QT_BEGIN_HEADER
 QT_QML_BEGIN_NAMESPACE