14 files changed, 11 insertions, 10 deletions
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index 43351b3..f6a6371 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -46,7 +46,6 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qmetaobject.h>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qmlmetatype.h>
 #include <QtDeclarative/qmlmetaproperty.h>
 #include <QtDeclarative/qmlparserstatus.h>
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 4c02f95..ee13437 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -49,6 +49,7 @@ SOURCES += qml/qmlparser.cpp \
     qml/qmllistscriptclass.cpp
 
 HEADERS += qml/qmlparser_p.h \
+    qml/qmlglobal_p.h \
     qml/qmlinstruction_p.h \
     qml/qmlvmemetaobject_p.h \
     qml/qml.h \
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index 28e328b..b3bcf42 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -49,6 +49,7 @@
 #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/qmlbinding.h b/src/declarative/qml/qmlbinding.h
index 7af276b..8814e77 100644
--- a/src/declarative/qml/qmlbinding.h
+++ b/src/declarative/qml/qmlbinding.h
@@ -43,7 +43,6 @@
 #define QMLBINDING_H
 
 #include <QtCore/QObject>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlpropertyvaluesource.h>
 #include <QtDeclarative/qmlexpression.h>
diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp
index bbce366..def11c3 100644
--- a/src/declarative/qml/qmlboundsignal.cpp
+++ b/src/declarative/qml/qmlboundsignal.cpp
@@ -44,11 +44,11 @@
 #include "private/qmlengine_p.h"
 #include "private/qmlexpression_p.h"
 #include "private/qmlcontext_p.h"
-#include <qfxglobal.h>
 #include <qmlmetatype.h>
 #include <qml.h>
 #include <qmlcontext.h>
-#include <QDebug>
+#include <QtCore/qdebug.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 473009d..b93a9b3 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -70,6 +70,7 @@
 #include "qmlmetaproperty_p.h"
 #include "qmlrewrite_p.h"
 #include <QtDeclarative/qmlscriptstring.h>
+#include <private/qmlglobal_p.h>
 
 #include "qmlscriptparser_p.h"
 
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 116fd4b..03f07b3 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -56,6 +56,7 @@
 #include <QtCore/qdebug.h>
 #include <QApplication>
 #include <private/qmlbinding_p.h>
+#include <private/qmlglobal_p.h>
 
 #include "qmlscriptparser_p.h"
 
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index bd72f20..bfb4d53 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -45,7 +45,6 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtScript/qscriptvalue.h>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlerror.h>
 
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index a3697a7..89d3be2 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -55,7 +55,6 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qxmlstream.h>
-#include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qmlmetatype.h>
 #include <QtDeclarative/qmlerror.h>
 #include <private/qmlparser_p.h>
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 46a7a5a..b6e794b 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -48,6 +48,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 #include "qmlscriptparser_p.h"
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 0f8b98a..07296d9 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -87,6 +87,7 @@
 #include <private/qmltypenamescriptclass_p.h>
 #include <private/qmllistscriptclass_p.h>
 #include <QtDeclarative/qmlscriptstring.h>
+#include <private/qmlglobal_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
 #include "qt_windows.h"
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
index f8954d5..15e4fdf 100644
--- a/src/declarative/qml/qmlinstruction_p.h
+++ b/src/declarative/qml/qmlinstruction_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qfxglobal.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h
index ba44ce18..ce4ac1e 100644
--- a/src/declarative/qml/qmlmetaproperty.h
+++ b/src/declarative/qml/qmlmetaproperty.h
@@ -42,8 +42,7 @@
 #ifndef QMLMETAPROPERTY_H
 #define QMLMETAPROPERTY_H
 
-#include <QtDeclarative/qfxglobal.h>
-#include <QtCore/QMetaProperty>
+#include <QtCore/qmetaobject.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp
index 1f011c2..b86f2f2 100644
--- a/src/declarative/qml/qmlrewrite.cpp
+++ b/src/declarative/qml/qmlrewrite.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qmlrewrite_p.h"
-#include <QtDeclarative/qfxglobal.h>
 #include <QtCore/qdebug.h>
+#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE