Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

108 files changed, 860 insertions, 694 deletions

diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri
index 986b146..4530479 100644
--- a/src/declarative/qml/parser/parser.pri
+++ b/src/declarative/qml/parser/parser.pri
@@ -1,22 +1,21 @@
-
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-
-HEADERS += $$PWD/qmljsast_p.h \
-           $$PWD/qmljsastfwd_p.h \
-           $$PWD/qmljsastvisitor_p.h \
-           $$PWD/qmljsengine_p.h \
-           $$PWD/qmljsgrammar_p.h \
-           $$PWD/qmljslexer_p.h \
-           $$PWD/qmljsmemorypool_p.h \
-           $$PWD/qmljsnodepool_p.h \
-           $$PWD/qmljsparser_p.h \
-           $$PWD/qmljsglobal_p.h
 
-SOURCES += $$PWD/qmljsast.cpp \
-           $$PWD/qmljsastvisitor.cpp \
-           $$PWD/qmljsengine_p.cpp \
-           $$PWD/qmljsgrammar.cpp \
-           $$PWD/qmljslexer.cpp \
-           $$PWD/qmljsparser.cpp
+HEADERS += \
+    $$PWD/qmljsast_p.h \
+    $$PWD/qmljsastfwd_p.h \
+    $$PWD/qmljsastvisitor_p.h \
+    $$PWD/qmljsengine_p.h \
+    $$PWD/qmljsgrammar_p.h \
+    $$PWD/qmljslexer_p.h \
+    $$PWD/qmljsmemorypool_p.h \
+    $$PWD/qmljsnodepool_p.h \
+    $$PWD/qmljsparser_p.h \
+    $$PWD/qmljsglobal_p.h
 
+SOURCES += \
+    $$PWD/qmljsast.cpp \
+    $$PWD/qmljsastvisitor.cpp \
+    $$PWD/qmljsengine_p.cpp \
+    $$PWD/qmljsgrammar.cpp \
+    $$PWD/qmljslexer.cpp \
+    $$PWD/qmljsparser.cpp
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 d3ba0e4..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
@@ -118,7 +119,7 @@ _T1 cast(_T2 *ast)
     return 0;
 }
 
-class Node
+class QML_PARSER_EXPORT Node
 {
 public:
     enum Kind {
@@ -242,7 +243,7 @@ public:
     int kind;
 };
 
-class ExpressionNode: public Node
+class QML_PARSER_EXPORT ExpressionNode: public Node
 {
 public:
     ExpressionNode() {}
@@ -254,7 +255,7 @@ public:
     virtual SourceLocation lastSourceLocation() const = 0;
 };
 
-class Statement: public Node
+class QML_PARSER_EXPORT Statement: public Node
 {
 public:
     Statement() {}
@@ -266,7 +267,7 @@ public:
     virtual SourceLocation lastSourceLocation() const = 0;
 };
 
-class UiFormal: public Node
+class QML_PARSER_EXPORT UiFormal: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiFormal)
@@ -291,7 +292,7 @@ public:
     SourceLocation aliasToken;
 };
 
-class UiFormalList: public Node
+class QML_PARSER_EXPORT UiFormalList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiFormalList)
@@ -326,7 +327,7 @@ public:
     UiFormalList *next;
 };
 
-class UiSignature: public Node
+class QML_PARSER_EXPORT UiSignature: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiSignature)
@@ -349,7 +350,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class NestedExpression: public ExpressionNode
+class QML_PARSER_EXPORT NestedExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(NestedExpression)
@@ -372,7 +373,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class ThisExpression: public ExpressionNode
+class QML_PARSER_EXPORT ThisExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(ThisExpression)
@@ -392,7 +393,7 @@ public:
     SourceLocation thisToken;
 };
 
-class IdentifierExpression: public ExpressionNode
+class QML_PARSER_EXPORT IdentifierExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(IdentifierExpression)
@@ -415,7 +416,7 @@ public:
     SourceLocation identifierToken;
 };
 
-class NullExpression: public ExpressionNode
+class QML_PARSER_EXPORT NullExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(NullExpression)
@@ -435,7 +436,7 @@ public:
     SourceLocation nullToken;
 };
 
-class TrueLiteral: public ExpressionNode
+class QML_PARSER_EXPORT TrueLiteral: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(TrueLiteral)
@@ -455,7 +456,7 @@ public:
     SourceLocation trueToken;
 };
 
-class FalseLiteral: public ExpressionNode
+class QML_PARSER_EXPORT FalseLiteral: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(FalseLiteral)
@@ -475,7 +476,7 @@ public:
     SourceLocation falseToken;
 };
 
-class NumericLiteral: public ExpressionNode
+class QML_PARSER_EXPORT NumericLiteral: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(NumericLiteral)
@@ -497,7 +498,7 @@ public:
     SourceLocation literalToken;
 };
 
-class StringLiteral: public ExpressionNode
+class QML_PARSER_EXPORT StringLiteral: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(StringLiteral)
@@ -520,7 +521,7 @@ public:
     SourceLocation literalToken;
 };
 
-class RegExpLiteral: public ExpressionNode
+class QML_PARSER_EXPORT RegExpLiteral: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(RegExpLiteral)
@@ -544,7 +545,7 @@ public:
     SourceLocation literalToken;
 };
 
-class ArrayLiteral: public ExpressionNode
+class QML_PARSER_EXPORT ArrayLiteral: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(ArrayLiteral)
@@ -579,7 +580,7 @@ public:
     SourceLocation rbracketToken;
 };
 
-class ObjectLiteral: public ExpressionNode
+class QML_PARSER_EXPORT ObjectLiteral: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(ObjectLiteral)
@@ -606,7 +607,7 @@ public:
     SourceLocation rbraceToken;
 };
 
-class ElementList: public Node
+class QML_PARSER_EXPORT ElementList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(ElementList)
@@ -641,7 +642,7 @@ public:
     SourceLocation commaToken;
 };
 
-class Elision: public Node
+class QML_PARSER_EXPORT Elision: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(Elision)
@@ -672,7 +673,7 @@ public:
     SourceLocation commaToken;
 };
 
-class PropertyNameAndValueList: public Node
+class QML_PARSER_EXPORT PropertyNameAndValueList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(PropertyNameAndValueList)
@@ -708,7 +709,7 @@ public:
     SourceLocation commaToken;
 };
 
-class PropertyName: public Node
+class QML_PARSER_EXPORT PropertyName: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(PropertyName)
@@ -720,7 +721,7 @@ public:
     SourceLocation propertyNameToken;
 };
 
-class IdentifierPropertyName: public PropertyName
+class QML_PARSER_EXPORT IdentifierPropertyName: public PropertyName
 {
 public:
     QMLJS_DECLARE_AST_NODE(IdentifierPropertyName)
@@ -736,7 +737,7 @@ public:
     NameId *id;
 };
 
-class StringLiteralPropertyName: public PropertyName
+class QML_PARSER_EXPORT StringLiteralPropertyName: public PropertyName
 {
 public:
     QMLJS_DECLARE_AST_NODE(StringLiteralPropertyName)
@@ -751,7 +752,7 @@ public:
     NameId *id;
 };
 
-class NumericLiteralPropertyName: public PropertyName
+class QML_PARSER_EXPORT NumericLiteralPropertyName: public PropertyName
 {
 public:
     QMLJS_DECLARE_AST_NODE(NumericLiteralPropertyName)
@@ -766,7 +767,7 @@ public:
     double id;
 };
 
-class ArrayMemberExpression: public ExpressionNode
+class QML_PARSER_EXPORT ArrayMemberExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(ArrayMemberExpression)
@@ -792,7 +793,7 @@ public:
     SourceLocation rbracketToken;
 };
 
-class FieldMemberExpression: public ExpressionNode
+class QML_PARSER_EXPORT FieldMemberExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(FieldMemberExpression)
@@ -818,7 +819,7 @@ public:
     SourceLocation identifierToken;
 };
 
-class NewMemberExpression: public ExpressionNode
+class QML_PARSER_EXPORT NewMemberExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(NewMemberExpression)
@@ -845,7 +846,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class NewExpression: public ExpressionNode
+class QML_PARSER_EXPORT NewExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(NewExpression)
@@ -868,7 +869,7 @@ public:
     SourceLocation newToken;
 };
 
-class CallExpression: public ExpressionNode
+class QML_PARSER_EXPORT CallExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(CallExpression)
@@ -894,7 +895,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class ArgumentList: public Node
+class QML_PARSER_EXPORT ArgumentList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(ArgumentList)
@@ -928,7 +929,7 @@ public:
     SourceLocation commaToken;
 };
 
-class PostIncrementExpression: public ExpressionNode
+class QML_PARSER_EXPORT PostIncrementExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(PostIncrementExpression)
@@ -951,7 +952,7 @@ public:
     SourceLocation incrementToken;
 };
 
-class PostDecrementExpression: public ExpressionNode
+class QML_PARSER_EXPORT PostDecrementExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(PostDecrementExpression)
@@ -974,7 +975,7 @@ public:
     SourceLocation decrementToken;
 };
 
-class DeleteExpression: public ExpressionNode
+class QML_PARSER_EXPORT DeleteExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(DeleteExpression)
@@ -996,7 +997,7 @@ public:
     SourceLocation deleteToken;
 };
 
-class VoidExpression: public ExpressionNode
+class QML_PARSER_EXPORT VoidExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(VoidExpression)
@@ -1019,7 +1020,7 @@ public:
     SourceLocation voidToken;
 };
 
-class TypeOfExpression: public ExpressionNode
+class QML_PARSER_EXPORT TypeOfExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(TypeOfExpression)
@@ -1042,7 +1043,7 @@ public:
     SourceLocation typeofToken;
 };
 
-class PreIncrementExpression: public ExpressionNode
+class QML_PARSER_EXPORT PreIncrementExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(PreIncrementExpression)
@@ -1065,7 +1066,7 @@ public:
     SourceLocation incrementToken;
 };
 
-class PreDecrementExpression: public ExpressionNode
+class QML_PARSER_EXPORT PreDecrementExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(PreDecrementExpression)
@@ -1088,7 +1089,7 @@ public:
     SourceLocation decrementToken;
 };
 
-class UnaryPlusExpression: public ExpressionNode
+class QML_PARSER_EXPORT UnaryPlusExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(UnaryPlusExpression)
@@ -1111,7 +1112,7 @@ public:
     SourceLocation plusToken;
 };
 
-class UnaryMinusExpression: public ExpressionNode
+class QML_PARSER_EXPORT UnaryMinusExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(UnaryMinusExpression)
@@ -1134,7 +1135,7 @@ public:
     SourceLocation minusToken;
 };
 
-class TildeExpression: public ExpressionNode
+class QML_PARSER_EXPORT TildeExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(TildeExpression)
@@ -1157,7 +1158,7 @@ public:
     SourceLocation tildeToken;
 };
 
-class NotExpression: public ExpressionNode
+class QML_PARSER_EXPORT NotExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(NotExpression)
@@ -1180,7 +1181,7 @@ public:
     SourceLocation notToken;
 };
 
-class BinaryExpression: public ExpressionNode
+class QML_PARSER_EXPORT BinaryExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(BinaryExpression)
@@ -1208,7 +1209,7 @@ public:
     SourceLocation operatorToken;
 };
 
-class ConditionalExpression: public ExpressionNode
+class QML_PARSER_EXPORT ConditionalExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(ConditionalExpression)
@@ -1235,7 +1236,7 @@ public:
     SourceLocation colonToken;
 };
 
-class Expression: public ExpressionNode // ### rename
+class QML_PARSER_EXPORT Expression: public ExpressionNode // ### rename
 {
 public:
     QMLJS_DECLARE_AST_NODE(Expression)
@@ -1259,7 +1260,7 @@ public:
     SourceLocation commaToken;
 };
 
-class Block: public Statement
+class QML_PARSER_EXPORT Block: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(Block)
@@ -1283,7 +1284,7 @@ public:
     SourceLocation rbraceToken;
 };
 
-class StatementList: public Node
+class QML_PARSER_EXPORT StatementList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(StatementList)
@@ -1316,7 +1317,7 @@ public:
     StatementList *next;
 };
 
-class VariableStatement: public Statement
+class QML_PARSER_EXPORT VariableStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(VariableStatement)
@@ -1341,7 +1342,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class VariableDeclaration: public Node
+class QML_PARSER_EXPORT VariableDeclaration: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(VariableDeclaration)
@@ -1361,7 +1362,7 @@ public:
     SourceLocation identifierToken;
 };
 
-class VariableDeclarationList: public Node
+class QML_PARSER_EXPORT VariableDeclarationList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(VariableDeclarationList)
@@ -1400,7 +1401,7 @@ public:
     SourceLocation commaToken;
 };
 
-class EmptyStatement: public Statement
+class QML_PARSER_EXPORT EmptyStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(EmptyStatement)
@@ -1420,7 +1421,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class ExpressionStatement: public Statement
+class QML_PARSER_EXPORT ExpressionStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(ExpressionStatement)
@@ -1443,7 +1444,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class IfStatement: public Statement
+class QML_PARSER_EXPORT IfStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(IfStatement)
@@ -1477,7 +1478,7 @@ public:
     SourceLocation elseToken;
 };
 
-class DoWhileStatement: public Statement
+class QML_PARSER_EXPORT DoWhileStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(DoWhileStatement)
@@ -1506,7 +1507,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class WhileStatement: public Statement
+class QML_PARSER_EXPORT WhileStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(WhileStatement)
@@ -1533,7 +1534,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class ForStatement: public Statement
+class QML_PARSER_EXPORT ForStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(ForStatement)
@@ -1564,7 +1565,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class LocalForStatement: public Statement
+class QML_PARSER_EXPORT LocalForStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(LocalForStatement)
@@ -1596,7 +1597,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class ForEachStatement: public Statement
+class QML_PARSER_EXPORT ForEachStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(ForEachStatement)
@@ -1625,7 +1626,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class LocalForEachStatement: public Statement
+class QML_PARSER_EXPORT LocalForEachStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(LocalForEachStatement)
@@ -1655,7 +1656,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class ContinueStatement: public Statement
+class QML_PARSER_EXPORT ContinueStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(ContinueStatement)
@@ -1680,7 +1681,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class BreakStatement: public Statement
+class QML_PARSER_EXPORT BreakStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(BreakStatement)
@@ -1705,7 +1706,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class ReturnStatement: public Statement
+class QML_PARSER_EXPORT ReturnStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(ReturnStatement)
@@ -1729,7 +1730,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class WithStatement: public Statement
+class QML_PARSER_EXPORT WithStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(WithStatement)
@@ -1756,7 +1757,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class CaseBlock: public Node
+class QML_PARSER_EXPORT CaseBlock: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(CaseBlock)
@@ -1777,7 +1778,7 @@ public:
     SourceLocation rbraceToken;
 };
 
-class SwitchStatement: public Statement
+class QML_PARSER_EXPORT SwitchStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(SwitchStatement)
@@ -1804,7 +1805,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class CaseClauses: public Node
+class QML_PARSER_EXPORT CaseClauses: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(CaseClauses)
@@ -1837,7 +1838,7 @@ public:
     CaseClauses *next;
 };
 
-class CaseClause: public Node
+class QML_PARSER_EXPORT CaseClause: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(CaseClause)
@@ -1857,7 +1858,7 @@ public:
     SourceLocation colonToken;
 };
 
-class DefaultClause: public Node
+class QML_PARSER_EXPORT DefaultClause: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(DefaultClause)
@@ -1876,7 +1877,7 @@ public:
     SourceLocation colonToken;
 };
 
-class LabelledStatement: public Statement
+class QML_PARSER_EXPORT LabelledStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(LabelledStatement)
@@ -1902,7 +1903,7 @@ public:
     SourceLocation colonToken;
 };
 
-class ThrowStatement: public Statement
+class QML_PARSER_EXPORT ThrowStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(ThrowStatement)
@@ -1926,7 +1927,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class Catch: public Node
+class QML_PARSER_EXPORT Catch: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(Catch)
@@ -1948,7 +1949,7 @@ public:
     SourceLocation rparenToken;
 };
 
-class Finally: public Node
+class QML_PARSER_EXPORT Finally: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(Finally)
@@ -1966,7 +1967,7 @@ public:
     SourceLocation finallyToken;
 };
 
-class TryStatement: public Statement
+class QML_PARSER_EXPORT TryStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(TryStatement)
@@ -2007,7 +2008,7 @@ public:
     SourceLocation tryToken;
 };
 
-class FunctionExpression: public ExpressionNode
+class QML_PARSER_EXPORT FunctionExpression: public ExpressionNode
 {
 public:
     QMLJS_DECLARE_AST_NODE(FunctionExpression)
@@ -2038,7 +2039,7 @@ public:
     SourceLocation rbraceToken;
 };
 
-class FunctionDeclaration: public FunctionExpression
+class QML_PARSER_EXPORT FunctionDeclaration: public FunctionExpression
 {
 public:
     QMLJS_DECLARE_AST_NODE(FunctionDeclaration)
@@ -2052,7 +2053,7 @@ public:
     virtual void accept0(Visitor *visitor);
 };
 
-class FormalParameterList: public Node
+class QML_PARSER_EXPORT FormalParameterList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(FormalParameterList)
@@ -2087,7 +2088,7 @@ public:
     SourceLocation identifierToken;
 };
 
-class FunctionBody: public Node
+class QML_PARSER_EXPORT FunctionBody: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(FunctionBody)
@@ -2104,7 +2105,7 @@ public:
     SourceElements *elements;
 };
 
-class Program: public Node
+class QML_PARSER_EXPORT Program: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(Program)
@@ -2121,7 +2122,7 @@ public:
     SourceElements *elements;
 };
 
-class SourceElements: public Node
+class QML_PARSER_EXPORT SourceElements: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(SourceElements)
@@ -2154,7 +2155,7 @@ public:
     SourceElements *next;
 };
 
-class SourceElement: public Node
+class QML_PARSER_EXPORT SourceElement: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(SourceElement)
@@ -2165,7 +2166,7 @@ public:
     virtual ~SourceElement() {}
 };
 
-class FunctionSourceElement: public SourceElement
+class QML_PARSER_EXPORT FunctionSourceElement: public SourceElement
 {
 public:
     QMLJS_DECLARE_AST_NODE(FunctionSourceElement)
@@ -2182,7 +2183,7 @@ public:
     FunctionDeclaration *declaration;
 };
 
-class StatementSourceElement: public SourceElement
+class QML_PARSER_EXPORT StatementSourceElement: public SourceElement
 {
 public:
     QMLJS_DECLARE_AST_NODE(StatementSourceElement)
@@ -2199,7 +2200,7 @@ public:
     Statement *statement;
 };
 
