14 files changed, 4 insertions, 7 deletions
diff --git a/src/qml/qml/v8/script.pri b/src/qml/jsapi/jsapi.pri
index f70588ec7b..f70588ec7b 100644
--- a/src/qml/qml/v8/script.pri
+++ b/src/qml/jsapi/jsapi.pri
diff --git a/src/qml/qml/v8/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 554487cf13..d3c2c75ca7 100644
--- a/src/qml/qml/v8/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -43,7 +43,7 @@
 #include "qjsengine_p.h"
 #include "qjsvalue.h"
 #include "qjsvalue_p.h"
-#include "qv8engine_p.h"
+#include "private/qv8engine_p.h"
 
 #include "private/qv4engine_p.h"
 #include "private/qv4mm_p.h"
diff --git a/src/qml/qml/v8/qjsengine.h b/src/qml/jsapi/qjsengine.h
index 0a575f84e9..0a575f84e9 100644
--- a/src/qml/qml/v8/qjsengine.h
+++ b/src/qml/jsapi/qjsengine.h
diff --git a/src/qml/qml/v8/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h
index c12e647997..c12e647997 100644
--- a/src/qml/qml/v8/qjsengine_p.h
+++ b/src/qml/jsapi/qjsengine_p.h
diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 569dd964fd..ec8cc2a1b3 100644
--- a/src/qml/qml/v8/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -52,7 +52,7 @@
 #include "qv4runtime_p.h"
 #include "qv4variantobject_p.h"
 #include "qv4regexpobject_p.h"
-#include "qv8engine_p.h"
+#include "private/qv8engine_p.h"
 #include <private/qv4mm_p.h>
 #include <private/qv4exception_p.h>
 
diff --git a/src/qml/qml/v8/qjsvalue.h b/src/qml/jsapi/qjsvalue.h
index cf02ad819e..cf02ad819e 100644
--- a/src/qml/qml/v8/qjsvalue.h
+++ b/src/qml/jsapi/qjsvalue.h
diff --git a/src/qml/qml/v8/qjsvalue_p.h b/src/qml/jsapi/qjsvalue_p.h
index ef94dea555..ef94dea555 100644
--- a/src/qml/qml/v8/qjsvalue_p.h
+++ b/src/qml/jsapi/qjsvalue_p.h
diff --git a/src/qml/qml/v8/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp
index aa1ecd6e54..aa1ecd6e54 100644
--- a/src/qml/qml/v8/qjsvalueiterator.cpp
+++ b/src/qml/jsapi/qjsvalueiterator.cpp
diff --git a/src/qml/qml/v8/qjsvalueiterator.h b/src/qml/jsapi/qjsvalueiterator.h
index e204558e90..e204558e90 100644
--- a/src/qml/qml/v8/qjsvalueiterator.h
+++ b/src/qml/jsapi/qjsvalueiterator.h
diff --git a/src/qml/qml/v8/qjsvalueiterator_p.h b/src/qml/jsapi/qjsvalueiterator_p.h
index 7687f896a1..7687f896a1 100644
--- a/src/qml/qml/v8/qjsvalueiterator_p.h
+++ b/src/qml/jsapi/qjsvalueiterator_p.h
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index c046c6105a..fe294aa323 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -22,6 +22,7 @@ HEADERS += qtqmlglobal.h \
 #modules
 include(util/util.pri)
 include(compiler/compiler.pri)
+include(jsapi/jsapi.pri)
 include(jsruntime/jsruntime.pri)
 include(qml/qml.pri)
 include(debugger/debugger.pri)
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 804a6e3e50..75ed18ce15 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -42,7 +42,7 @@
 #include "qv8engine_p.h"
 
 #include "qv4sequenceobject_p.h"
-#include "qjsengine_p.h"
+#include "private/qjsengine_p.h"
 
 #include <private/qqmlbuiltinfunctions_p.h>
 #include <private/qqmllist_p.h>
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 4c2cccd28d..9c486d9809 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -63,8 +63,6 @@
 #include <QtCore/QThreadStorage>
 
 #include <qjsengine.h>
-#include <qjsvalue.h>
-#include "qjsvalueiterator_p.h"
 #include "private/qintrusivelist_p.h"
 
 #include <private/qqmlpropertycache_p.h>
diff --git a/src/qml/qml/v8/v8.pri b/src/qml/qml/v8/v8.pri
index d3edc591a7..2480848514 100644
--- a/src/qml/qml/v8/v8.pri
+++ b/src/qml/qml/v8/v8.pri
@@ -1,5 +1,3 @@
-include(script.pri)
-
 HEADERS += \
     $$PWD/qv8debug_p.h \
     $$PWD/qv8profiler_p.h \