5 files changed, 15 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index 8392dd836d..41a5eacc4d 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -45,6 +45,7 @@ struct CompilationUnit;
 struct Function;
 }
 
+struct Identifier;
 struct CallContext;
 struct CatchContext;
 struct WithContext;
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index bcb74ab694..cf6efdeda2 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -37,6 +37,7 @@
 #include "private/qv4isel_p.h"
 #include "qv4managed_p.h"
 #include "qv4context_p.h"
+#include "qv4internalclass_p.h"
 #include <private/qintrusivelist_p.h>
 
 namespace WTF {
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index 0fe5c7ee49..ac7d06ab2f 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -35,7 +35,7 @@
 
 #include "qv4global_p.h"
 #include "qv4value_p.h"
-#include "qv4internalclass_p.h"
+#include <private/qv4heap_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/jsruntime/qv4value_inl_p.h b/src/qml/jsruntime/qv4value_inl_p.h
index 3a4c5c4822..bf1fbdd229 100644
--- a/src/qml/jsruntime/qv4value_inl_p.h
+++ b/src/qml/jsruntime/qv4value_inl_p.h
@@ -36,7 +36,7 @@
 #include <cmath> // this HAS to come
 
 #include "qv4value_p.h"
-
+#include <private/qv4heap_p.h>
 #include "qv4string_p.h"
 #include "qv4managed_p.h"
 #include "qv4engine_p.h"
@@ -178,6 +178,13 @@ inline bool Value::toBoolean() const
     }
 }
 
+inline
+ReturnedValue Heap::Base::asReturnedValue() const
+{
+    return Value::fromHeapObject(const_cast<Heap::Base *>(this)).asReturnedValue();
+}
+
+
 #ifndef V4_BOOTSTRAP
 inline uint Value::asArrayIndex() const
 {
@@ -269,8 +276,6 @@ inline ErrorObject *Value::asErrorObject() const
 template<typename T>
 inline T *Value::as() const { Managed *m = isObject() ? managed() : 0; return m ? m->as<T>() : 0; }
 
-#ifndef V4_BOOTSTRAP
-
 template<>
 inline String *value_cast(const Value &v) {
     return v.asString();
@@ -284,8 +289,6 @@ inline ReturnedValue value_convert<String>(ExecutionEngine *e, const Value &v)
 
 #endif
 
-#endif
-
 } // namespace QV4
 
 QT_END_NAMESPACE
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 8ed6c1459c..194b0ececc 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -37,12 +37,15 @@
 
 #include <QtCore/QString>
 #include "qv4global_p.h"
-#include <private/qv4heap_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace QV4 {
 
+namespace Heap {
+    struct Base;
+}
+
 typedef uint Bool;
 
 struct Q_QML_PRIVATE_EXPORT Value
@@ -472,13 +475,6 @@ private:
     Encode(void *);
 };
 
-inline
-ReturnedValue Heap::Base::asReturnedValue() const
-{
-    return Value::fromHeapObject(const_cast<Heap::Base *>(this)).asReturnedValue();
-}
-
-
 template<typename T>
 T *value_cast(const Value &v)
 {