-class DebuggerStatement: public Statement
+class QML_PARSER_EXPORT DebuggerStatement: public Statement
 {
 public:
     QMLJS_DECLARE_AST_NODE(DebuggerStatement)
@@ -2222,7 +2223,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class UiProgram: public Node
+class QML_PARSER_EXPORT UiProgram: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiProgram)
@@ -2238,7 +2239,7 @@ public:
     UiObjectMemberList *members;
 };
 
-class UiQualifiedId: public Node
+class QML_PARSER_EXPORT UiQualifiedId: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiQualifiedId)
@@ -2272,7 +2273,7 @@ public:
     SourceLocation identifierToken;
 };
 
-class UiImport: public Node
+class QML_PARSER_EXPORT UiImport: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiImport)
@@ -2305,7 +2306,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class UiImportList: public Node
+class QML_PARSER_EXPORT UiImportList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiImportList)
@@ -2352,7 +2353,7 @@ public:
     UiImportList *next;
 };
 
-class UiObjectMember: public Node
+class QML_PARSER_EXPORT UiObjectMember: public Node
 {
 public:
     virtual SourceLocation firstSourceLocation() const = 0;
@@ -2361,7 +2362,7 @@ public:
     virtual UiObjectMember *uiObjectMemberCast();
 };
 
-class UiObjectMemberList: public Node
+class QML_PARSER_EXPORT UiObjectMemberList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiObjectMemberList)
@@ -2392,7 +2393,7 @@ public:
     UiObjectMember *member;
 };
 
-class UiArrayMemberList: public Node
+class QML_PARSER_EXPORT UiArrayMemberList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiArrayMemberList)
@@ -2424,7 +2425,7 @@ public:
     SourceLocation commaToken;
 };
 
-class UiObjectInitializer: public Node
+class QML_PARSER_EXPORT UiObjectInitializer: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiObjectInitializer)
@@ -2441,7 +2442,7 @@ public:
     SourceLocation rbraceToken;
 };
 
-class UiParameterList: public Node
+class QML_PARSER_EXPORT UiParameterList: public Node
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiParameterList)
@@ -2477,7 +2478,7 @@ public:
     SourceLocation identifierToken;
 };
 
-class UiPublicMember: public UiObjectMember
+class QML_PARSER_EXPORT UiPublicMember: public UiObjectMember
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiPublicMember)
@@ -2529,7 +2530,7 @@ public:
     SourceLocation semicolonToken;
 };
 
-class UiObjectDefinition: public UiObjectMember
+class QML_PARSER_EXPORT UiObjectDefinition: public UiObjectMember
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiObjectDefinition)
@@ -2552,7 +2553,7 @@ public:
     UiObjectInitializer *initializer;
 };
 
-class UiSourceElement: public UiObjectMember
+class QML_PARSER_EXPORT UiSourceElement: public UiObjectMember
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiSourceElement)
@@ -2588,7 +2589,7 @@ public:
     Node *sourceElement;
 };
 
-class UiObjectBinding: public UiObjectMember
+class QML_PARSER_EXPORT UiObjectBinding: public UiObjectMember
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiObjectBinding)
@@ -2616,7 +2617,7 @@ public:
     SourceLocation colonToken;
 };
 
-class UiScriptBinding: public UiObjectMember
+class QML_PARSER_EXPORT UiScriptBinding: public UiObjectMember
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiScriptBinding)
@@ -2641,7 +2642,7 @@ public:
     SourceLocation colonToken;
 };
 
-class UiArrayBinding: public UiObjectMember
+class QML_PARSER_EXPORT UiArrayBinding: public UiObjectMember
 {
 public:
     QMLJS_DECLARE_AST_NODE(UiArrayBinding)
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 cb76b3a..1b50bcc 100644
--- a/src/declarative/qml/parser/qmljsastvisitor_p.h
+++ b/src/declarative/qml/parser/qmljsastvisitor_p.h
@@ -53,14 +53,14 @@
 // 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
 
 namespace QmlJS { namespace AST {
 
-class Visitor
+class QML_PARSER_EXPORT Visitor
 {
 public:
     Visitor();
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 2fd0421..2c15af3 100644
--- a/src/declarative/qml/parser/qmljsengine_p.h
+++ b/src/declarative/qml/parser/qmljsengine_p.h
@@ -53,16 +53,16 @@
 // 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 {
-class NameId
+class QML_PARSER_EXPORT NameId
 {
     QString _text;
 
@@ -101,7 +101,7 @@ class NodePool;
 
 namespace Ecma {
 
-class RegExp
+class QML_PARSER_EXPORT RegExp
 {
 public:
     enum RegExpFlag {
@@ -117,7 +117,7 @@ public:
 
 } // end of namespace Ecma
 
-class DiagnosticMessage
+class QML_PARSER_EXPORT DiagnosticMessage
 {
 public:
     enum Kind { Warning, Error };
@@ -139,7 +139,7 @@ public:
     QString message;
 };
 
-class Engine
+class QML_PARSER_EXPORT Engine
 {
     Lexer *_lexer;
     NodePool *_nodePool;
diff --git a/src/declarative/qml/parser/qmljsglobal_p.h b/src/declarative/qml/parser/qmljsglobal_p.h
index c91de49..59762ff 100644
--- a/src/declarative/qml/parser/qmljsglobal_p.h
+++ b/src/declarative/qml/parser/qmljsglobal_p.h
@@ -44,11 +44,21 @@
 #include <QtCore/qglobal.h>
 
 #ifdef QT_CREATOR
-#define QT_QML_BEGIN_NAMESPACE
-#define QT_QML_END_NAMESPACE
+#  define QT_QML_BEGIN_NAMESPACE
+#  define QT_QML_END_NAMESPACE
+
+#  ifdef QML_BUILD_LIB
+#    define QML_PARSER_EXPORT Q_DECL_EXPORT
+#  elif QML_BUILD_STATIC_LIB
+#    define QML_PARSER_EXPORT
+#  else
+#    define QML_PARSER_EXPORT Q_DECL_IMPORT
+#  endif // QML_BUILD_LIB
+
 #else // !QT_CREATOR
-#define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
-#define QT_QML_END_NAMESPACE QT_END_NAMESPACE
+#  define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
+#  define QT_QML_END_NAMESPACE QT_END_NAMESPACE
+#  define QML_PARSER_EXPORT
 #endif // QT_CREATOR
 
 #endif // QMLJSGLOBAL_P_H
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 96c8921..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
 
@@ -64,7 +64,7 @@ namespace QmlJS {
 class Engine;
 class NameId;
 
-class Lexer
+class QML_PARSER_EXPORT Lexer
 {
 public:
     Lexer(Engine *eng, bool tokenizeComments = false);
diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h
index ca60ef1..3da2678 100644
--- a/src/declarative/qml/parser/qmljsmemorypool_p.h
+++ b/src/declarative/qml/parser/qmljsmemorypool_p.h
@@ -53,17 +53,18 @@
 // 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
 
 namespace QmlJS {
 
-class MemoryPool : public QSharedData
+class QML_PARSER_EXPORT MemoryPool : public QSharedData
 {
 public:
     enum { maxBlockCount = -1 };
diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h
index 573a947..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 {
@@ -106,7 +106,7 @@ inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg
     return node;
 }
 
-class NodePool : public MemoryPool
+class QML_PARSER_EXPORT NodePool : public MemoryPool
 {
 public:
     NodePool(const QString &fileName, Engine *engine);
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 aab6c7e..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>
@@ -75,7 +75,7 @@ namespace QmlJS {
 class Engine;
 class NameId;
 
-class Parser: protected QmlJSGrammar
+class QML_PARSER_EXPORT Parser: protected QmlJSGrammar
 {
 public:
     union Value {
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/qml.pri b/src/declarative/qml/qml.pri
index 2167ab3..1155a36 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -1,118 +1,122 @@
-SOURCES += qml/qmlparser.cpp \
-    qml/qmlinstruction.cpp \
-    qml/qmlvmemetaobject.cpp \
-    qml/qmlengine.cpp \
-    qml/qmlexpression.cpp \
-    qml/qmlbinding.cpp \
-    qml/qmlmetaproperty.cpp \
-    qml/qmlcomponent.cpp \
-    qml/qmlcontext.cpp \
-    qml/qmlcustomparser.cpp \
-    qml/qmlpropertyvaluesource.cpp \
-    qml/qmlpropertyvalueinterceptor.cpp \
-    qml/qmlproxymetaobject.cpp \
-    qml/qmlvme.cpp \
-    qml/qmlcompiler.cpp \
-    qml/qmlcompileddata.cpp \
-    qml/qmlboundsignal.cpp \
-    qml/qmldom.cpp \
-    qml/qmlrefcount.cpp \
-    qml/qmlprivate.cpp \
-    qml/qmlmetatype.cpp \
-    qml/qmlstringconverters.cpp \
-    qml/qmlclassfactory.cpp \
-    qml/qmlparserstatus.cpp \
-    qml/qmlcompositetypemanager.cpp \
-    qml/qmlinfo.cpp \
-    qml/qmlerror.cpp \
-    qml/qmlscriptparser.cpp \
-    qml/qmlenginedebug.cpp \
-    qml/qmlrewrite.cpp \
-    qml/qmlbasicscript.cpp \
-    qml/qmlvaluetype.cpp \
-    qml/qmlbindingoptimizations.cpp \
-    qml/qmlxmlhttprequest.cpp \
-    qml/qmlsqldatabase.cpp \
-    qml/qmetaobjectbuilder.cpp \
-    qml/qmlwatcher.cpp \
-    qml/qmlscript.cpp \
-    qml/qmlcleanup.cpp \
-    qml/qmlpropertycache.cpp \
-    qml/qmlintegercache.cpp \
-    qml/qmltypenamecache.cpp \
-    qml/qmlscriptstring.cpp \
-    qml/qmlobjectscriptclass.cpp \
-    qml/qmlcontextscriptclass.cpp \
-    qml/qmlglobalscriptclass.cpp \
-    qml/qmlvaluetypescriptclass.cpp \
-    qml/qmltypenamescriptclass.cpp \
-    qml/qmllistscriptclass.cpp \
-    qml/qmlworkerscript.cpp 
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+    $$PWD/qmlparser.cpp \
+    $$PWD/qmlinstruction.cpp \
+    $$PWD/qmlvmemetaobject.cpp \
+    $$PWD/qmlengine.cpp \
+    $$PWD/qmlexpression.cpp \
+    $$PWD/qmlbinding.cpp \
+    $$PWD/qmlmetaproperty.cpp \
+    $$PWD/qmlcomponent.cpp \
+    $$PWD/qmlcontext.cpp \
+    $$PWD/qmlcustomparser.cpp \
+    $$PWD/qmlpropertyvaluesource.cpp \
+    $$PWD/qmlpropertyvalueinterceptor.cpp \
+    $$PWD/qmlproxymetaobject.cpp \
+    $$PWD/qmlvme.cpp \
+    $$PWD/qmlcompiler.cpp \
+    $$PWD/qmlcompileddata.cpp \
+    $$PWD/qmlboundsignal.cpp \
+    $$PWD/qmldom.cpp \
+    $$PWD/qmlrefcount.cpp \
+    $$PWD/qmlprivate.cpp \
+    $$PWD/qmlmetatype.cpp \
+    $$PWD/qmlstringconverters.cpp \
+    $$PWD/qmlclassfactory.cpp \
+    $$PWD/qmlparserstatus.cpp \
+    $$PWD/qmlcompositetypemanager.cpp \
+    $$PWD/qmlinfo.cpp \
+    $$PWD/qmlerror.cpp \
+    $$PWD/qmlscriptparser.cpp \
+    $$PWD/qmlenginedebug.cpp \
+    $$PWD/qmlrewrite.cpp \
+    $$PWD/qmlbasicscript.cpp \
+    $$PWD/qmlvaluetype.cpp \
+    $$PWD/qmlbindingoptimizations.cpp \
+    $$PWD/qmlxmlhttprequest.cpp \
+    $$PWD/qmlsqldatabase.cpp \
+    $$PWD/qmetaobjectbuilder.cpp \
+    $$PWD/qmlwatcher.cpp \
+    $$PWD/qmlscript.cpp \
+    $$PWD/qmlcleanup.cpp \
+    $$PWD/qmlpropertycache.cpp \
+    $$PWD/qmlintegercache.cpp \
+    $$PWD/qmltypenamecache.cpp \
+    $$PWD/qmlscriptstring.cpp \
+    $$PWD/qmlobjectscriptclass.cpp \
+    $$PWD/qmlcontextscriptclass.cpp \
+    $$PWD/qmlglobalscriptclass.cpp \
+    $$PWD/qmlvaluetypescriptclass.cpp \
+    $$PWD/qmltypenamescriptclass.cpp \
+    $$PWD/qmllistscriptclass.cpp \
+    $$PWD/qmlworkerscript.cpp
+
+HEADERS += \
+    $$PWD/qmlparser_p.h \
+    $$PWD/qmlglobal_p.h \
+    $$PWD/qmlinstruction_p.h \
+    $$PWD/qmlvmemetaobject_p.h \
+    $$PWD/qml.h \
+    $$PWD/qmlbinding.h \
+    $$PWD/qmlbinding_p.h \
+    $$PWD/qmlmetaproperty.h \
+    $$PWD/qmlcomponent.h \
+    $$PWD/qmlcomponent_p.h \
+    $$PWD/qmlcustomparser_p.h \
+    $$PWD/qmlcustomparser_p_p.h \
+    $$PWD/qmlpropertyvaluesource.h \
+    $$PWD/qmlpropertyvalueinterceptor.h \
+    $$PWD/qmlboundsignal_p.h \
+    $$PWD/qmlparserstatus.h \
+    $$PWD/qmlproxymetaobject_p.h \
+    $$PWD/qmlvme_p.h \
+    $$PWD/qmlcompiler_p.h \
+    $$PWD/qmlengine_p.h \
+    $$PWD/qmlexpression_p.h \
+    $$PWD/qmlprivate.h \
+    $$PWD/qmldom.h \
+    $$PWD/qmldom_p.h \
+    $$PWD/qmlrefcount_p.h \
+    $$PWD/qmlmetatype.h \
+    $$PWD/qmlengine.h \
+    $$PWD/qmlcontext.h \
+    $$PWD/qmlexpression.h \
+    $$PWD/qmlstringconverters_p.h \
+    $$PWD/qmlclassfactory_p.h \
+    $$PWD/qmlinfo.h \
+    $$PWD/qmlmetaproperty_p.h \
+    $$PWD/qmlcontext_p.h \
+    $$PWD/qmlcompositetypedata_p.h \
+    $$PWD/qmlcompositetypemanager_p.h \
+    $$PWD/qmllist.h \
+    $$PWD/qmldeclarativedata_p.h \
+    $$PWD/qmlerror.h \
+    $$PWD/qmlscriptparser_p.h \
+    $$PWD/qmlbasicscript_p.h \
+    $$PWD/qmlenginedebug_p.h \
+    $$PWD/qmlrewrite_p.h \
+    $$PWD/qpodvector_p.h \
+    $$PWD/qbitfield_p.h \
+    $$PWD/qmlvaluetype_p.h \
+    $$PWD/qmlbindingoptimizations_p.h \
+    $$PWD/qmlxmlhttprequest_p.h \
+    $$PWD/qmlsqldatabase_p.h \
+    $$PWD/qmetaobjectbuilder_p.h \
+    $$PWD/qmlwatcher_p.h \
+    $$PWD/qmlcleanup_p.h \
+    $$PWD/qmlpropertycache_p.h \
+    $$PWD/qmlintegercache_p.h \
+    $$PWD/qmltypenamecache_p.h \
+    $$PWD/qmlscriptstring.h \
+    $$PWD/qmlobjectscriptclass_p.h \
+    $$PWD/qmlcontextscriptclass_p.h \
+    $$PWD/qmlglobalscriptclass_p.h \
+    $$PWD/qmlvaluetypescriptclass_p.h \
+    $$PWD/qmltypenamescriptclass_p.h \
+    $$PWD/qmllistscriptclass_p.h \
+    $$PWD/qmlworkerscript_p.h
 
-HEADERS += qml/qmlparser_p.h \
-    qml/qmlglobal_p.h \
-    qml/qmlinstruction_p.h \
-    qml/qmlvmemetaobject_p.h \
-    qml/qml.h \
-    qml/qmlbinding.h \
-    qml/qmlbinding_p.h \
-    qml/qmlmetaproperty.h \
-    qml/qmlcomponent.h \
-    qml/qmlcomponent_p.h \
-    qml/qmlcustomparser_p.h \
-    qml/qmlcustomparser_p_p.h \
-    qml/qmlpropertyvaluesource.h \
-    qml/qmlpropertyvalueinterceptor.h \
-    qml/qmlboundsignal_p.h \
-    qml/qmlparserstatus.h \
-    qml/qmlproxymetaobject_p.h \
-    qml/qmlvme_p.h \
-    qml/qmlcompiler_p.h \
-    qml/qmlengine_p.h \
-    qml/qmlexpression_p.h \
-    qml/qmlprivate.h \
-    qml/qmldom.h \
-    qml/qmldom_p.h \
-    qml/qmlrefcount_p.h \
-    qml/qmlmetatype.h \
-    qml/qmlengine.h \
-    qml/qmlcontext.h \
-    qml/qmlexpression.h \
-    qml/qmlstringconverters_p.h \
-    qml/qmlclassfactory_p.h \
-    qml/qmlinfo.h \
-    qml/qmlmetaproperty_p.h \
-    qml/qmlcontext_p.h \
-    qml/qmlcompositetypedata_p.h \
-    qml/qmlcompositetypemanager_p.h \
-    qml/qmllist.h \
-    qml/qmldeclarativedata_p.h \
-    qml/qmlerror.h \
-    qml/qmlscriptparser_p.h \
-    qml/qmlbasicscript_p.h \
-    qml/qmlenginedebug_p.h \
-    qml/qmlrewrite_p.h \
-    qml/qpodvector_p.h \
-    qml/qbitfield_p.h \
-    qml/qmlvaluetype_p.h \
-    qml/qmlbindingoptimizations_p.h \
-    qml/qmlxmlhttprequest_p.h \
-    qml/qmlsqldatabase_p.h \
-    qml/qmetaobjectbuilder_p.h \
-    qml/qmlwatcher_p.h \
-    qml/qmlcleanup_p.h \
-    qml/qmlpropertycache_p.h \
-    qml/qmlintegercache_p.h \
-    qml/qmltypenamecache_p.h \
-    qml/qmlscriptstring.h \
-    qml/qmlobjectscriptclass_p.h \
-    qml/qmlcontextscriptclass_p.h \
-    qml/qmlglobalscriptclass_p.h \
-    qml/qmlvaluetypescriptclass_p.h \
-    qml/qmltypenamescriptclass_p.h \
-    qml/qmllistscriptclass_p.h \
-    qml/qmlworkerscript_p.h
- 
 QT += sql
 
 include(parser/parser.pri)
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 f0bfd98..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 *>);
 
@@ -111,7 +114,7 @@ QmlBindingPrivate::QmlBindingPrivate()
 {
 }
 
-QmlBinding::QmlBinding(void *data, QmlRefCount *rc, QObject *obj, QmlContext *ctxt, const QUrl &url, int lineNumber, QObject *parent)
+QmlBinding::QmlBinding(void *data, QmlRefCount *rc, QObject *obj, QmlContext *ctxt, const QString &url, int lineNumber, QObject *parent)
 : QmlExpression(ctxt, data, rc, obj, url, lineNumber, *new QmlBindingPrivate)
 {
     setParent(parent);
@@ -177,7 +180,7 @@ void QmlBinding::update(QmlMetaProperty::WriteFlags flags)
 
             if (isUndefined && !data->error.isValid()) {
 
-                QUrl url = data->url;
+                QUrl url = QUrl(data->url);
                 int line = data->line;
                 if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
 
@@ -189,7 +192,7 @@ void QmlBinding::update(QmlMetaProperty::WriteFlags flags)
             } else if (!isUndefined && data->property.object() && 
                 !data->property.write(value, flags)) {
 
-                QUrl url = data->url;
+                QUrl url = QUrl(data->url);
                 int line = data->line;
                 if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
 
diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h
index 8fbe441..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
@@ -92,7 +93,7 @@ class Q_DECLARATIVE_EXPORT QmlBinding : public QmlExpression,
 Q_OBJECT
 public:
     QmlBinding(const QString &, QObject *, QmlContext *, QObject *parent=0);
-    QmlBinding(void *, QmlRefCount *, QObject *, QmlContext *, const QUrl &, int, 
+    QmlBinding(void *, QmlRefCount *, QObject *, QmlContext *, const QString &, int, 
                QObject *parent);
     ~QmlBinding();
 
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 298719f..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
 
@@ -79,7 +80,7 @@ public:
     QmlCompiledData();
     virtual ~QmlCompiledData();
 
-    QByteArray name;
+    QString name;
     QUrl url;
     QmlEnginePrivate::Imports imports;
     QmlTypeNameCache *importCache;
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 fa68951..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
 
@@ -119,7 +121,7 @@ QmlCompositeTypeData::toCompiledComponent(QmlEngine *engine)
 
         compiledComponent = new QmlCompiledData;
         compiledComponent->url = imports.baseUrl();
-        compiledComponent->name = compiledComponent->url.toString().toUtf8(); 
+        compiledComponent->name = compiledComponent->url.toString();
 
         QmlCompiler compiler;
         if (!compiler.compile(engine, this, compiledComponent)) {
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 38cbcfa..c3971ae 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -39,23 +39,27 @@
 **
 ****************************************************************************/
 
-#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
 
 QmlContextPrivate::QmlContextPrivate()
 : parent(0), engine(0), isInternal(false), propertyNames(0), notifyIndex(-1), 
-  highPriorityCount(0), imports(0), expressions(0), idValues(0), idValueCount(0)
+  highPriorityCount(0), imports(0), expressions(0), contextObjects(0),
+  idValues(0), idValueCount(0)
 {
 }
 
@@ -283,14 +287,14 @@ QmlContext::~QmlContext()
         expression = nextExpression;
     }
 
-    for (int ii = 0; ii < d->contextObjects.count(); ++ii) {
-        QObjectPrivate *p = QObjectPrivate::get(d->contextObjects.at(ii));
-        QmlDeclarativeData *data = 
-            static_cast<QmlDeclarativeData *>(p->declarativeData);
-        if(data) 
-            data->context = 0;
+    while (d->contextObjects) {
+        QmlDeclarativeData *co = d->contextObjects;
+        d->contextObjects = d->contextObjects->nextContextObject;
+
+        co->context = 0;
+        co->nextContextObject = 0;
+        co->prevContextObject = 0;
     }
-    d->contextObjects.clear();
 
     delete [] d->idValues;
 
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index c8d0b2d..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
 
@@ -106,7 +109,7 @@ public:
 
     QmlAbstractExpression *expressions;
 
-    QObjectList contextObjects;
+    QmlDeclarativeData *contextObjects;
 
     struct ContextGuard : public QGuard<QObject>
     {
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 aa82f32..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;
@@ -72,6 +73,10 @@ public:
     QmlContext *context;
     QmlAbstractBinding *bindings;
 
+    // Linked list for QmlContext::contextObjects
+    QmlDeclarativeData *nextContextObject;
+    QmlDeclarativeData**prevContextObject;
+
     int bindingBitsSize;
     quint32 *bindingBits; 
     bool hasBindingBit(int) const;
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 06743cc..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
 
@@ -440,7 +444,8 @@ void QmlEngine::setContextForObject(QObject *object, QmlContext *context)
     }
 
     data->context = context;
-    context->d_func()->contextObjects.append(object);
+    data->nextContextObject = context->d_func()->contextObjects;
+    data->prevContextObject = &context->d_func()->contextObjects;
 }
 
 void qmlExecuteDeferred(QObject *object)
@@ -493,9 +498,10 @@ QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool cre
 }
 
 QmlDeclarativeData::QmlDeclarativeData(QmlContext *ctxt)
-: context(ctxt), bindings(0), bindingBitsSize(0), bindingBits(0), 
-  outerContext(0), lineNumber(0), columnNumber(0), deferredComponent(0), 
-  deferredIdx(0), attachedProperties(0), propertyCache(0)
+: context(ctxt), bindings(0), nextContextObject(0), prevContextObject(0),
+  bindingBitsSize(0), bindingBits(0), outerContext(0), lineNumber(0), 
+  columnNumber(0), deferredComponent(0), deferredIdx(0), attachedProperties(0), 
+  propertyCache(0)
 {
 }
 
@@ -505,8 +511,11 @@ void QmlDeclarativeData::destroyed(QObject *object)
         deferredComponent->release();
     if (attachedProperties)
         delete attachedProperties;
-    if (context)
-        static_cast<QmlContextPrivate *>(QObjectPrivate::get(context))->contextObjects.removeAll(object);
+
+    if (nextContextObject) 
+        nextContextObject->prevContextObject = prevContextObject;
+    if (prevContextObject)
+        *prevContextObject = nextContextObject;
 
     QmlAbstractBinding *binding = bindings;
     while (binding) {
@@ -1210,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 d7a6496..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 *>);
@@ -91,7 +94,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, const QString &expr,
 }
 
 void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, 
-                                QObject *me, const QUrl &url, int lineNumber)
+                                QObject *me, const QString &url, int lineNumber)
 {
     data->url = url;
     data->line = lineNumber;
@@ -120,7 +123,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc,
             if (!dd->cachedClosures.at(progIdx)) {
                 QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
                 scriptContext->pushScope(ep->contextClass->newSharedContext());
-                dd->cachedClosures[progIdx] = new QScriptValue(scriptEngine->evaluate(data->expression, data->url.toString(), data->line));
+                dd->cachedClosures[progIdx] = new QScriptValue(scriptEngine->evaluate(data->expression, data->url, data->line));
                 scriptEngine->popContext();
             }
 
@@ -133,7 +136,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc,
 #if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work?
             if (!dd->cachedPrograms.at(progIdx)) {
                 dd->cachedPrograms[progIdx] =
-                    new QScriptProgram(data->expression, data->url.toString(), data->line);
+                    new QScriptProgram(data->expression, data->url, data->line);
             }
 #endif
 
@@ -174,7 +177,7 @@ QmlExpression::QmlExpression()
 /*!  \internal */
 QmlExpression::QmlExpression(QmlContext *ctxt, void *expr,
                              QmlRefCount *rc, QObject *me, 
-                             const QUrl &url, int lineNumber,
+                             const QString &url, int lineNumber,
                              QmlExpressionPrivate &dd)
 : QObject(dd, 0)
 {
@@ -331,7 +334,7 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUnd
 
         if (data->expressionRewritten) {
             data->expressionFunction = scriptEngine->evaluate(data->expression, 
-                                                              data->url.toString(), data->line);
+                                                              data->url, data->line);
         } else {
             QmlRewrite::RewriteBinding rewriteBinding;
 
@@ -341,7 +344,7 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUnd
                 scriptEngine->popContext();
                 return QVariant();
             }
-            data->expressionFunction = scriptEngine->evaluate(code, data->url.toString(), data->line);
+            data->expressionFunction = scriptEngine->evaluate(code, data->url, data->line);
         }
 
         scriptEngine->popContext();
@@ -521,7 +524,7 @@ void QmlExpression::setTrackChange(bool trackChange)
     Returns the source file URL for this expression.  The source location must
     have been previously set by calling setSourceLocation().
 */
-QUrl QmlExpression::sourceFile() const
+QString QmlExpression::sourceFile() const
 {
     Q_D(const QmlExpression);
     return d->data->url;
@@ -541,7 +544,7 @@ int QmlExpression::lineNumber() const
     Set the location of this expression to \a line of \a url. This information
     is used by the script engine.
 */
-void QmlExpression::setSourceLocation(const QUrl &url, int line)
+void QmlExpression::setSourceLocation(const QString &url, int line)
 {
     Q_D(QmlExpression);
     d->data->url = url;
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index cbea58a..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
 
@@ -77,9 +78,9 @@ public:
     bool trackChange() const;
     void setTrackChange(bool);
 
-    QUrl sourceFile() const;
+    QString sourceFile() const;
     int lineNumber() const;
-    void setSourceLocation(const QUrl &fileName, int line);
+    void setSourceLocation(const QString &fileName, int line);
 
     QObject *scopeObject() const;
 
@@ -96,7 +97,7 @@ Q_SIGNALS:
 protected:
     QmlExpression(QmlContext *, const QString &, QObject *, 
                   QmlExpressionPrivate &dd);
-    QmlExpression(QmlContext *, void *, QmlRefCount *rc, QObject *me, const QUrl &,
+    QmlExpression(QmlContext *, void *, QmlRefCount *rc, QObject *me, const QString &,
                   int, QmlExpressionPrivate &dd);
 
 private Q_SLOTS:
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index 98ef856..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
@@ -103,7 +106,7 @@ public:
 
     bool isShared;
 
-    QUrl url;
+    QString url; // This is a QString for a reason.  QUrls are slooooooow...
     int line;
 
     struct SignalGuard : public QGuard<QObject> {
@@ -143,7 +146,7 @@ public:
     };
 
     void init(QmlContext *, const QString &, QObject *);
-    void init(QmlContext *, void *, QmlRefCount *, QObject *, const QUrl &, int);
+    void init(QmlContext *, void *, QmlRefCount *, QObject *, const QString &, int);
 
     QmlExpressionData *data;
 
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 89ca1be..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
 
@@ -544,7 +547,7 @@ QObject *QmlVME::run(QmlVMEStack<QObject *> &stack, QmlContext *ctxt,
                 QmlBoundSignal *bs = new QmlBoundSignal(target, signal, target);
                 QmlExpression *expr = 
                     new QmlExpression(ctxt, primitives.at(instr.storeSignal.value), target);
-                expr->setSourceLocation(comp->url, instr.line);
+                expr->setSourceLocation(comp->name, instr.line);
                 bs->setExpression(expr);
             }
             break;
@@ -597,7 +600,7 @@ QObject *QmlVME::run(QmlVMEStack<QObject *> &stack, QmlContext *ctxt,
                 if (stack.count() == 1 && bindingSkipList.testBit(coreIndex))  
                     break;
 
-                QmlBinding *bind = new QmlBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, comp->url, instr.line, 0);
+                QmlBinding *bind = new QmlBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, comp->name, instr.line, 0);
                 bindValues.append(bind);
                 bind->m_mePtr = &bindValues.values[bindValues.count - 1];
                 bind->setTarget(mp);
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.pri b/src/declarative/qml/rewriter/rewriter.pri
index 550741b..2c29061 100644
--- a/src/declarative/qml/rewriter/rewriter.pri
+++ b/src/declarative/qml/rewriter/rewriter.pri
@@ -1,6 +1,4 @@
-
 INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
 
 HEADERS += $$PWD/textwriter_p.h
 SOURCES += $$PWD/textwriter.cpp
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