353 files changed, 617 insertions, 598 deletions

diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
index 7c74c63801..c2ee93b665 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
@@ -66,7 +66,7 @@ class QDeclarativeWatcher;
 class QDataStream;
 class QDeclarativeDebugStatesDelegate;
 
-class QDeclarativeEngineDebugService : public QDeclarativeDebugService
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebugService : public QDeclarativeDebugService
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 265e4eba33..ca81a4a3d3 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -31,10 +31,3 @@ HEADERS += qtdeclarativeversion.h
 include(util/util.pri)
 include(qml/qml.pri)
 include(debugger/debugger.pri)
-include(scenegraph/scenegraph.pri)
-include(items/items.pri)
-include(particles/particles.pri)
-include(designer/designer.pri)
-
-HEADERS += qtquick2_p.h
-SOURCES += qtquick2.cpp
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index ea68291942..49b3d037ad 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -78,7 +78,7 @@ class QDeclarativeEngine;
 class QDeclarativeCompiledData;
 
 class QDeclarativeComponentAttached;
-class Q_AUTOTEST_EXPORT QDeclarativeComponentPrivate : public QObjectPrivate, public QDeclarativeTypeData::TypeDataCallback
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeComponentPrivate : public QObjectPrivate, public QDeclarativeTypeData::TypeDataCallback
 {
     Q_DECLARE_PUBLIC(QDeclarativeComponent)
         
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index d0d095567e..ee42f0b7c3 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -83,7 +83,6 @@
 
 #include <private/qobject_p.h>
 
-#include <private/qtquick2_p.h>
 #include <private/qdeclarativelocale_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
@@ -159,7 +158,6 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor)
     \endcode
 */
 
-static bool qt_QmlQtModule_registered = false;
 bool QDeclarativeEnginePrivate::qml_debugging_enabled = false;
 
 void QDeclarativeEnginePrivate::registerBaseTypes(const char *uri, int versionMajor, int versionMinor)
@@ -343,10 +341,6 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
   scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1),
   incubatorCount(0), incubationController(0), mutex(QMutex::Recursive)
 {
-    if (!qt_QmlQtModule_registered) {
-        qt_QmlQtModule_registered = true;
-        QDeclarativeQtQuick2Module::defineModule();
-    }
 }
 
 QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate()
diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h
index 7a2bda218f..7b53bab093 100644
--- a/src/declarative/qml/qdeclarativeexpression_p.h
+++ b/src/declarative/qml/qdeclarativeexpression_p.h
@@ -168,7 +168,7 @@ private:
 
 class QDeclarativeExpression;
 class QString;
-class QDeclarativeExpressionPrivate : public QObjectPrivate, public QDeclarativeJavaScriptExpression
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeExpressionPrivate : public QObjectPrivate, public QDeclarativeJavaScriptExpression
 {
     Q_DECLARE_PUBLIC(QDeclarativeExpression)
 public:
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 46395e15e8..c175d725b8 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -1899,7 +1899,6 @@ int QDeclarativeMetaType::QQuickAnchorLineMetaTypeId()
     static int id = 0;
     if (!id) {
         id = QMetaType::type("QQuickAnchorLine");
-        Q_ASSERT(id != 0);
     }
     return id;
 }
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 3122cd24bb..01d4247ff8 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,61 +1,5 @@
 SOURCES += \
-    $$PWD/qdeclarativeutilmodule.cpp\
-    $$PWD/qdeclarativeconnections.cpp \
-    $$PWD/qdeclarativepackage.cpp \
-    $$PWD/qdeclarativeanimation.cpp \
-    $$PWD/qdeclarativesystempalette.cpp \
-    $$PWD/qdeclarativespringanimation.cpp \
-    $$PWD/qdeclarativesmoothedanimation.cpp \
-    $$PWD/qdeclarativestate.cpp\
-    $$PWD/qdeclarativetransitionmanager.cpp \
-    $$PWD/qdeclarativestateoperations.cpp \
-    $$PWD/qdeclarativepropertychanges.cpp \
-    $$PWD/qdeclarativestategroup.cpp \
-    $$PWD/qdeclarativetransition.cpp \
-    $$PWD/qdeclarativelistaccessor.cpp \
-    $$PWD/qdeclarativetimeline.cpp \
-    $$PWD/qdeclarativetimer.cpp \
-    $$PWD/qdeclarativebind.cpp \
-    $$PWD/qdeclarativepropertymap.cpp \
-    $$PWD/qdeclarativepixmapcache.cpp \
-    $$PWD/qdeclarativebehavior.cpp \
-    $$PWD/qdeclarativefontloader.cpp \
-    $$PWD/qdeclarativestyledtext.cpp \
-    $$PWD/qdeclarativepath.cpp \
-    $$PWD/qdeclarativechangeset.cpp \
-    $$PWD/qdeclarativelistcompositor.cpp \
-    $$PWD/qdeclarativepathinterpolator.cpp \
-    $$PWD/qdeclarativesvgparser.cpp
+    $$PWD/qdeclarativepropertymap.cpp
 
 HEADERS += \
-    $$PWD/qdeclarativeutilmodule_p.h\
-    $$PWD/qdeclarativeconnections_p.h \
-    $$PWD/qdeclarativepackage_p.h \
-    $$PWD/qdeclarativeanimation_p.h \
-    $$PWD/qdeclarativeanimation_p_p.h \
-    $$PWD/qdeclarativesystempalette_p.h \
-    $$PWD/qdeclarativespringanimation_p.h \
-    $$PWD/qdeclarativesmoothedanimation_p.h \
-    $$PWD/qdeclarativesmoothedanimation_p_p.h \
-    $$PWD/qdeclarativestate_p.h\
-    $$PWD/qdeclarativestateoperations_p.h \
-    $$PWD/qdeclarativepropertychanges_p.h \
-    $$PWD/qdeclarativestate_p_p.h\
-    $$PWD/qdeclarativetransitionmanager_p_p.h \
-    $$PWD/qdeclarativestategroup_p.h \
-    $$PWD/qdeclarativetransition_p.h \
-    $$PWD/qdeclarativelistaccessor_p.h \
-    $$PWD/qdeclarativetimeline_p_p.h \
-    $$PWD/qdeclarativetimer_p.h \
-    $$PWD/qdeclarativebind_p.h \
-    $$PWD/qdeclarativepropertymap.h \
-    $$PWD/qdeclarativepixmapcache_p.h \
-    $$PWD/qdeclarativebehavior_p.h \
-    $$PWD/qdeclarativefontloader_p.h \
-    $$PWD/qdeclarativestyledtext_p.h \
-    $$PWD/qdeclarativepath_p.h \
-    $$PWD/qdeclarativepath_p_p.h \
-    $$PWD/qdeclarativechangeset_p.h \
-    $$PWD/qdeclarativelistcompositor_p.h \
-    $$PWD/qdeclarativepathinterpolator_p.h \
-    $$PWD/qdeclarativesvgparser_p.h
\ No newline at end of file
+    $$PWD/qdeclarativepropertymap.h
diff --git a/src/imports/etcprovider/etcprovider.pro b/src/imports/etcprovider/etcprovider.pro
index b48235eed8..3ec3ab5d09 100644
--- a/src/imports/etcprovider/etcprovider.pro
+++ b/src/imports/etcprovider/etcprovider.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/etcprovider
 include(../qimportbase.pri)
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
 
-QT += declarative opengl
+QT += declarative quick opengl
 
 SOURCES += qetcprovider.cpp plugin.cpp
 HEADERS += qetcprovider.h plugin.h
diff --git a/src/imports/etcprovider/qetcprovider.h b/src/imports/etcprovider/qetcprovider.h
index cac37584d4..42c8e410db 100644
--- a/src/imports/etcprovider/qetcprovider.h
+++ b/src/imports/etcprovider/qetcprovider.h
@@ -44,7 +44,7 @@
 
 #include <qopengl.h>
 #include <QDeclarativeImageProvider>
-#include <QSGTexture>
+#include <QtQuick/QSGTexture>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
 #include <QFileInfo>
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 35590b221d..18400f86f2 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qtquick1 qt47 folderlistmodel particles gestures etcprovider
+SUBDIRS += qtquick2 qtquick1 qt47 folderlistmodel particles gestures etcprovider
 contains(QT_CONFIG, qmltest): SUBDIRS += testlib
-contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel
\ No newline at end of file
+contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp
new file mode 100644
index 0000000000..a0def068d9
--- /dev/null
+++ b/src/imports/qtquick2/plugin.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+
+#include <private/qtquick2_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//![class decl]
+class QtQuick2Plugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    virtual void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick"));
+        QDeclarativeQtQuick2Module::defineModule();
+    }
+};
+//![class decl]
+
+QT_END_NAMESPACE
+
+#include "plugin.moc"
+
+//![plugin export decl]
+Q_EXPORT_PLUGIN2(qtquick2plugin, QT_PREPEND_NAMESPACE(QtQuick2Plugin));
+//![plugin export decl]
+
diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir
new file mode 100644
index 0000000000..bb4d33a5be
--- /dev/null
+++ b/src/imports/qtquick2/qmldir
@@ -0,0 +1 @@
+plugin qtquick2plugin
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
new file mode 100644
index 0000000000..3f76abd87f
--- /dev/null
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -0,0 +1,19 @@
+TARGET  = qtquick2plugin
+TARGETPATH = QtQuick.2
+include(../qimportbase.pri)
+
+SOURCES += \
+    plugin.cpp
+
+QT += quick-private declarative-private
+
+OTHER_FILES += \
+    qmldir
+
+DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+qmldir.files += $$PWD/qmldir
+qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+INSTALLS += target qmldir
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index c7d7d9191e..0d3669970f 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -46,7 +46,7 @@
 #include "QtQuickTest/private/quicktestresult_p.h"
 #include "QtQuickTest/private/quicktestevent_p.h"
 #include "private/qtestoptions_p.h"
-#include "QtDeclarative/qquickitem.h"
+#include "QtQuick/qquickitem.h"
 #include <QtDeclarative/private/qdeclarativeengine_p.h>
 
 QML_DECLARE_TYPE(QuickTestResult)
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index dbe45fb6fa..3b8a5bf75e 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -4,7 +4,7 @@ include(../qimportbase.pri)
 
 CONFIG += qt plugin
 
-QT += declarative qmltest qmltest-private v8-private declarative-private core-private testlib
+QT += declarative quick qmltest qmltest-private v8-private declarative-private core-private testlib
 
 SOURCES += main.cpp
 HEADERS +=
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index a06c1bdc10..ed6ba4cf29 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -1,7 +1,7 @@
 load(qt_module)
 
 TARGET = qmldbg_qtquick2
-QT       += declarative-private core-private gui-private opengl-private v8-private
+QT       += declarative-private quick-private core-private gui-private opengl-private v8-private
 
 load(qt_plugin)
 
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
index 5ed919c87c..33b8cc1b4e 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
@@ -44,7 +44,7 @@
 
 #include <QtCore/qplugin.h>
 #include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
-#include <QtDeclarative/QQuickView>
+#include <QtQuick/QQuickView>
 
 namespace QmlJSDebugger {
 namespace QtQuick2 {
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h
index 8ba1af6576..d6c380e0d2 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h
@@ -43,7 +43,7 @@
 #define SGHIGHLIGHT_H
 
 #include <QtCore/QWeakPointer>
-#include <QtDeclarative/QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
 
 namespace QmlJSDebugger {
 namespace QtQuick2 {
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp
index 4d5fc3738d..f96f7d2422 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp
@@ -45,8 +45,8 @@
 #include "sgviewinspector.h"
 
 #include <QtGui/QMouseEvent>
-#include <QtDeclarative/QQuickView>
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
 
 namespace QmlJSDebugger {
 namespace QtQuick2 {
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp
index 06eb6eac97..a1c2c1a1b2 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp
@@ -45,10 +45,10 @@
 #include "sghighlight.h"
 #include "sgselectiontool.h"
 
-#include <QtDeclarative/private/qquickitem_p.h>
+#include <QtQuick/private/qquickitem_p.h>
 
-#include <QtDeclarative/QQuickView>
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
 
 #include <cfloat>
 
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
index ff04487b18..cc2466639c 100644
--- a/src/qmltest/qmltest.pro
+++ b/src/qmltest/qmltest.pro
@@ -7,7 +7,7 @@ CONFIG += module
 CONFIG += dll warn_on declarative_debug
 MODULE_PRI += ../../modules/qt_qmltest.pri
 
-QT += testlib-private declarative testlib qtquick1 widgets widgets-private gui
+QT += testlib-private declarative testlib quick qtquick1 widgets widgets-private gui
 DEFINES += QT_BUILD_QUICK_TEST_LIB QT_NO_URL_CAST_FROM_STRING
 
 
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 976b4d6de0..65107ee717 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -49,7 +49,7 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 #if defined(QML_VERSION) && QML_VERSION >= 0x020000
-#include <QtDeclarative/qquickview.h>
+#include <QtQuick/qquickview.h>
 #define QUICK_TEST_SCENEGRAPH 1
 #endif
 #include <QtDeclarative/qjsvalue.h>
diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp
index 780d502f52..e865954460 100644
--- a/src/qmltest/quicktestevent.cpp
+++ b/src/qmltest/quicktestevent.cpp
@@ -45,8 +45,8 @@
 #include <QtQuick1/qdeclarativeitem.h>
 #include <QtQuick1/qdeclarativeview.h>
 #if defined(QML_VERSION) && QML_VERSION >= 0x020000
-#include <QtDeclarative/qquickitem.h>
-#include <QtDeclarative/qquickcanvas.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickcanvas.h>
 #define QUICK_TEST_SCENEGRAPH 1
 #endif
 #include <QtWidgets/qgraphicsscene.h>
diff --git a/src/declarative/designer/designer.pri b/src/quick/designer/designer.pri
index c523525977..c523525977 100644
--- a/src/declarative/designer/designer.pri
+++ b/src/quick/designer/designer.pri
diff --git a/src/declarative/designer/designersupport.cpp b/src/quick/designer/designersupport.cpp
index 9c565c138c..04a176f511 100644
--- a/src/declarative/designer/designersupport.cpp
+++ b/src/quick/designer/designersupport.cpp
@@ -42,11 +42,11 @@
 #include "designersupport.h"
 #include <private/qquickitem_p.h>
 
-#include <private/qquickshadereffectsource_p.h>
-#include <private/qquickrectangle_p.h>
+#include <QtQuick/private/qquickshadereffectsource_p.h>
+#include <QtQuick/private/qquickrectangle_p.h>
 #include <private/qdeclarativeengine_p.h>
 #include <private/qquickview_p.h>
-#include <private/qdeclarativestategroup_p.h>
+#include <QtQuick/private/qdeclarativestategroup_p.h>
 #include <QtGui/QImage>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/designer/designersupport.h b/src/quick/designer/designersupport.h
index 7654363276..18546eca66 100644
--- a/src/declarative/designer/designersupport.h
+++ b/src/quick/designer/designersupport.h
@@ -54,6 +54,7 @@
 //
 
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtCore/QtGlobal>
 #include <QtCore/QHash>
 #include <QtCore/QRectF>
@@ -62,8 +63,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickItem;
 class QQuickShaderEffectTexture;
 class QImage;
@@ -72,7 +71,7 @@ class QDeclarativeContext;
 class QQuickView;
 
 
-class Q_DECLARATIVE_EXPORT DesignerSupport
+class Q_QUICK_EXPORT DesignerSupport
 {
 public:
     enum DirtyType {
diff --git a/src/declarative/items/checksync.pl b/src/quick/items/checksync.pl
index 7dffa72e88..7dffa72e88 100755
--- a/src/declarative/items/checksync.pl
+++ b/src/quick/items/checksync.pl
diff --git a/src/declarative/items/context2d/context2d.pri b/src/quick/items/context2d/context2d.pri
index 60b3e4b0c1..60b3e4b0c1 100644
--- a/src/declarative/items/context2d/context2d.pri
+++ b/src/quick/items/context2d/context2d.pri
diff --git a/src/declarative/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 81b7a49722..32809babed 100644
--- a/src/declarative/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -45,7 +45,7 @@
 #include "qquickcontext2d_p.h"
 #include "qquickcontext2dnode_p.h"
 #include "qquickcontext2dtexture_p.h"
-#include <private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
 
 #include <qdeclarativeinfo.h>
 #include <private/qdeclarativeengine_p.h>
diff --git a/src/declarative/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index 293434209a..70ca475c96 100644
--- a/src/declarative/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -42,17 +42,16 @@
 #ifndef QQUICKCANVASITEM_P_H
 #define QQUICKCANVASITEM_P_H
 
-#include <qquickitem.h>
+#include <QtQuick/qquickitem.h>
 #include <private/qv8engine_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class QQuickContext2D;
 class QQuickCanvasItemPrivate;
-class Q_DECLARATIVE_EXPORT QQuickCanvasItem : public QQuickItem
+class Q_QUICK_EXPORT QQuickCanvasItem : public QQuickItem
 {
     Q_OBJECT
     Q_ENUMS(RenderTarget)
diff --git a/src/declarative/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 1f7a84baa6..d5d57132bf 100644
--- a/src/declarative/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -43,11 +43,11 @@
 #include "qquickcontext2dcommandbuffer_p.h"
 #include "qquickcanvasitem_p.h"
 #include <private/qquickitem_p.h>
-#include <private/qquickshadereffectsource_p.h>
+#include <QtQuick/private/qquickshadereffectsource_p.h>
 #include <QtGui/qopenglframebufferobject.h>
 
 #include <QtCore/qdebug.h>
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qdeclarativesvgparser_p.h>
 #include <private/qdeclarativepath_p.h>
 
diff --git a/src/declarative/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index c5634d2b18..0f320d9a7f 100644
--- a/src/declarative/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -42,6 +42,7 @@
 #ifndef QQUICKCONTEXT2D_P_H
 #define QQUICKCONTEXT2D_P_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 
@@ -63,13 +64,11 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickCanvasItem;
 class QQuickContext2DCommandBuffer;
 class QDeclarativePixmap;
 
-class Q_DECLARATIVE_EXPORT QQuickContext2D
+class Q_QUICK_EXPORT QQuickContext2D
 {
 public:
     enum TextBaseLineType { Alphabetic=0, Top, Middle, Bottom, Hanging};
diff --git a/src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
index 476e7e2cf8..476e7e2cf8 100644
--- a/src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
diff --git a/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
index 7deb2fbd6e..2029198648 100644
--- a/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
@@ -43,15 +43,13 @@
 #define QQUICKCONTEXT2DCOMMANDBUFFER_P_H
 
 #include "qquickcontext2d_p.h"
-#include <private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
 
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickCanvasItem;
 class QMutex;
 
diff --git a/src/declarative/items/context2d/qquickcontext2dnode.cpp b/src/quick/items/context2d/qquickcontext2dnode.cpp
index 76b50d9747..445cde8964 100644
--- a/src/declarative/items/context2d/qquickcontext2dnode.cpp
+++ b/src/quick/items/context2d/qquickcontext2dnode.cpp
@@ -41,7 +41,7 @@
 
 #include "qquickcontext2dnode_p.h"
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/context2d/qquickcontext2dnode_p.h b/src/quick/items/context2d/qquickcontext2dnode_p.h
index 7403acaf07..a00c939896 100644
--- a/src/declarative/items/context2d/qquickcontext2dnode_p.h
+++ b/src/quick/items/context2d/qquickcontext2dnode_p.h
@@ -42,8 +42,8 @@
 #ifndef QQUICKCONTEXT2DNODE_P_H
 #define QQUICKCONTEXT2DNODE_P_H
 
-#include <qsgnode.h>
-#include <qsgtexturematerial.h>
+#include <QtQuick/qsgnode.h>
+#include <QtQuick/qsgtexturematerial.h>
 
 #include "qquickcanvasitem_p.h"
 #include "qquickcontext2dtexture_p.h"
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickContext2DNode : public QSGGeometryNode
 {
 public:
diff --git a/src/declarative/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp
index 1128fa224f..cbf1571189 100644
--- a/src/declarative/items/context2d/qquickcontext2dtexture.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp
@@ -43,7 +43,7 @@
 #include "qquickcontext2dtile_p.h"
 #include "qquickcanvasitem_p.h"
 #include <private/qquickitem_p.h>
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 #include "qquickcontext2dcommandbuffer_p.h"
 #include <QOpenGLPaintDevice>
 
diff --git a/src/declarative/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
index ed45a09f7c..d055db7c06 100644
--- a/src/declarative/items/context2d/qquickcontext2dtexture_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -42,7 +42,7 @@
 #ifndef QQUICKCONTEXT2DTEXTURE_P_H
 #define QQUICKCONTEXT2DTEXTURE_P_H
 
-#include <qsgtexture.h>
+#include <QtQuick/qsgtexture.h>
 #include "qquickcanvasitem_p.h"
 #include "qquickcontext2d_p.h"
 
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickContext2DTile;
 class QQuickContext2DCommandBuffer;
 
diff --git a/src/declarative/items/context2d/qquickcontext2dtile.cpp b/src/quick/items/context2d/qquickcontext2dtile.cpp
index 6217c66094..6217c66094 100644
--- a/src/declarative/items/context2d/qquickcontext2dtile.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtile.cpp
diff --git a/src/declarative/items/context2d/qquickcontext2dtile_p.h b/src/quick/items/context2d/qquickcontext2dtile_p.h
index 92c59efbcf..a38384d3c7 100644
--- a/src/declarative/items/context2d/qquickcontext2dtile_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtile_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickContext2DTexture;
 class QQuickContext2DCommandBuffer;
 
diff --git a/src/declarative/items/items.pri b/src/quick/items/items.pri
index 308706f0b9..308706f0b9 100644
--- a/src/declarative/items/items.pri
+++ b/src/quick/items/items.pri
diff --git a/src/declarative/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index 8ebdc374fb..8ebdc374fb 100644
--- a/src/declarative/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
diff --git a/src/declarative/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h
index 5c66c2e17d..6f2224f0d4 100644
--- a/src/declarative/items/qquickanchors_p.h
+++ b/src/quick/items/qquickanchors_p.h
@@ -47,18 +47,16 @@
 
 #include <QtCore/QObject>
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquickglobal_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickItem;
 class QQuickAnchorsPrivate;
 class QQuickAnchorLine;
-class Q_DECLARATIVE_PRIVATE_EXPORT QQuickAnchors : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickAnchors : public QObject
 {
     Q_OBJECT
 
diff --git a/src/declarative/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h
index 50d55b081f..50d55b081f 100644
--- a/src/declarative/items/qquickanchors_p_p.h
+++ b/src/quick/items/qquickanchors_p_p.h
diff --git a/src/declarative/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 61447c87e2..61447c87e2 100644
--- a/src/declarative/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
diff --git a/src/declarative/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h
index ae96e4cc15..0bb3ad73f5 100644
--- a/src/declarative/items/qquickanimatedimage_p.h
+++ b/src/quick/items/qquickanimatedimage_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QMovie;
 class QQuickAnimatedImagePrivate;
 
diff --git a/src/declarative/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h
index 0d5dd4a3b7..0d5dd4a3b7 100644
--- a/src/declarative/items/qquickanimatedimage_p_p.h
+++ b/src/quick/items/qquickanimatedimage_p_p.h
diff --git a/src/declarative/items/qquickanimation.cpp b/src/quick/items/qquickanimation.cpp
index 55eb4e2e13..55eb4e2e13 100644
--- a/src/declarative/items/qquickanimation.cpp
+++ b/src/quick/items/qquickanimation.cpp
diff --git a/src/declarative/items/qquickanimation_p.h b/src/quick/items/qquickanimation_p.h
index 2ce72249e2..bf38bd4d9f 100644
--- a/src/declarative/items/qquickanimation_p.h
+++ b/src/quick/items/qquickanimation_p.h
@@ -45,7 +45,7 @@
 
 #include "qquickitem.h"
 
-#include <private/qdeclarativeanimation_p.h>
+#include <QtQuick/private/qdeclarativeanimation_p.h>
 
 #include <QtCore/qabstractanimation.h>
 
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParentAnimationPrivate;
 class QQuickParentAnimation : public QDeclarativeAnimationGroup
 {
diff --git a/src/declarative/items/qquickanimation_p_p.h b/src/quick/items/qquickanimation_p_p.h
index de2b6d42f9..de2b6d42f9 100644
--- a/src/declarative/items/qquickanimation_p_p.h
+++ b/src/quick/items/qquickanimation_p_p.h
diff --git a/src/declarative/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index e0ffd716aa..e0ffd716aa 100644
--- a/src/declarative/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
diff --git a/src/declarative/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h
index 0af6fca55d..936467d580 100644
--- a/src/declarative/items/qquickborderimage_p.h
+++ b/src/quick/items/qquickborderimage_p.h
@@ -48,8 +48,6 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickScaleGrid;
 class QQuickGridScaledImage;
 class QQuickBorderImagePrivate;
diff --git a/src/declarative/items/qquickborderimage_p_p.h b/src/quick/items/qquickborderimage_p_p.h
index 1875dc082a..1875dc082a 100644
--- a/src/declarative/items/qquickborderimage_p_p.h
+++ b/src/quick/items/qquickborderimage_p_p.h
diff --git a/src/declarative/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index 8022af98f4..9c6ab08fc7 100644
--- a/src/declarative/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -45,10 +45,10 @@
 #include "qquickitem.h"
 #include "qquickitem_p.h"
 
-#include <private/qsgrenderer_p.h>
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgrenderer_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 #include <private/qsgflashnode_p.h>
-#include <qsgengine.h>
+#include <QtQuick/qsgengine.h>
 
 #include <private/qguiapplication_p.h>
 #include <QtGui/QInputPanel>
@@ -844,6 +844,8 @@ void QQuickCanvasPrivate::cleanup(QSGNode *n)
     \since QtQuick 2.0
     \brief The QQuickCanvas class provides the canvas for displaying a graphical QML scene
 
+    \inmodule QtQuick
+
     QQuickCanvas provides the graphical scene management needed to interact with and display
     a scene of QQuickItems.
 
diff --git a/src/declarative/items/qquickcanvas.h b/src/quick/items/qquickcanvas.h
index c27776f234..9ea73b087b 100644
--- a/src/declarative/items/qquickcanvas.h
+++ b/src/quick/items/qquickcanvas.h
@@ -42,6 +42,7 @@
 #ifndef QQUICKCANVAS_H
 #define QQUICKCANVAS_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtCore/qmetatype.h>
 #include <QtGui/qopengl.h>
 #include <QtGui/qwindow.h>
@@ -51,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGEngine;
 class QQuickItem;
 class QSGTexture;
@@ -62,7 +61,7 @@ class QOpenGLFramebufferObject;
 class QDeclarativeIncubationController;
 class QInputMethodEvent;
 
-class Q_DECLARATIVE_EXPORT QQuickCanvas : public QWindow
+class Q_QUICK_EXPORT QQuickCanvas : public QWindow
 {
     Q_OBJECT
     Q_PRIVATE_PROPERTY(QQuickCanvas::d_func(), QDeclarativeListProperty<QObject> data READ data DESIGNABLE false)
diff --git a/src/declarative/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h
index 13ca288cb1..633f382954 100644
--- a/src/declarative/items/qquickcanvas_p.h
+++ b/src/quick/items/qquickcanvas_p.h
@@ -57,7 +57,7 @@
 #include "qquickcanvas.h"
 #include <private/qdeclarativeguard_p.h>
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qquickdrag_p.h>
 
 #include <QtCore/qthread.h>
diff --git a/src/declarative/items/qquickclipnode.cpp b/src/quick/items/qquickclipnode.cpp
index 4aeb2dcf69..4aeb2dcf69 100644
--- a/src/declarative/items/qquickclipnode.cpp
+++ b/src/quick/items/qquickclipnode.cpp
diff --git a/src/declarative/items/qquickclipnode_p.h b/src/quick/items/qquickclipnode_p.h
index 0323c9a24a..ee85409c9d 100644
--- a/src/declarative/items/qquickclipnode_p.h
+++ b/src/quick/items/qquickclipnode_p.h
@@ -42,7 +42,7 @@
 #ifndef QQUICKCLIPNODE_P_H
 #define QQUICKCLIPNODE_P_H
 
-#include <qsgnode.h>
+#include <QtQuick/qsgnode.h>
 
 class QQuickDefaultClipNode : public QSGClipNode
 {
diff --git a/src/declarative/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 9dcc4ac7fe..12d8cbea98 100644
--- a/src/declarative/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -42,7 +42,7 @@
 #include "qquickdrag_p.h"
 
 #include <private/qquickitem_p.h>
-#include <private/qquickevents_p_p.h>
+#include <QtQuick/private/qquickevents_p_p.h>
 #include <private/qquickitemchangelistener_p.h>
 #include <private/qv8engine_p.h>
 
diff --git a/src/declarative/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h
index 1d950299d7..830c665899 100644
--- a/src/declarative/items/qquickdrag_p.h
+++ b/src/quick/items/qquickdrag_p.h
@@ -43,7 +43,7 @@
 #ifndef QQUICKDRAG_P_H
 #define QQUICKDRAG_P_H
 
-#include <qquickitem.h>
+#include <QtQuick/qquickitem.h>
 
 #include <private/qv8engine_p.h>
 
@@ -55,8 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickItem;
 class QQuickDrag;
 class QQuickDragPrivate;
diff --git a/src/declarative/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index 6ea1467e41..6ea1467e41 100644
--- a/src/declarative/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
diff --git a/src/declarative/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h
index 31e2bd7813..6662b21faf 100644
--- a/src/declarative/items/qquickdroparea_p.h
+++ b/src/quick/items/qquickdroparea_p.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickDropAreaPrivate;
 class QQuickDropEvent : public QObject
 {
diff --git a/src/declarative/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index c546dd305a..c546dd305a 100644
--- a/src/declarative/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
diff --git a/src/declarative/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index cc5ed4f01e..81eb0dfd06 100644
--- a/src/declarative/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -54,6 +54,7 @@
 // We mean it.
 //
 
+#include <QtQuick/qtquickglobal.h>
 #include <qdeclarative.h>
 
 #include <QtCore/qobject.h>
@@ -91,7 +92,7 @@ private:
 };
 
 // used in QtLocation
-class Q_DECLARATIVE_EXPORT QQuickMouseEvent : public QObject
+class Q_QUICK_EXPORT QQuickMouseEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal x READ x)
diff --git a/src/declarative/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index aca3542a92..aca3542a92 100644
--- a/src/declarative/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
diff --git a/src/declarative/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index 658db94846..63ff72c598 100644
--- a/src/declarative/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickFlickablePrivate;
 class QQuickFlickableVisibleArea;
 class Q_DECLARATIVE_EXPORT QQuickFlickable : public QQuickItem
diff --git a/src/declarative/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index 8ceea6162f..8ceea6162f 100644
--- a/src/declarative/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
diff --git a/src/declarative/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index ed89f2aaf5..ed89f2aaf5 100644
--- a/src/declarative/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
diff --git a/src/declarative/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h
index 698ec0fcb2..9a39b95fbd 100644
--- a/src/declarative/items/qquickflipable_p.h
+++ b/src/quick/items/qquickflipable_p.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickFlipablePrivate;
 class Q_AUTOTEST_EXPORT QQuickFlipable : public QQuickItem
 {
diff --git a/src/declarative/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp
index b807fe58f6..b807fe58f6 100644
--- a/src/declarative/items/qquickfocusscope.cpp
+++ b/src/quick/items/qquickfocusscope.cpp
diff --git a/src/declarative/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h
index ff1a389f62..472aceed33 100644
--- a/src/declarative/items/qquickfocusscope_p.h
+++ b/src/quick/items/qquickfocusscope_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class Q_AUTOTEST_EXPORT QQuickFocusScope : public QQuickItem
 {
     Q_OBJECT
diff --git a/src/declarative/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 44e1f14c6f..44e1f14c6f 100644
--- a/src/declarative/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
diff --git a/src/declarative/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index b02c0a8350..729c6e433e 100644
--- a/src/declarative/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class QQuickVisualModel;
 class QQuickGridViewAttached;
 class QQuickGridViewPrivate;
diff --git a/src/declarative/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 46b8ea0915..19a8ef1199 100644
--- a/src/declarative/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -42,9 +42,9 @@
 #include "qquickimage_p.h"
 #include "qquickimage_p_p.h"
 
-#include <private/qsgtextureprovider_p.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 
 #include <QtGui/qpainter.h>
diff --git a/src/declarative/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h
index 0d1c8dcba3..36b43079b0 100644
--- a/src/declarative/items/qquickimage_p.h
+++ b/src/quick/items/qquickimage_p.h
@@ -44,14 +44,12 @@
 #define QQUICKIMAGE_P_H
 
 #include "qquickimagebase_p.h"
-#include <private/qsgtextureprovider_p.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickImagePrivate;
 class Q_AUTOTEST_EXPORT QQuickImage : public QQuickImageBase
 {
diff --git a/src/declarative/items/qquickimage_p_p.h b/src/quick/items/qquickimage_p_p.h
index 2077dfb0b3..2077dfb0b3 100644
--- a/src/declarative/items/qquickimage_p_p.h
+++ b/src/quick/items/qquickimage_p_p.h
diff --git a/src/declarative/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index d0e495eff5..d0e495eff5 100644
--- a/src/declarative/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
diff --git a/src/declarative/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h
index 51b5f088d4..51b5f088d4 100644
--- a/src/declarative/items/qquickimagebase_p.h
+++ b/src/quick/items/qquickimagebase_p.h
diff --git a/src/declarative/items/qquickimagebase_p_p.h b/src/quick/items/qquickimagebase_p_p.h
index 2347a82e92..0045562ddc 100644
--- a/src/declarative/items/qquickimagebase_p_p.h
+++ b/src/quick/items/qquickimagebase_p_p.h
@@ -57,7 +57,7 @@
 #include "qquickimplicitsizeitem_p_p.h"
 #include "qquickimagebase_p.h"
 
-#include <private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/items/qquickimplicitsizeitem.cpp b/src/quick/items/qquickimplicitsizeitem.cpp
index b0c5826349..b0c5826349 100644
--- a/src/declarative/items/qquickimplicitsizeitem.cpp
+++ b/src/quick/items/qquickimplicitsizeitem.cpp
diff --git a/src/declarative/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h
index 9ca98e1d60..9ca98e1d60 100644
--- a/src/declarative/items/qquickimplicitsizeitem_p.h
+++ b/src/quick/items/qquickimplicitsizeitem_p.h
diff --git a/src/declarative/items/qquickimplicitsizeitem_p_p.h b/src/quick/items/qquickimplicitsizeitem_p_p.h
index 17c204d7c3..17c204d7c3 100644
--- a/src/declarative/items/qquickimplicitsizeitem_p_p.h
+++ b/src/quick/items/qquickimplicitsizeitem_p_p.h
diff --git a/src/declarative/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 9c11196944..a9409ecdf4 100644
--- a/src/declarative/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -59,9 +59,9 @@
 #include <QtCore/qnumeric.h>
 
 #include <private/qdeclarativeengine_p.h>
-#include <private/qdeclarativestategroup_p.h>
+#include <QtQuick/private/qdeclarativestategroup_p.h>
 #include <private/qdeclarativeopenmetaobject_p.h>
-#include <private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
 #include <private/qlistmodelinterface_p.h>
 #include <private/qquickitem_p.h>
 
@@ -1575,6 +1575,8 @@ void QQuickItemPrivate::setLayoutMirror(bool mirror)
     \class QQuickItem
     \brief The QQuickItem class provides the most basic of all visual items in QML.
 
+    \inmodule QtQuick
+
     All visual items in Qt Declarative inherit from QQuickItem.  Although QQuickItem
     has no visual appearance, it defines all the properties that are
     common across visual items - such as the x and y position, the
diff --git a/src/declarative/items/qquickitem.h b/src/quick/items/qquickitem.h
index a3baecb9ea..6e7a909696 100644
--- a/src/declarative/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -43,6 +43,7 @@
 #ifndef QQUICKITEM_H
 #define QQUICKITEM_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 
@@ -55,8 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickItem;
 class QQuickTransformPrivate;
 class QQuickTransform : public QObject
@@ -95,7 +94,7 @@ class QSGNode;
 class QSGTransformNode;
 class QSGTextureProvider;
 
-class Q_DECLARATIVE_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatus
+class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeParserStatus)
@@ -408,7 +407,7 @@ private:
 Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickItem::Flags)
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QQuickItem *item);
+QDebug Q_QUICK_EXPORT operator<<(QDebug debug, QQuickItem *item);
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 08ae7fac9b..a522a19a70 100644
--- a/src/declarative/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -62,11 +62,11 @@
 
 #include "qquickcanvas_p.h"
 
-#include <qsgnode.h>
+#include <QtQuick/qsgnode.h>
 #include "qquickclipnode_p.h"
 
 #include <private/qpodvector_p.h>
-#include <private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
 #include <private/qdeclarativenullablevalue_p_p.h>
 #include <private/qdeclarativenotifier_p.h>
 #include <private/qdeclarativeglobal_p.h>
@@ -133,7 +133,7 @@ public:
     QList<QQuickItem *> items;
 };
 
-class Q_DECLARATIVE_EXPORT QQuickItemPrivate : public QObjectPrivate
+class Q_QUICK_EXPORT QQuickItemPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QQuickItem)
 
diff --git a/src/declarative/items/qquickitemchangelistener_p.h b/src/quick/items/qquickitemchangelistener_p.h
index a021658f9e..a021658f9e 100644
--- a/src/declarative/items/qquickitemchangelistener_p.h
+++ b/src/quick/items/qquickitemchangelistener_p.h
diff --git a/src/declarative/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index 060d51e092..a9d8a193f0 100644
--- a/src/declarative/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -72,10 +72,10 @@
 #include "qquickstateoperations_p.h"
 #include "qquickanimation_p.h"
 #include <private/qquickshadereffect_p.h>
-#include <private/qquickshadereffectsource_p.h>
+#include <QtQuick/private/qquickshadereffectsource_p.h>
 //#include <private/qquickpincharea_p.h>
-#include <private/qquickcanvasitem_p.h>
-#include <private/qquickcontext2d_p.h>
+#include <QtQuick/private/qquickcanvasitem_p.h>
+#include <QtQuick/private/qquickcontext2d_p.h>
 #include "qquicksprite_p.h"
 #include "qquickspriteimage_p.h"
 #include "qquickdrag_p.h"
diff --git a/src/declarative/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h
index d3682007d7..025a5fa0be 100644
--- a/src/declarative/items/qquickitemsmodule_p.h
+++ b/src/quick/items/qquickitemsmodule_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickItemsModule
 {
 public:
diff --git a/src/declarative/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index edbe2a5d06..edbe2a5d06 100644
--- a/src/declarative/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
diff --git a/src/declarative/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index b8e27e4741..2b0b31ccd5 100644
--- a/src/declarative/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeChangeSet;
 
 class QQuickItemViewPrivate;
diff --git a/src/declarative/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 4db274e045..3b2c39bdeb 100644
--- a/src/declarative/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class FxViewItem
 {
 public:
diff --git a/src/declarative/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 86af39075a..86af39075a 100644
--- a/src/declarative/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
diff --git a/src/declarative/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index 0266e23cd5..68746d8215 100644
--- a/src/declarative/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickListView;
 class QQuickListViewPrivate;
 class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject
diff --git a/src/declarative/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index f9fd9148ee..f9fd9148ee 100644
--- a/src/declarative/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
diff --git a/src/declarative/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h
index 3dcab4c654..0416164932 100644
--- a/src/declarative/items/qquickloader_p.h
+++ b/src/quick/items/qquickloader_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickLoaderPrivate;
 class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem
 {
diff --git a/src/declarative/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index 63d73e8da2..63d73e8da2 100644
--- a/src/declarative/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
diff --git a/src/declarative/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 8d4f3e86b0..8d4f3e86b0 100644
--- a/src/declarative/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
diff --git a/src/declarative/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h
index b8fa7d5ce8..58da0468b8 100644
--- a/src/declarative/items/qquickmousearea_p.h
+++ b/src/quick/items/qquickmousearea_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickDragAttached;
 class QQuickMouseEvent;
 class Q_AUTOTEST_EXPORT QQuickDrag : public QObject
@@ -123,7 +121,7 @@ private:
 
 class QQuickMouseAreaPrivate;
 // used in QtLocation
-class Q_DECLARATIVE_EXPORT QQuickMouseArea : public QQuickItem
+class Q_QUICK_EXPORT QQuickMouseArea : public QQuickItem
 {
     Q_OBJECT
 
diff --git a/src/declarative/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h
index c1c53c4302..c1c53c4302 100644
--- a/src/declarative/items/qquickmousearea_p_p.h
+++ b/src/quick/items/qquickmousearea_p_p.h
diff --git a/src/declarative/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index f7fdf97fb7..c94abc6c9d 100644
--- a/src/declarative/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickmultipointtoucharea_p.h"
-#include <qquickcanvas.h>
+#include <QtQuick/qquickcanvas.h>
 #include <QEvent>
 #include <QMouseEvent>
 #include <math.h>
diff --git a/src/declarative/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index dac70453c5..aee18a376b 100644
--- a/src/declarative/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickMultiPointTouchArea;
 class Q_AUTOTEST_EXPORT QQuickTouchPoint : public QObject
 {
diff --git a/src/declarative/items/qquickninepatchnode.cpp b/src/quick/items/qquickninepatchnode.cpp
index 2974725348..2974725348 100644
--- a/src/declarative/items/qquickninepatchnode.cpp
+++ b/src/quick/items/qquickninepatchnode.cpp
diff --git a/src/declarative/items/qquickninepatchnode_p.h b/src/quick/items/qquickninepatchnode_p.h
index cdb0fd8e70..0cb1c87d54 100644
--- a/src/declarative/items/qquickninepatchnode_p.h
+++ b/src/quick/items/qquickninepatchnode_p.h
@@ -42,8 +42,8 @@
 #ifndef QQUICKNINEPATCHNODE_H
 #define QQUICKNINEPATCHNODE_H
 
-#include "qsgnode.h"
-#include "qsgtexturematerial.h"
+#include <QtQuick/qsgnode.h>
+#include <QtQuick/qsgtexturematerial.h>
 #include "qquickborderimage_p.h"
 
 class TextureReference;
diff --git a/src/declarative/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp
index 4d96da2e1a..23ba777528 100644
--- a/src/declarative/items/qquickpainteditem.cpp
+++ b/src/quick/items/qquickpainteditem.cpp
@@ -42,8 +42,8 @@
 #include "qquickpainteditem.h"
 #include <private/qquickpainteditem_p.h>
 
-#include <private/qsgpainternode_p.h>
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgpainternode_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 
 #include <qmath.h>
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \brief The QQuickPaintedItem class provides a way to use the QPainter API in the
     QML Scene Graph.
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     The QQuickPaintedItem makes it possible to use the QPainter API with the QML Scene Graph.
     It sets up a textured rectangle in the Scene Graph and uses a QPainter to paint
diff --git a/src/declarative/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h
index b2da9e6c7a..939ad6303b 100644
--- a/src/declarative/items/qquickpainteditem.h
+++ b/src/quick/items/qquickpainteditem.h
@@ -42,7 +42,7 @@
 #ifndef QQUICKPAINTEDITEM_P_H
 #define QQUICKPAINTEDITEM_P_H
 
-#include <qquickitem.h>
+#include <QtQuick/qquickitem.h>
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_HEADER
@@ -50,7 +50,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QQuickPaintedItemPrivate;
-class Q_DECLARATIVE_EXPORT QQuickPaintedItem : public QQuickItem
+class Q_QUICK_EXPORT QQuickPaintedItem : public QQuickItem
 {
     Q_OBJECT
     Q_ENUMS(RenderTarget)
diff --git a/src/declarative/items/qquickpainteditem_p.h b/src/quick/items/qquickpainteditem_p.h
index b847b0a4ef..b847b0a4ef 100644
--- a/src/declarative/items/qquickpainteditem_p.h
+++ b/src/quick/items/qquickpainteditem_p.h
diff --git a/src/declarative/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index f262562edf..0428dbe9cd 100644
--- a/src/declarative/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -43,7 +43,7 @@
 #include "qquickpathview_p_p.h"
 #include "qquickcanvas.h"
 
-#include <private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
 #include <private/qdeclarativeopenmetaobject_p.h>
 #include <private/qlistmodelinterface_p.h>
 #include <private/qdeclarativechangeset_p.h>
diff --git a/src/declarative/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h
index ebc1587b09..17195b7f02 100644
--- a/src/declarative/items/qquickpathview_p.h
+++ b/src/quick/items/qquickpathview_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeChangeSet;
 
 class QQuickPathViewPrivate;
diff --git a/src/declarative/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h
index 9bf329dab5..9bf329dab5 100644
--- a/src/declarative/items/qquickpathview_p_p.h
+++ b/src/quick/items/qquickpathview_p_p.h
diff --git a/src/declarative/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index beacbe32bf..beacbe32bf 100644
--- a/src/declarative/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
diff --git a/src/declarative/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index c98a1fdd9e..0f3eda0f98 100644
--- a/src/declarative/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class Q_AUTOTEST_EXPORT QQuickPinch : public QObject
 {
     Q_OBJECT
diff --git a/src/declarative/items/qquickpincharea_p_p.h b/src/quick/items/qquickpincharea_p_p.h
index 1c9d5c5ba4..1c9d5c5ba4 100644
--- a/src/declarative/items/qquickpincharea_p_p.h
+++ b/src/quick/items/qquickpincharea_p_p.h
diff --git a/src/declarative/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index 08fa4b1724..2643baa804 100644
--- a/src/declarative/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -47,10 +47,10 @@
 #include <QtCore/qmath.h>
 #include <QtCore/qcoreapplication.h>
 
-#include <private/qdeclarativestate_p.h>
-#include <private/qdeclarativestategroup_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativestategroup_p.h>
 #include <private/qdeclarativestateoperations_p.h>
-#include <private/qdeclarativetransition_p.h>
+#include <QtQuick/private/qdeclarativetransition_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index b8e8879205..72c87a94b7 100644
--- a/src/declarative/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -45,7 +45,7 @@
 
 #include "qquickimplicitsizeitem_p.h"
 
-#include <private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
 #include <private/qpodvector_p.h>
 
 #include <QtCore/qobject.h>
@@ -55,8 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickBasePositionerPrivate;
 
 class QQuickPositionerAttached : public QObject
@@ -90,7 +88,7 @@ private:
     bool m_isLastItem;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeItem
+class Q_QUICK_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeItem
 {
     Q_OBJECT
 
diff --git a/src/declarative/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h
index 86c6c74ba6..e7a5f8b473 100644
--- a/src/declarative/items/qquickpositioners_p_p.h
+++ b/src/quick/items/qquickpositioners_p_p.h
@@ -57,7 +57,7 @@
 #include "qquickpositioners_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
-#include <private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
 #include <private/qdeclarativetransitionmanager_p_p.h>
 #include <private/qdeclarativestateoperations_p.h>
 
diff --git a/src/declarative/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index c3cbaaa00e..388815941a 100644
--- a/src/declarative/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -42,7 +42,7 @@
 #include "qquickrectangle_p.h"
 #include "qquickrectangle_p_p.h"
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 
 #include <QtGui/qpixmapcache.h>
diff --git a/src/declarative/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h
index 838b944c62..540eb33739 100644
--- a/src/declarative/items/qquickrectangle_p.h
+++ b/src/quick/items/qquickrectangle_p.h
@@ -47,14 +47,13 @@
 
 #include <QtGui/qbrush.h>
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquickglobal_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-class Q_DECLARATIVE_PRIVATE_EXPORT QQuickPen : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickPen : public QObject
 {
     Q_OBJECT
 
@@ -138,7 +137,7 @@ private:
 };
 
 class QQuickRectanglePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QQuickRectangle : public QQuickItem
+class Q_QUICK_PRIVATE_EXPORT QQuickRectangle : public QQuickItem
 {
     Q_OBJECT
 
diff --git a/src/declarative/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h
index 93140ce75a..93140ce75a 100644
--- a/src/declarative/items/qquickrectangle_p_p.h
+++ b/src/quick/items/qquickrectangle_p_p.h
diff --git a/src/declarative/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index efa83eec38..efa83eec38 100644
--- a/src/declarative/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
diff --git a/src/declarative/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h
index 5b90d74e65..19beaec422 100644
--- a/src/declarative/items/qquickrepeater_p.h
+++ b/src/quick/items/qquickrepeater_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeChangeSet;
 
 class QQuickRepeaterPrivate;
diff --git a/src/declarative/items/qquickrepeater_p_p.h b/src/quick/items/qquickrepeater_p_p.h
index 962d177494..962d177494 100644
--- a/src/declarative/items/qquickrepeater_p_p.h
+++ b/src/quick/items/qquickrepeater_p_p.h
diff --git a/src/declarative/items/qquickscalegrid.cpp b/src/quick/items/qquickscalegrid.cpp
index 9a8f652a9b..9a8f652a9b 100644
--- a/src/declarative/items/qquickscalegrid.cpp
+++ b/src/quick/items/qquickscalegrid.cpp
diff --git a/src/declarative/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h
index 8d93c3b1c9..2ce45f7347 100644
--- a/src/declarative/items/qquickscalegrid_p_p.h
+++ b/src/quick/items/qquickscalegrid_p_p.h
@@ -48,16 +48,14 @@
 #include <QtDeclarative/qdeclarative.h>
 #include <QtCore/qobject.h>
 
-#include <private/qdeclarativepixmapcache_p.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <private/qtquickglobal_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QQuickScaleGrid : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickScaleGrid : public QObject
 {
     Q_OBJECT
     Q_ENUMS(TileRule)
@@ -95,7 +93,7 @@ private:
     int _bottom;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QQuickGridScaledImage
+class Q_QUICK_PRIVATE_EXPORT QQuickGridScaledImage
 {
 public:
     QQuickGridScaledImage();
diff --git a/src/declarative/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index bdef980440..7572a0cf0d 100644
--- a/src/declarative/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -42,11 +42,11 @@
 #include <private/qquickshadereffect_p.h>
 #include <private/qquickshadereffectnode_p.h>
 
-#include "qsgmaterial.h"
+#include <QtQuick/qsgmaterial.h>
 #include "qquickitem_p.h"
 
-#include <private/qsgcontext_p.h>
-#include <private/qsgtextureprovider_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
 #include "qquickcanvas.h"
 
 #include "qquickimage_p.h"
diff --git a/src/declarative/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index 1910f43195..97444fb2f5 100644
--- a/src/declarative/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -42,9 +42,9 @@
 #ifndef QQUICKSHADEREFFECT_P_H
 #define QQUICKSHADEREFFECT_P_H
 
-#include "qquickitem.h"
+#include <QtQuick/qquickitem.h>
 
-#include "qsgmaterial.h"
+#include <QtQuick/qsgmaterial.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qquickshadereffectnode_p.h>
 #include "qquickshadereffectmesh_p.h"
@@ -55,8 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 const char *qtPositionAttributeName();
 const char *qtTexCoordAttributeName();
 
diff --git a/src/declarative/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp
index 7709bed614..3154ac7cfd 100644
--- a/src/declarative/items/qquickshadereffectmesh.cpp
+++ b/src/quick/items/qquickshadereffectmesh.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickshadereffectmesh_p.h"
-#include "qsggeometry.h"
+#include <QtQuick/qsggeometry.h>
 #include "qquickshadereffect_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h
index 40549f73a8..1671fd53f9 100644
--- a/src/declarative/items/qquickshadereffectmesh_p.h
+++ b/src/quick/items/qquickshadereffectmesh_p.h
@@ -41,6 +41,7 @@
 
 #include "qdeclarativeparserstatus.h"
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtGui/qcolor.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qsize.h>
@@ -54,12 +55,10 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGGeometry;
 class QRectF;
 
-class Q_DECLARATIVE_EXPORT QQuickShaderEffectMesh : public QObject
+class Q_QUICK_EXPORT QQuickShaderEffectMesh : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 43c891e497..02b49b94c5 100644
--- a/src/declarative/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -42,8 +42,8 @@
 #include <private/qquickshadereffectnode_p.h>
 
 #include "qquickshadereffectmesh_p.h"
-#include <private/qsgtextureprovider_p.h>
-#include <private/qsgrenderer_p.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
+#include <QtQuick/private/qsgrenderer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h
index 50213ff396..abcd4a9b8e 100644
--- a/src/declarative/items/qquickshadereffectnode_p.h
+++ b/src/quick/items/qquickshadereffectnode_p.h
@@ -42,10 +42,10 @@
 #ifndef QQUICKSHADEREFFECTNODE_P_H
 #define QQUICKSHADEREFFECTNODE_P_H
 
-#include "qsgnode.h"
-#include "qsgmaterial.h"
-#include <private/qsgtextureprovider_p.h>
-#include <qquickitem.h>
+#include <QtQuick/qsgnode.h>
+#include <QtQuick/qsgmaterial.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
+#include <QtQuick/qquickitem.h>
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qpointer.h>
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 struct QQuickShaderEffectMaterialKey {
     QByteArray vertexCode;
     QByteArray fragmentCode;
diff --git a/src/declarative/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index 952f240cd3..e8be7bde85 100644
--- a/src/declarative/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -44,11 +44,11 @@
 #include "qquickitem_p.h"
 #include "qquickcanvas_p.h"
 #include <private/qsgadaptationlayer_p.h>
-#include <private/qsgrenderer_p.h>
+#include <QtQuick/private/qsgrenderer_p.h>
 
 #include "qopenglframebufferobject.h"
 #include "qmath.h"
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index fee361c27c..b648cb5614 100644
--- a/src/declarative/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -43,9 +43,9 @@
 #define QQUICKSHADEREFFECTSOURCE_P_H
 
 #include "qquickitem.h"
-#include <private/qsgtextureprovider_p.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
 #include <private/qsgadaptationlayer_p.h>
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgdefaultimagenode_p.h>
 #include <private/qquickitemchangelistener_p.h>
 
@@ -59,8 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGNode;
 class UpdatePaintNodeData;
 class QOpenGLFramebufferObject;
@@ -78,7 +76,7 @@ private Q_SLOTS:
     void markDirtyTexture();
 };
 
-class Q_DECLARATIVE_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture
+class Q_QUICK_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture
 {
     Q_OBJECT
 public:
@@ -154,7 +152,7 @@ private:
     uint m_grab : 1;
 };
 
-class Q_DECLARATIVE_EXPORT QQuickShaderEffectSource : public QQuickItem, public QQuickItemChangeListener
+class Q_QUICK_EXPORT QQuickShaderEffectSource : public QQuickItem, public QQuickItemChangeListener
 {
     Q_OBJECT
     Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged)
diff --git a/src/declarative/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index b476905269..b476905269 100644
--- a/src/declarative/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
diff --git a/src/declarative/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h
index e7f3bbce80..a3921ed96a 100644
--- a/src/declarative/items/qquicksprite_p.h
+++ b/src/quick/items/qquicksprite_p.h
@@ -52,9 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickSprite : public QQuickStochasticState
 {
     Q_OBJECT
diff --git a/src/declarative/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index c25ccf3487..c25ccf3487 100644
--- a/src/declarative/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
diff --git a/src/declarative/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h
index 1040140a28..283ee17c96 100644
--- a/src/declarative/items/qquickspriteengine_p.h
+++ b/src/quick/items/qquickspriteengine_p.h
@@ -55,8 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickSprite;
 class Q_AUTOTEST_EXPORT QQuickStochasticState : public QObject //For internal use
 {
diff --git a/src/declarative/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp
index a18d0f95c7..1da46f2ae8 100644
--- a/src/declarative/items/qquickspriteimage.cpp
+++ b/src/quick/items/qquickspriteimage.cpp
@@ -42,13 +42,13 @@
 #include "qquickspriteimage_p.h"
 #include "qquicksprite_p.h"
 #include "qquickspriteengine_p.h"
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
-#include <qsgnode.h>
-#include <qsgengine.h>
-#include <qsgtexturematerial.h>
-#include <qsgtexture.h>
-#include <qquickcanvas.h>
+#include <QtQuick/qsgnode.h>
+#include <QtQuick/qsgengine.h>
+#include <QtQuick/qsgtexturematerial.h>
+#include <QtQuick/qsgtexture.h>
+#include <QtQuick/qquickcanvas.h>
 #include <QFile>
 #include <cmath>
 #include <qmath.h>
diff --git a/src/declarative/items/qquickspriteimage_p.h b/src/quick/items/qquickspriteimage_p.h
index 39384cedca..fb5c115961 100644
--- a/src/declarative/items/qquickspriteimage_p.h
+++ b/src/quick/items/qquickspriteimage_p.h
@@ -42,15 +42,13 @@
 #ifndef QQUICKSPRITEIMAGE_P_H
 #define QQUICKSPRITEIMAGE_P_H
 
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
 #include <QTime>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGContext;
 class QQuickSprite;
 class QQuickSpriteEngine;
diff --git a/src/declarative/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index 8c53e0a63f..8c53e0a63f 100644
--- a/src/declarative/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
diff --git a/src/declarative/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index 7844c6d7dd..3454ac1e11 100644
--- a/src/declarative/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -46,7 +46,7 @@
 #include "qquickitem.h"
 #include "qquickanchors_p.h"
 
-#include <private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
 
 #include <QtDeclarative/qdeclarativescriptstring.h>
 
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParentChangePrivate;
 class Q_AUTOTEST_EXPORT QQuickParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent
 {
diff --git a/src/declarative/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 630b466d80..d01512740d 100644
--- a/src/declarative/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -42,11 +42,11 @@
 #include "qquicktext_p.h"
 #include "qquicktext_p_p.h"
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include "qquicktextnode_p.h"
 #include "qquickimage_p_p.h"
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtGui/qevent.h>
@@ -58,7 +58,7 @@
 #include <QtGui/qguiapplication.h>
 
 #include <private/qdeclarativestyledtext_p.h>
-#include <private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
 
 #include <qmath.h>
 #include <limits.h>
diff --git a/src/declarative/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index be77f2eb45..3a9f691c53 100644
--- a/src/declarative/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -45,7 +45,7 @@
 
 #include "qquickimplicitsizeitem_p.h"
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquickglobal_p.h>
 
 #include <QtGui/qtextoption.h>
 
@@ -53,10 +53,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class QQuickTextPrivate;
 class QQuickTextLine;
-class Q_DECLARATIVE_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem
+class Q_QUICK_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(HAlignment)
diff --git a/src/declarative/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index 2035f47a9d..2035f47a9d 100644
--- a/src/declarative/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
diff --git a/src/declarative/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index b40b5c09a1..c43a5be14c 100644
--- a/src/declarative/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -44,7 +44,7 @@
 #include "qquickevents_p_p.h"
 #include "qquickcanvas.h"
 #include "qquicktextnode_p.h"
-#include "qsgsimplerectnode.h"
+#include <QtQuick/qsgsimplerectnode.h>
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtGui/qguiapplication.h>
@@ -56,7 +56,7 @@
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qtextcontrol_p.h>
 #include <private/qtextengine_p.h>
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 #include <private/qsgadaptationlayer_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h
index 25988959f6..e234d6ef95 100644
--- a/src/declarative/items/qquicktextedit_p.h
+++ b/src/quick/items/qquicktextedit_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickTextEditPrivate;
 class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem
 {
diff --git a/src/declarative/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h
index 7bcbe2a189..7bcbe2a189 100644
--- a/src/declarative/items/qquicktextedit_p_p.h
+++ b/src/quick/items/qquicktextedit_p_p.h
diff --git a/src/declarative/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index f3cdc8835a..e9caaf2ee8 100644
--- a/src/declarative/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -49,7 +49,7 @@
 #include <QtGui/qevent.h>
 #include <QTextBoundaryFinder>
 #include "qquicktextnode_p.h"
-#include <qsgsimplerectnode.h>
+#include <QtQuick/qsgsimplerectnode.h>
 
 #include <QtGui/qstylehints.h>
 #include <QtGui/qinputpanel.h>
diff --git a/src/declarative/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index 493788ec84..3ea86477a1 100644
--- a/src/declarative/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickTextInputPrivate;
 class QValidator;
 class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
diff --git a/src/declarative/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index 900b0804bb..900b0804bb 100644
--- a/src/declarative/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
diff --git a/src/declarative/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index 56c3b54cd7..bfb3591d04 100644
--- a/src/declarative/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include "qquicktextnode_p.h"
-#include "qsgsimplerectnode.h"
+#include <QtQuick/qsgsimplerectnode.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qsgdistancefieldglyphnode_p.h>
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 
 #include <QtCore/qpoint.h>
 #include <qmath.h>
diff --git a/src/declarative/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h
index 16e92e34f3..a519322160 100644
--- a/src/declarative/items/qquicktextnode_p.h
+++ b/src/quick/items/qquicktextnode_p.h
@@ -42,7 +42,7 @@
 #ifndef QQUICKTEXTNODE_P_H
 #define QQUICKTEXTNODE_P_H
 
-#include <qsgnode.h>
+#include <QtQuick/qsgnode.h>
 #include "qquicktext_p.h"
 #include <qglyphrun.h>
 
diff --git a/src/declarative/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp
index 7347cb0624..7347cb0624 100644
--- a/src/declarative/items/qquicktranslate.cpp
+++ b/src/quick/items/qquicktranslate.cpp
diff --git a/src/declarative/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h
index 6c2333df34..ccfbb4c4e3 100644
--- a/src/declarative/items/qquicktranslate_p.h
+++ b/src/quick/items/qquicktranslate_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickTranslatePrivate;
 class Q_AUTOTEST_EXPORT QQuickTranslate : public QQuickTransform
 {
diff --git a/src/declarative/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index 9d431c865a..8c7db60195 100644
--- a/src/declarative/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -116,6 +116,8 @@ void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF
     \since QtQuick 2.0
     \brief The QQuickView class provides a window for displaying a Qt Quick user interface.
 
+    \inmodule QtQuick
+
     This is a convenience subclass of QQuickCanvas which
     will automatically load and display a QML scene when given the URL of the main source file. Alternatively,
     you can instantiate your own objects using QDeclarativeComponent and place them in a manually setup QQuickCanvas.
diff --git a/src/declarative/items/qquickview.h b/src/quick/items/qquickview.h
index 8321655d63..3c637689d3 100644
--- a/src/declarative/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -43,7 +43,7 @@
 #ifndef QQUICKVIEW_H
 #define QQUICKVIEW_H
 
-#include <qquickcanvas.h>
+#include <QtQuick/qquickcanvas.h>
 #include <QtCore/qurl.h>
 #include <QtDeclarative/qdeclarativedebug.h>
 
@@ -51,15 +51,13 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeEngine;
 class QDeclarativeContext;
 class QDeclarativeError;
 class QQuickItem;
 
 class QQuickViewPrivate;
-class Q_DECLARATIVE_EXPORT QQuickView : public QQuickCanvas
+class Q_QUICK_EXPORT QQuickView : public QQuickCanvas
 {
     Q_OBJECT
     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
diff --git a/src/declarative/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 8c835268f5..dbc02be094 100644
--- a/src/declarative/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeContext;
 class QDeclarativeError;
 class QQuickItem;
diff --git a/src/declarative/items/qquickvisualadaptormodel.cpp b/src/quick/items/qquickvisualadaptormodel.cpp
index 25baee6e29..25baee6e29 100644
--- a/src/declarative/items/qquickvisualadaptormodel.cpp
+++ b/src/quick/items/qquickvisualadaptormodel.cpp
diff --git a/src/declarative/items/qquickvisualadaptormodel_p.h b/src/quick/items/qquickvisualadaptormodel_p.h
index 31eba503ea..31eba503ea 100644
--- a/src/declarative/items/qquickvisualadaptormodel_p.h
+++ b/src/quick/items/qquickvisualadaptormodel_p.h
diff --git a/src/declarative/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp
index 649ca6f96b..649ca6f96b 100644
--- a/src/declarative/items/qquickvisualdatamodel.cpp
+++ b/src/quick/items/qquickvisualdatamodel.cpp
diff --git a/src/declarative/items/qquickvisualdatamodel_p.h b/src/quick/items/qquickvisualdatamodel_p.h
index a5a384f67b..9e5e3a4511 100644
--- a/src/declarative/items/qquickvisualdatamodel_p.h
+++ b/src/quick/items/qquickvisualdatamodel_p.h
@@ -58,9 +58,6 @@ Q_DECLARE_METATYPE(QModelIndex)
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QDeclarativeChangeSet;
 class QDeclarativeComponent;
 class QDeclarativePackage;
@@ -70,7 +67,7 @@ class QQuickVisualDataModelAttached;
 class QQuickVisualDataModelPrivate;
 
 
-class Q_DECLARATIVE_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QDeclarativeParserStatus
+class Q_QUICK_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickVisualDataModel)
diff --git a/src/declarative/items/qquickvisualitemmodel.cpp b/src/quick/items/qquickvisualitemmodel.cpp
index 78c4f8868b..78c4f8868b 100644
--- a/src/declarative/items/qquickvisualitemmodel.cpp
+++ b/src/quick/items/qquickvisualitemmodel.cpp
diff --git a/src/declarative/items/qquickvisualitemmodel_p.h b/src/quick/items/qquickvisualitemmodel_p.h
index 3d9610abe9..c00f841572 100644
--- a/src/declarative/items/qquickvisualitemmodel_p.h
+++ b/src/quick/items/qquickvisualitemmodel_p.h
@@ -43,6 +43,7 @@
 #ifndef QQUICKVISUALITEMMODEL_P_H
 #define QQUICKVISUALITEMMODEL_P_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtCore/qobject.h>
 
@@ -50,12 +51,10 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickItem;
 class QDeclarativeChangeSet;
 
-class Q_DECLARATIVE_EXPORT QQuickVisualModel : public QObject
+class Q_QUICK_EXPORT QQuickVisualModel : public QObject
 {
     Q_OBJECT
 
@@ -93,7 +92,7 @@ private:
 
 class QQuickVisualItemModelAttached;
 class QQuickVisualItemModelPrivate;
-class Q_DECLARATIVE_EXPORT QQuickVisualItemModel : public QQuickVisualModel
+class Q_QUICK_EXPORT QQuickVisualItemModel : public QQuickVisualModel
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickVisualItemModel)
diff --git a/src/declarative/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
index 7a7f28cb43..726ea055d8 100644
--- a/src/declarative/items/qquickwindowmodule.cpp
+++ b/src/quick/items/qquickwindowmodule.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickwindowmodule_p.h"
-#include <QQuickCanvas>
+#include <QtQuick/QQuickCanvas>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index ead15942b9..ead15942b9 100644
--- a/src/declarative/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
diff --git a/src/declarative/items/syncexcludes b/src/quick/items/syncexcludes
index ab7a374a5b..ab7a374a5b 100644
--- a/src/declarative/items/syncexcludes
+++ b/src/quick/items/syncexcludes
diff --git a/src/declarative/particles/particleresources/noise.png b/src/quick/particles/particleresources/noise.png
index 3c723e1a5a..3c723e1a5a 100644
--- a/src/declarative/particles/particleresources/noise.png
+++ b/src/quick/particles/particleresources/noise.png
diff --git a/src/declarative/particles/particles.pri b/src/quick/particles/particles.pri
index 3a40a3b911..3a40a3b911 100644
--- a/src/declarative/particles/particles.pri
+++ b/src/quick/particles/particles.pri
diff --git a/src/declarative/particles/particles.qrc b/src/quick/particles/particles.qrc
index 344f9489a4..344f9489a4 100644
--- a/src/declarative/particles/particles.qrc
+++ b/src/quick/particles/particles.qrc
diff --git a/src/declarative/particles/qquickage.cpp b/src/quick/particles/qquickage.cpp
index a71b9e2088..a71b9e2088 100644
--- a/src/declarative/particles/qquickage.cpp
+++ b/src/quick/particles/qquickage.cpp
diff --git a/src/declarative/particles/qquickage_p.h b/src/quick/particles/qquickage_p.h
index 0adbddabe9..b3fd3c65f4 100644
--- a/src/declarative/particles/qquickage_p.h
+++ b/src/quick/particles/qquickage_p.h
@@ -47,9 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickAgeAffector : public QQuickParticleAffector
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickangledirection.cpp b/src/quick/particles/qquickangledirection.cpp
index 9ce422e8d1..9ce422e8d1 100644
--- a/src/declarative/particles/qquickangledirection.cpp
+++ b/src/quick/particles/qquickangledirection.cpp
diff --git a/src/declarative/particles/qquickangledirection_p.h b/src/quick/particles/qquickangledirection_p.h
index 7baf1a6c60..c0de933c00 100644
--- a/src/declarative/particles/qquickangledirection_p.h
+++ b/src/quick/particles/qquickangledirection_p.h
@@ -46,8 +46,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickAngleDirection : public QQuickDirection
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickcumulativedirection.cpp b/src/quick/particles/qquickcumulativedirection.cpp
index 2f09ea4505..2f09ea4505 100644
--- a/src/declarative/particles/qquickcumulativedirection.cpp
+++ b/src/quick/particles/qquickcumulativedirection.cpp
diff --git a/src/declarative/particles/qquickcumulativedirection_p.h b/src/quick/particles/qquickcumulativedirection_p.h
index af657821c2..cae491cafe 100644
--- a/src/declarative/particles/qquickcumulativedirection_p.h
+++ b/src/quick/particles/qquickcumulativedirection_p.h
@@ -47,8 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickCumulativeDirection : public QQuickDirection
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickcustomaffector.cpp b/src/quick/particles/qquickcustomaffector.cpp
index 80e2eaf268..80e2eaf268 100644
--- a/src/declarative/particles/qquickcustomaffector.cpp
+++ b/src/quick/particles/qquickcustomaffector.cpp
diff --git a/src/declarative/particles/qquickcustomaffector_p.h b/src/quick/particles/qquickcustomaffector_p.h
index e347107f50..740b0a6773 100644
--- a/src/declarative/particles/qquickcustomaffector_p.h
+++ b/src/quick/particles/qquickcustomaffector_p.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickCustomAffector : public QQuickParticleAffector
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickcustomparticle.cpp b/src/quick/particles/qquickcustomparticle.cpp
index 153dd273b6..e6f50c0ff6 100644
--- a/src/declarative/particles/qquickcustomparticle.cpp
+++ b/src/quick/particles/qquickcustomparticle.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickcustomparticle_p.h"
-#include <private/qquickshadereffectmesh_p.h>
+#include <QtQuick/private/qquickshadereffectmesh_p.h>
 #include <cstdlib>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/particles/qquickcustomparticle_p.h b/src/quick/particles/qquickcustomparticle_p.h
index b3cf6d3e42..583e61fa39 100644
--- a/src/declarative/particles/qquickcustomparticle_p.h
+++ b/src/quick/particles/qquickcustomparticle_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGNode;
 struct PlainVertices;
 
diff --git a/src/declarative/particles/qquickdirection.cpp b/src/quick/particles/qquickdirection.cpp
index babd35de9f..babd35de9f 100644
--- a/src/declarative/particles/qquickdirection.cpp
+++ b/src/quick/particles/qquickdirection.cpp
diff --git a/src/declarative/particles/qquickdirection_p.h b/src/quick/particles/qquickdirection_p.h
index ac2ecdf9c1..ecfb84d90f 100644
--- a/src/declarative/particles/qquickdirection_p.h
+++ b/src/quick/particles/qquickdirection_p.h
@@ -49,9 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickDirection : public QObject
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickellipseextruder.cpp b/src/quick/particles/qquickellipseextruder.cpp
index 479bbb4aa7..479bbb4aa7 100644
--- a/src/declarative/particles/qquickellipseextruder.cpp
+++ b/src/quick/particles/qquickellipseextruder.cpp
diff --git a/src/declarative/particles/qquickellipseextruder_p.h b/src/quick/particles/qquickellipseextruder_p.h
index 08e7e73d18..77c117a3d5 100644
--- a/src/declarative/particles/qquickellipseextruder_p.h
+++ b/src/quick/particles/qquickellipseextruder_p.h
@@ -47,9 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickEllipseExtruder : public QQuickParticleExtruder
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickfriction.cpp b/src/quick/particles/qquickfriction.cpp
index c060deb95f..c060deb95f 100644
--- a/src/declarative/particles/qquickfriction.cpp
+++ b/src/quick/particles/qquickfriction.cpp
diff --git a/src/declarative/particles/qquickfriction_p.h b/src/quick/particles/qquickfriction_p.h
index c2f227692c..0eaed34783 100644
--- a/src/declarative/particles/qquickfriction_p.h
+++ b/src/quick/particles/qquickfriction_p.h
@@ -47,9 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickFrictionAffector : public QQuickParticleAffector
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickgravity.cpp b/src/quick/particles/qquickgravity.cpp
index fd2fb92a53..fd2fb92a53 100644
--- a/src/declarative/particles/qquickgravity.cpp
+++ b/src/quick/particles/qquickgravity.cpp
diff --git a/src/declarative/particles/qquickgravity_p.h b/src/quick/particles/qquickgravity_p.h
index 65f8e5a19d..a9faf43349 100644
--- a/src/declarative/particles/qquickgravity_p.h
+++ b/src/quick/particles/qquickgravity_p.h
@@ -47,9 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickGravityAffector : public QQuickParticleAffector
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickgroupgoal.cpp b/src/quick/particles/qquickgroupgoal.cpp
index 1d8a3d980c..1d8a3d980c 100644
--- a/src/declarative/particles/qquickgroupgoal.cpp
+++ b/src/quick/particles/qquickgroupgoal.cpp
diff --git a/src/declarative/particles/qquickgroupgoal_p.h b/src/quick/particles/qquickgroupgoal_p.h
index 51ce1ff24e..a24d89dfb5 100644
--- a/src/declarative/particles/qquickgroupgoal_p.h
+++ b/src/quick/particles/qquickgroupgoal_p.h
@@ -47,8 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickStochasticEngine;
 
 class QQuickGroupGoalAffector : public QQuickParticleAffector
diff --git a/src/declarative/particles/qquickimageparticle.cpp b/src/quick/particles/qquickimageparticle.cpp
index 5f31440441..3453dd6ed3 100644
--- a/src/declarative/particles/qquickimageparticle.cpp
+++ b/src/quick/particles/qquickimageparticle.cpp
@@ -39,19 +39,20 @@
 **
 ****************************************************************************/
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
-#include <qsgnode.h>
-#include <qsgtexturematerial.h>
-#include <qsgtexture.h>
+#include <QtQuick/qsgnode.h>
+#include <QtQuick/qsgtexturematerial.h>
+#include <QtQuick/qsgtexture.h>
 #include <QFile>
 #include "qquickimageparticle_p.h"
 #include "qquickparticleemitter_p.h"
 #include <private/qquicksprite_p.h>
 #include <private/qquickspriteengine_p.h>
 #include <QOpenGLFunctions>
-#include <qsgengine.h>
-#include <private/qsgtexture_p.h>
+#include <QtQuick/qsgengine.h>
+#include <QtQuick/private/qsgtexture_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 //###Switch to define later, for now user-friendly (no compilation) debugging is worth it
diff --git a/src/declarative/particles/qquickimageparticle_p.h b/src/quick/particles/qquickimageparticle_p.h
index c7da7cfce6..61c24ed836 100644
--- a/src/declarative/particles/qquickimageparticle_p.h
+++ b/src/quick/particles/qquickimageparticle_p.h
@@ -44,15 +44,13 @@
 #include "qquickparticlepainter_p.h"
 #include "qquickdirection_p.h"
 #include <QDeclarativeListProperty>
-#include <qsgsimplematerial.h>
+#include <QtQuick/qsgsimplematerial.h>
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class ImageMaterialData;
 class QSGGeometryNode;
 
diff --git a/src/declarative/particles/qquickitemparticle.cpp b/src/quick/particles/qquickitemparticle.cpp
index 8b39ac3abd..14ca085469 100644
--- a/src/declarative/particles/qquickitemparticle.cpp
+++ b/src/quick/particles/qquickitemparticle.cpp
@@ -41,7 +41,7 @@
 
 #include "qquickitemparticle_p.h"
 #include <private/qquickvisualitemmodel_p.h>
-#include <qsgnode.h>
+#include <QtQuick/qsgnode.h>
 #include <QTimer>
 #include <QDeclarativeComponent>
 #include <QDebug>
diff --git a/src/declarative/particles/qquickitemparticle_p.h b/src/quick/particles/qquickitemparticle_p.h
index 2e92b9c9ae..33d2bcfb4b 100644
--- a/src/declarative/particles/qquickitemparticle_p.h
+++ b/src/quick/particles/qquickitemparticle_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class QQuickVisualDataModel;
 class QQuickItemParticleAttached;
 
diff --git a/src/declarative/particles/qquicklineextruder.cpp b/src/quick/particles/qquicklineextruder.cpp
index 73413537cc..73413537cc 100644
--- a/src/declarative/particles/qquicklineextruder.cpp
+++ b/src/quick/particles/qquicklineextruder.cpp
diff --git a/src/declarative/particles/qquicklineextruder_p.h b/src/quick/particles/qquicklineextruder_p.h
index 8258b26043..8258b26043 100644
--- a/src/declarative/particles/qquicklineextruder_p.h
+++ b/src/quick/particles/qquicklineextruder_p.h
diff --git a/src/declarative/particles/qquickmaskextruder.cpp b/src/quick/particles/qquickmaskextruder.cpp
index f4850712f0..f4850712f0 100644
--- a/src/declarative/particles/qquickmaskextruder.cpp
+++ b/src/quick/particles/qquickmaskextruder.cpp
diff --git a/src/declarative/particles/qquickmaskextruder_p.h b/src/quick/particles/qquickmaskextruder_p.h
index 9430321e50..180bcf26e2 100644
--- a/src/declarative/particles/qquickmaskextruder_p.h
+++ b/src/quick/particles/qquickmaskextruder_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickMaskExtruder : public QQuickParticleExtruder
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickparticleaffector.cpp b/src/quick/particles/qquickparticleaffector.cpp
index 5bfc699548..5bfc699548 100644
--- a/src/declarative/particles/qquickparticleaffector.cpp
+++ b/src/quick/particles/qquickparticleaffector.cpp
diff --git a/src/declarative/particles/qquickparticleaffector_p.h b/src/quick/particles/qquickparticleaffector_p.h
index d254759ff6..94eba70ae4 100644
--- a/src/declarative/particles/qquickparticleaffector_p.h
+++ b/src/quick/particles/qquickparticleaffector_p.h
@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParticleAffector : public QQuickItem
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickparticleemitter.cpp b/src/quick/particles/qquickparticleemitter.cpp
index f227256f1b..f227256f1b 100644
--- a/src/declarative/particles/qquickparticleemitter.cpp
+++ b/src/quick/particles/qquickparticleemitter.cpp
diff --git a/src/declarative/particles/qquickparticleemitter_p.h b/src/quick/particles/qquickparticleemitter_p.h
index 2d725e5c9e..bfdb63eef7 100644
--- a/src/declarative/particles/qquickparticleemitter_p.h
+++ b/src/quick/particles/qquickparticleemitter_p.h
@@ -42,7 +42,7 @@
 #ifndef PARTICLEEMITTER_H
 #define PARTICLEEMITTER_H
 
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
 #include <QDebug>
 #include "qquickparticlesystem_p.h"
 #include "qquickparticleextruder_p.h"
@@ -55,8 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParticleEmitter : public QQuickItem
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickparticleextruder.cpp b/src/quick/particles/qquickparticleextruder.cpp
index 8b25de26be..8b25de26be 100644
--- a/src/declarative/particles/qquickparticleextruder.cpp
+++ b/src/quick/particles/qquickparticleextruder.cpp
diff --git a/src/declarative/particles/qquickparticleextruder_p.h b/src/quick/particles/qquickparticleextruder_p.h
index 7969abad7c..d1f7008a31 100644
--- a/src/declarative/particles/qquickparticleextruder_p.h
+++ b/src/quick/particles/qquickparticleextruder_p.h
@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParticleExtruder : public QObject
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickparticlegroup.cpp b/src/quick/particles/qquickparticlegroup.cpp
index 5486339611..5486339611 100644
--- a/src/declarative/particles/qquickparticlegroup.cpp
+++ b/src/quick/particles/qquickparticlegroup.cpp
diff --git a/src/declarative/particles/qquickparticlegroup_p.h b/src/quick/particles/qquickparticlegroup_p.h
index 547e7fc597..547e7fc597 100644
--- a/src/declarative/particles/qquickparticlegroup_p.h
+++ b/src/quick/particles/qquickparticlegroup_p.h
diff --git a/src/declarative/particles/qquickparticlepainter.cpp b/src/quick/particles/qquickparticlepainter.cpp
index 812c4b86dc..812c4b86dc 100644
--- a/src/declarative/particles/qquickparticlepainter.cpp
+++ b/src/quick/particles/qquickparticlepainter.cpp
diff --git a/src/declarative/particles/qquickparticlepainter_p.h b/src/quick/particles/qquickparticlepainter_p.h
index e80d68fa09..44aac3466f 100644
--- a/src/declarative/particles/qquickparticlepainter_p.h
+++ b/src/quick/particles/qquickparticlepainter_p.h
@@ -51,9 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickParticlePainter : public QQuickItem
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickparticlesmodule.cpp b/src/quick/particles/qquickparticlesmodule.cpp
index 26439c4f50..26439c4f50 100644
--- a/src/declarative/particles/qquickparticlesmodule.cpp
+++ b/src/quick/particles/qquickparticlesmodule.cpp
diff --git a/src/declarative/particles/qquickparticlesmodule_p.h b/src/quick/particles/qquickparticlesmodule_p.h
index afea56293b..e553b23558 100644
--- a/src/declarative/particles/qquickparticlesmodule_p.h
+++ b/src/quick/particles/qquickparticlesmodule_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParticlesModule
 {
 public:
diff --git a/src/declarative/particles/qquickparticlesystem.cpp b/src/quick/particles/qquickparticlesystem.cpp
index 9e6bafab20..9df086a045 100644
--- a/src/declarative/particles/qquickparticlesystem.cpp
+++ b/src/quick/particles/qquickparticlesystem.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickparticlesystem_p.h"
-#include <qsgnode.h>
+#include <QtQuick/qsgnode.h>
 #include "qquickparticleemitter_p.h"
 #include "qquickparticleaffector_p.h"
 #include "qquickparticlepainter_p.h"
diff --git a/src/declarative/particles/qquickparticlesystem_p.h b/src/quick/particles/qquickparticlesystem_p.h
index 791770af11..6a3403aa93 100644
--- a/src/declarative/particles/qquickparticlesystem_p.h
+++ b/src/quick/particles/qquickparticlesystem_p.h
@@ -42,7 +42,7 @@
 #ifndef PARTICLESYSTEM_H
 #define PARTICLESYSTEM_H
 
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
 #include <QElapsedTimer>
 #include <QVector>
 #include <QHash>
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParticleSystem;
 class QQuickParticleAffector;
 class QQuickParticleEmitter;
diff --git a/src/declarative/particles/qquickpointattractor.cpp b/src/quick/particles/qquickpointattractor.cpp
index d96458c8bb..d96458c8bb 100644
--- a/src/declarative/particles/qquickpointattractor.cpp
+++ b/src/quick/particles/qquickpointattractor.cpp
diff --git a/src/declarative/particles/qquickpointattractor_p.h b/src/quick/particles/qquickpointattractor_p.h
index b488e132e3..6c36b299bf 100644
--- a/src/declarative/particles/qquickpointattractor_p.h
+++ b/src/quick/particles/qquickpointattractor_p.h
@@ -47,8 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickAttractorAffector : public QQuickParticleAffector
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickpointdirection.cpp b/src/quick/particles/qquickpointdirection.cpp
index 22c33d9f15..22c33d9f15 100644
--- a/src/declarative/particles/qquickpointdirection.cpp
+++ b/src/quick/particles/qquickpointdirection.cpp
diff --git a/src/declarative/particles/qquickpointdirection_p.h b/src/quick/particles/qquickpointdirection_p.h
index 29ee7cb613..1a6becda7a 100644
--- a/src/declarative/particles/qquickpointdirection_p.h
+++ b/src/quick/particles/qquickpointdirection_p.h
@@ -47,8 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickPointDirection : public QQuickDirection
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickrectangleextruder.cpp b/src/quick/particles/qquickrectangleextruder.cpp
index d840a08d5b..d840a08d5b 100644
--- a/src/declarative/particles/qquickrectangleextruder.cpp
+++ b/src/quick/particles/qquickrectangleextruder.cpp
diff --git a/src/declarative/particles/qquickrectangleextruder_p.h b/src/quick/particles/qquickrectangleextruder_p.h
index ec8caaeec1..13491b9501 100644
--- a/src/declarative/particles/qquickrectangleextruder_p.h
+++ b/src/quick/particles/qquickrectangleextruder_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickRectangleExtruder : public QQuickParticleExtruder
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickspritegoal.cpp b/src/quick/particles/qquickspritegoal.cpp
index 7c839dbf53..7c839dbf53 100644
--- a/src/declarative/particles/qquickspritegoal.cpp
+++ b/src/quick/particles/qquickspritegoal.cpp
diff --git a/src/declarative/particles/qquickspritegoal_p.h b/src/quick/particles/qquickspritegoal_p.h
index b979772a78..3dc4cf88ca 100644
--- a/src/declarative/particles/qquickspritegoal_p.h
+++ b/src/quick/particles/qquickspritegoal_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickStochasticEngine;
 
 class QQuickSpriteGoalAffector : public QQuickParticleAffector
diff --git a/src/declarative/particles/qquicktargetdirection.cpp b/src/quick/particles/qquicktargetdirection.cpp
index eb2eb16c6e..eb2eb16c6e 100644
--- a/src/declarative/particles/qquicktargetdirection.cpp
+++ b/src/quick/particles/qquicktargetdirection.cpp
diff --git a/src/declarative/particles/qquicktargetdirection_p.h b/src/quick/particles/qquicktargetdirection_p.h
index 2fc62b3ad8..32b5cb0038 100644
--- a/src/declarative/particles/qquicktargetdirection_p.h
+++ b/src/quick/particles/qquicktargetdirection_p.h
@@ -46,8 +46,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickItem;
 class QQuickTargetDirection : public QQuickDirection
 {
diff --git a/src/declarative/particles/qquicktrailemitter.cpp b/src/quick/particles/qquicktrailemitter.cpp
index 272a3ebf84..272a3ebf84 100644
--- a/src/declarative/particles/qquicktrailemitter.cpp
+++ b/src/quick/particles/qquicktrailemitter.cpp
diff --git a/src/declarative/particles/qquicktrailemitter_p.h b/src/quick/particles/qquicktrailemitter_p.h
index ad94d7107d..871d8b1b69 100644
--- a/src/declarative/particles/qquicktrailemitter_p.h
+++ b/src/quick/particles/qquicktrailemitter_p.h
@@ -48,9 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickTrailEmitter : public QQuickParticleEmitter
 {
     Q_OBJECT
diff --git a/src/declarative/particles/qquickturbulence.cpp b/src/quick/particles/qquickturbulence.cpp
index 0afd827af1..0afd827af1 100644
--- a/src/declarative/particles/qquickturbulence.cpp
+++ b/src/quick/particles/qquickturbulence.cpp
diff --git a/src/declarative/particles/qquickturbulence_p.h b/src/quick/particles/qquickturbulence_p.h
index dc72f40eff..b7eb7e662f 100644
--- a/src/declarative/particles/qquickturbulence_p.h
+++ b/src/quick/particles/qquickturbulence_p.h
@@ -48,9 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QQuickParticlePainter;
 
 class QQuickTurbulenceAffector : public QQuickParticleAffector
diff --git a/src/declarative/particles/qquickv8particledata.cpp b/src/quick/particles/qquickv8particledata.cpp
index 80ce355cd7..80ce355cd7 100644
--- a/src/declarative/particles/qquickv8particledata.cpp
+++ b/src/quick/particles/qquickv8particledata.cpp
diff --git a/src/declarative/particles/qquickv8particledata_p.h b/src/quick/particles/qquickv8particledata_p.h
index 811974c132..f94a987aac 100644
--- a/src/declarative/particles/qquickv8particledata_p.h
+++ b/src/quick/particles/qquickv8particledata_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QQuickParticleData;
 class QQuickV8ParticleData {
 public:
diff --git a/src/declarative/particles/qquickwander.cpp b/src/quick/particles/qquickwander.cpp
index dfbff36076..dfbff36076 100644
--- a/src/declarative/particles/qquickwander.cpp
+++ b/src/quick/particles/qquickwander.cpp
diff --git a/src/declarative/particles/qquickwander_p.h b/src/quick/particles/qquickwander_p.h
index 99515fe629..f8a28e57e4 100644
--- a/src/declarative/particles/qquickwander_p.h
+++ b/src/quick/particles/qquickwander_p.h
@@ -48,9 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 struct WanderData{
     qreal x_vel;
     qreal y_vel;
diff --git a/src/declarative/qtquick2.cpp b/src/quick/qtquick2.cpp
index ff49641865..f5839af583 100644
--- a/src/declarative/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -51,8 +51,8 @@
 #include <private/qdeclarativedebugstatesdelegate_p.h>
 #include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativecontext_p.h>
-#include <private/qdeclarativepropertychanges_p.h>
-#include <private/qdeclarativestate_p.h>
+#include <QtQuick/private/qdeclarativepropertychanges_p.h>
+#include <QtQuick/private/qdeclarativestate_p.h>
 #include <qdeclarativeproperty.h>
 #include <QtCore/QWeakPointer>
 
diff --git a/src/declarative/qtquick2_p.h b/src/quick/qtquick2_p.h
index 7e2b334124..4fa302dee6 100644
--- a/src/declarative/qtquick2_p.h
+++ b/src/quick/qtquick2_p.h
@@ -42,15 +42,13 @@
 #ifndef QTQUICK2_P_H
 #define QTQUICK2_P_H
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquickglobal_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeQtQuick2Module
+class Q_QUICK_PRIVATE_EXPORT QDeclarativeQtQuick2Module
 {
 public:
     static void defineModule();
diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h
new file mode 100644
index 0000000000..8619281f29
--- /dev/null
+++ b/src/quick/qtquickglobal.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTQUICKGLOBAL_H
+#define QTQUICKGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#  if defined(QT_MAKEDLL) /* create a Qt DLL library */
+#    if defined(QT_BUILD_QUICK_LIB)
+#      define Q_QUICK_EXPORT Q_DECL_EXPORT
+#    else
+#      define Q_QUICK_EXPORT Q_DECL_IMPORT
+#    endif
+#  elif defined(QT_DLL) /* use a Qt DLL library */
+#    define Q_QUICK_EXPORT Q_DECL_IMPORT
+#  endif
+#endif
+
+#if !defined(Q_QUICK_EXPORT)
+#  if defined(QT_SHARED)
+#    define Q_QUICK_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_QUICK_EXPORT
+#  endif
+#endif
+
+#endif // QTQUICKGLOBAL_H
diff --git a/src/quick/qtquickglobal_p.h b/src/quick/qtquickglobal_p.h
new file mode 100644
index 0000000000..6385645ead
--- /dev/null
+++ b/src/quick/qtquickglobal_p.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTQUICKGLOBAL_P_H
+#define QTQUICKGLOBAL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qtquickglobal.h"
+
+#define Q_QUICK_PRIVATE_EXPORT Q_QUICK_EXPORT
+
+#endif // QTQUICKGLOBAL_P_H
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
new file mode 100644
index 0000000000..b445e84248
--- /dev/null
+++ b/src/quick/quick.pro
@@ -0,0 +1,47 @@
+load(qt_module)
+
+TARGET = QtQuick
+
+CONFIG += module
+CONFIG += dll warn_on
+MODULE_PRI = ../../modules/qt_quick.pri
+
+QT = core-private gui gui-private network v8-private declarative declarative-private
+
+DEFINES   += QT_BUILD_QUICK_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
+solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+
+exists("qdeclarative_enable_gcov") {
+    QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
+    LIBS += -lgcov
+}
+
+load(qt_module_config)
+
+include(util/util.pri)
+include(scenegraph/scenegraph.pri)
+include(items/items.pri)
+include(particles/particles.pri)
+include(designer/designer.pri)
+
+HEADERS += \
+    qtquickglobal.h \
+    qtquickglobal_p.h \
+    qtquick2_p.h
+
+SOURCES += qtquick2.cpp
+
+mac {
+    # FIXME: this is a workaround for broken qmake logic in qtAddModule()
+    # This function refuses to use frameworks unless the framework exists on
+    # the filesystem at the time qmake is run, resulting in a build failure
+    # if QtQuick is qmaked before QtDeclarative is built and frameworks are
+    # in use. qtAddLibrary() contains correct logic to deal with this, so
+    # we'll explicitly call that for now.
+    load(qt)
+    LIBS -= -lQtDeclarative        # in non-framework builds, these should be re-added
+    LIBS -= -lQtDeclarative_debug  # within the qtAddLibrary if appropriate, so no
+    qtAddLibrary(QtDeclarative)    # harm done :)
+}
+
diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
index 56a6e0e5d9..56a6e0e5d9 100644
--- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
index 45cebdd7b9..a4c2ffbdbc 100644
--- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
@@ -50,10 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
-
 class QSGDefaultRenderer : public QSGRenderer
 {
     Q_OBJECT
diff --git a/src/declarative/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp
index 8661c9af93..8661c9af93 100644
--- a/src/declarative/scenegraph/coreapi/qsggeometry.cpp
+++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp
diff --git a/src/declarative/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h
index d7b343c108..aea6f0b94b 100644
--- a/src/declarative/scenegraph/coreapi/qsggeometry.h
+++ b/src/quick/scenegraph/coreapi/qsggeometry.h
@@ -42,6 +42,7 @@
 #ifndef QSGGEOMETRY_H
 #define QSGGEOMETRY_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtGui/qopengl.h>
 #include <QRectF>
 
@@ -49,11 +50,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGGeometryData;
 
-class Q_DECLARATIVE_EXPORT QSGGeometry
+class Q_QUICK_EXPORT QSGGeometry
 {
 public:
 
diff --git a/src/declarative/scenegraph/coreapi/qsggeometry_p.h b/src/quick/scenegraph/coreapi/qsggeometry_p.h
index ef2935ae4c..ef2935ae4c 100644
--- a/src/declarative/scenegraph/coreapi/qsggeometry_p.h
+++ b/src/quick/scenegraph/coreapi/qsggeometry_p.h
diff --git a/src/declarative/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 36b50e89b6..36b50e89b6 100644
--- a/src/declarative/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
diff --git a/src/declarative/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h
index 084219bfba..d8411b4d88 100644
--- a/src/declarative/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@ -42,20 +42,19 @@
 #ifndef MATERIAL_H
 #define MATERIAL_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <qopenglshaderprogram.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGMaterial;
 
-class Q_DECLARATIVE_EXPORT QSGMaterialShader
+class Q_QUICK_EXPORT QSGMaterialShader
 {
 public:
-    class Q_DECLARATIVE_EXPORT RenderState {
+    class Q_QUICK_EXPORT RenderState {
     public:
         enum DirtyState
         {
@@ -110,7 +109,7 @@ private:
 
 struct QSGMaterialType { };
 
-class Q_DECLARATIVE_EXPORT QSGMaterial
+class Q_QUICK_EXPORT QSGMaterial
 {
 public:
     enum Flag {
diff --git a/src/declarative/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 764071c190..2d6828323c 100644
--- a/src/declarative/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -62,7 +62,7 @@ static void qt_print_node_count()
     \class QSGNode
     \brief The QSGNode class is the base class for all nodes in the scene graph.
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     The QSGNode class can be used as a child container. Children are added with
     the appendChildNode(), prependChildNode(), insertChildNodeBefore() and
@@ -480,7 +480,7 @@ void QSGNode::markDirty(DirtyFlags flags)
     \class QSGBasicGeometryNode
     \brief The QSGBasicGeometryNode class serves as a baseclass for geometry based nodes
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     The QSGBasicGeometryNode class should not be used by itself. It is only encapsulates
     shared functionality between the QSGGeometryNode and QSGClipNode classes.
@@ -543,7 +543,7 @@ void QSGBasicGeometryNode::setGeometry(QSGGeometry *geometry)
     \class QSGGeometryNode
     \brief The QSGGeometryNode class is used for all rendered content in the scene graph.
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     The QSGGeometryNode consists of geometry and material. The geometry defines the mesh,
     the vertices and their structure, to be drawn. The Material defines how the shape is
@@ -712,7 +712,7 @@ void QSGGeometryNode::setInheritedOpacity(qreal opacity)
     \class QSGClipNode
     \brief The QSGClipNode class implements the clipping functionality in the scene graph.
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     Clipping applies to the node's subtree and can be nested. Multiple clip nodes will be
     accumulated by intersecting all their geometries. The accumulation happens
@@ -800,7 +800,7 @@ void QSGClipNode::setClipRect(const QRectF &rect)
     \class QSGTransformNode
     \brief The QSGTransformNode class implements transformations in the scene graph
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     Transformations apply the node's subtree and can be nested. Multiple transform nodes
     will be accumulated by intersecting all their matrices. The accumulation happens
@@ -921,7 +921,7 @@ void QSGRootNode::notifyNodeChange(QSGNode *node, DirtyFlags flags)
     \class QSGOpacityNode
     \brief The QSGOpacityNode class is used to change opacity of nodes.
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     Opacity applies to its subtree and can be nested. Multiple opacity nodes
     will be accumulated by multiplying their opacity. The accumulation happens
diff --git a/src/declarative/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index 58afff4bc7..41c63e27b6 100644
--- a/src/declarative/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 #define QML_RUNTIME_TESTING
 
 class QSGRenderer;
@@ -63,7 +61,7 @@ class QSGGeometryNode;
 class QSGTransformNode;
 class QSGClipNode;
 
-class Q_DECLARATIVE_EXPORT QSGNode
+class Q_QUICK_EXPORT QSGNode
 {
 public:
     enum NodeType {
@@ -173,7 +171,7 @@ private:
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::DirtyFlags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags)
 
-class Q_DECLARATIVE_EXPORT QSGBasicGeometryNode : public QSGNode
+class Q_QUICK_EXPORT QSGBasicGeometryNode : public QSGNode
 {
 public:
 //    enum  UsagePattern {
@@ -211,7 +209,7 @@ private:
 
 class QSGMaterial;
 
-class Q_DECLARATIVE_EXPORT QSGGeometryNode : public QSGBasicGeometryNode
+class Q_QUICK_EXPORT QSGGeometryNode : public QSGBasicGeometryNode
 {
 public:
     QSGGeometryNode();
@@ -241,7 +239,7 @@ private:
     qreal m_opacity;
 };
 
-class Q_DECLARATIVE_EXPORT QSGClipNode : public QSGBasicGeometryNode
+class Q_QUICK_EXPORT QSGClipNode : public QSGBasicGeometryNode
 {
 public:
     QSGClipNode();
@@ -261,7 +259,7 @@ private:
 };
 
 
-class Q_DECLARATIVE_EXPORT QSGTransformNode : public QSGNode
+class Q_QUICK_EXPORT QSGTransformNode : public QSGNode
 {
 public:
     QSGTransformNode();
@@ -279,7 +277,7 @@ private:
 };
 
 
-class Q_DECLARATIVE_EXPORT QSGRootNode : public QSGNode
+class Q_QUICK_EXPORT QSGRootNode : public QSGNode
 {
 public:
     QSGRootNode();
@@ -296,7 +294,7 @@ private:
 };
 
 
-class Q_DECLARATIVE_EXPORT QSGOpacityNode : public QSGNode
+class Q_QUICK_EXPORT QSGOpacityNode : public QSGNode
 {
 public:
     QSGOpacityNode();
@@ -315,7 +313,7 @@ private:
     qreal m_combined_opacity;
 };
 
-class Q_DECLARATIVE_EXPORT QSGNodeVisitor {
+class Q_QUICK_EXPORT QSGNodeVisitor {
 public:
     virtual ~QSGNodeVisitor();
 
@@ -333,11 +331,11 @@ protected:
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGNode *n);
-Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGGeometryNode *n);
-Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGTransformNode *n);
-Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGOpacityNode *n);
-Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGRootNode *n);
+Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGNode *n);
+Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGGeometryNode *n);
+Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGTransformNode *n);
+Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGOpacityNode *n);
+Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGRootNode *n);
 
 #endif
 
diff --git a/src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
index a7e5b08dc1..a7e5b08dc1 100644
--- a/src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
diff --git a/src/declarative/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
index 25d7c11fa1..446bdefdc5 100644
--- a/src/declarative/scenegraph/coreapi/qsgnodeupdater_p.h
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_DECLARATIVE_EXPORT QSGNodeUpdater
+class Q_QUICK_EXPORT QSGNodeUpdater
 {
 public:
     QSGNodeUpdater();
diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index b22631afae..b22631afae 100644
--- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 05fb9b42fd..e5667c710a 100644
--- a/src/declarative/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -51,16 +51,14 @@
 
 #include "qsgnode.h"
 #include "qsgmaterial.h"
-#include "qsgtexture.h"
+#include <QtQuick/qsgtexture.h>
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGMaterialShader;
 struct QSGMaterialType;
 class QOpenGLFramebufferObject;
@@ -68,7 +66,7 @@ class TextureReference;
 class QSGBindable;
 class QSGNodeUpdater;
 
-class Q_DECLARATIVE_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions
+class Q_QUICK_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions
 {
     Q_OBJECT
 public:
@@ -183,7 +181,7 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRenderer::ClearMode)
 
-class Q_DECLARATIVE_EXPORT QSGBindable
+class Q_QUICK_EXPORT QSGBindable
 {
 public:
     virtual ~QSGBindable() { }
@@ -212,7 +210,7 @@ QSGMaterialShader::RenderState QSGRenderer::state(QSGMaterialShader::RenderState
 }
 
 
-class Q_DECLARATIVE_EXPORT QSGNodeDumper : public QSGNodeVisitor {
+class Q_QUICK_EXPORT QSGNodeDumper : public QSGNodeVisitor {
 
 public:
     static void dump(QSGNode *n);
diff --git a/src/declarative/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index 966a24acd3..972bff80e0 100644
--- a/src/declarative/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -42,8 +42,8 @@
 #include "qsgadaptationlayer_p.h"
 
 #include <qmath.h>
-#include <private/qsgdistancefieldutil_p.h>
-#include <private/qsgdistancefieldglyphnode_p.h>
+#include <QtQuick/private/qsgdistancefieldutil_p.h>
+#include <QtQuick/private/qsgdistancefieldglyphnode_p.h>
 #include <private/qrawfont_p.h>
 #include <QtGui/qguiapplication.h>
 #include <qdir.h>
diff --git a/src/declarative/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h
index 82e0c7cf42..5912802a84 100644
--- a/src/declarative/scenegraph/qsgadaptationlayer_p.h
+++ b/src/quick/scenegraph/qsgadaptationlayer_p.h
@@ -42,8 +42,8 @@
 #ifndef ADAPTATIONINTERFACES_H
 #define ADAPTATIONINTERFACES_H
 
-#include "qsgnode.h"
-#include "qsgtexture.h"
+#include <QtQuick/qsgnode.h>
+#include <QtQuick/qsgtexture.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
 #include <QtGui/qbrush.h>
@@ -56,14 +56,12 @@
 #include <private/qopenglcontext_p.h>
 
 // ### remove
-#include <private/qquicktext_p.h>
+#include <QtQuick/private/qquicktext_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGNode;
 class QImage;
 class TextureReference;
@@ -71,7 +69,7 @@ class QSGDistanceFieldGlyphCacheManager;
 class QSGDistanceFieldGlyphNode;
 
 // TODO: Rename from XInterface to AbstractX.
-class Q_DECLARATIVE_EXPORT QSGRectangleNode : public QSGGeometryNode
+class Q_QUICK_EXPORT QSGRectangleNode : public QSGGeometryNode
 {
 public:
     virtual void setRect(const QRectF &rect) = 0;
@@ -86,7 +84,7 @@ public:
 };
 
 
-class Q_DECLARATIVE_EXPORT QSGImageNode : public QSGGeometryNode
+class Q_QUICK_EXPORT QSGImageNode : public QSGGeometryNode
 {
 public:
     virtual void setTargetRect(const QRectF &rect) = 0;
@@ -102,7 +100,7 @@ public:
 };
 
 
-class Q_DECLARATIVE_EXPORT QSGGlyphNode : public QSGGeometryNode
+class Q_QUICK_EXPORT QSGGlyphNode : public QSGGeometryNode
 {
 public:
     enum AntialiasingMode
@@ -129,7 +127,7 @@ protected:
     QRectF m_bounding_rect;
 };
 
-class Q_DECLARATIVE_EXPORT QSGDistanceFieldGlyphCache
+class Q_QUICK_EXPORT QSGDistanceFieldGlyphCache
 {
 public:
     QSGDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font);
diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 1545303d4a..93fea15921 100644
--- a/src/declarative/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -39,22 +39,22 @@
 **
 ****************************************************************************/
 
-#include <private/qsgcontext_p.h>
-#include <private/qsgrenderer_p.h>
-#include "qsgnode.h"
+#include "qsgcontext_p.h"
+#include <QtQuick/private/qsgrenderer_p.h>
+#include <QtQuick/qsgnode.h>
 
-#include <private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
 
 #include <private/qsgdefaultrenderer_p.h>
 
-#include <private/qsgdistancefieldutil_p.h>
-#include <private/qsgdefaultdistancefieldglyphcache_p.h>
+#include <QtQuick/private/qsgdistancefieldutil_p.h>
+#include <QtQuick/private/qsgdefaultdistancefieldglyphcache_p.h>
 #include <private/qsgdefaultrectanglenode_p.h>
 #include <private/qsgdefaultimagenode_p.h>
 #include <private/qsgdefaultglyphnode_p.h>
 #include <private/qsgdistancefieldglyphnode_p.h>
 
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 #include <QGuiApplication>
 #include <QOpenGLContext>
 
@@ -62,6 +62,7 @@
 
 #include <private/qobject_p.h>
 #include <qmutex.h>
+#include <private/qdeclarativeglobal_p.h>
 
 DEFINE_BOOL_CONFIG_OPTION(qmlFlashMode, QML_FLASH_MODE)
 DEFINE_BOOL_CONFIG_OPTION(qmlTranslucentMode, QML_TRANSLUCENT_MODE)
diff --git a/src/declarative/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index ed1654b8fc..ded9d2727a 100644
--- a/src/declarative/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -50,14 +50,12 @@
 
 #include <private/qrawfont_p.h>
 
-#include "qsgnode.h"
+#include <QtQuick/qsgnode.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGContextPrivate;
 class QSGRectangleNode;
 class QSGImageNode;
@@ -75,7 +73,7 @@ class QOpenGLFramebufferObject;
 
 class QDeclarativeTextureFactory;
 
-class Q_DECLARATIVE_EXPORT QSGContext : public QObject
+class Q_QUICK_EXPORT QSGContext : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QSGContext)
diff --git a/src/declarative/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp
index 79bcbf9c04..a07793f44f 100644
--- a/src/declarative/scenegraph/qsgcontextplugin.cpp
+++ b/src/quick/scenegraph/qsgcontextplugin.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qsgcontextplugin_p.h"
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <QtGui/qguiapplication.h>
 #include <QtCore/private/qfactoryloader_p.h>
 #include <QtCore/qlibraryinfo.h>
diff --git a/src/declarative/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h
index 78c4a25372..a480ee51eb 100644
--- a/src/declarative/scenegraph/qsgcontextplugin_p.h
+++ b/src/quick/scenegraph/qsgcontextplugin_p.h
@@ -42,6 +42,7 @@
 #ifndef QSGCONTEXTPLUGIN_H
 #define QSGCONTEXTPLUGIN_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
@@ -49,11 +50,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGContext;
 
-struct Q_DECLARATIVE_EXPORT QSGContextFactoryInterface : public QFactoryInterface
+struct Q_QUICK_EXPORT QSGContextFactoryInterface : public QFactoryInterface
 {
     virtual QSGContext *create(const QString &key) const = 0;
 };
@@ -62,7 +61,7 @@ struct Q_DECLARATIVE_EXPORT QSGContextFactoryInterface : public QFactoryInterfac
         "com.trolltech.Qt.QSGContextFactoryInterface"
 Q_DECLARE_INTERFACE(QSGContextFactoryInterface, QSGContextFactoryInterface_iid)
 
-class Q_DECLARATIVE_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface
+class Q_QUICK_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface
 {
     Q_OBJECT
     Q_INTERFACES(QSGContextFactoryInterface:QFactoryInterface)
diff --git a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index 3dfa1bd269..95ccc8f437 100644
--- a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -41,7 +41,7 @@
 
 #include "qsgdefaultdistancefieldglyphcache_p.h"
 
-#include <private/qsgdistancefieldutil_p.h>
+#include <QtQuick/private/qsgdistancefieldutil_p.h>
 #include <qopenglfunctions.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
index 28860912c8..b52ec45107 100644
--- a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_DECLARATIVE_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache
+class Q_QUICK_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache
 {
 public:
     QSGDefaultDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font);
diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode.cpp b/src/quick/scenegraph/qsgdefaultglyphnode.cpp
index f41fbe486a..f41fbe486a 100644
--- a/src/declarative/scenegraph/qsgdefaultglyphnode.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode.cpp
diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index 3476ab1665..36efe9b570 100644
--- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -47,7 +47,7 @@
 #include <private/qfontengine_p.h>
 #include <private/qopenglextensions_p.h>
 
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 
 #include <private/qrawfont_p.h>
 
diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
index f9d163c425..cc14d33a30 100644
--- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
@@ -43,14 +43,12 @@
 #define DEFAULT_GLYPHNODE_H
 
 #include <private/qsgadaptationlayer_p.h>
-#include <qsgnode.h>
+#include <QtQuick/qsgnode.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QGlyphs;
 class QSGTextMaskMaterial;
 class QSGDefaultGlyphNode: public QSGGlyphNode
diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
index d22bc33fea..2378178a1b 100644
--- a/src/declarative/scenegraph/qsgdefaultglyphnode_p_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
@@ -43,11 +43,11 @@
 #define TEXTMASKMATERIAL_H
 
 #include <qcolor.h>
-#include <qsgmaterial.h>
-#include <qsgtexture.h>
-#include <qsggeometry.h>
+#include <QtQuick/qsgmaterial.h>
+#include <QtQuick/qsgtexture.h>
+#include <QtQuick/qsggeometry.h>
 #include <qshareddata.h>
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 #include <qrawfont.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp
index f30a7e2675..f360aaef0d 100644
--- a/src/declarative/scenegraph/qsgdefaultimagenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp
@@ -41,7 +41,7 @@
 
 #include "qsgdefaultimagenode_p.h"
 
-#include <private/qsgtextureprovider_p.h>
+#include <QtQuick/private/qsgtextureprovider_p.h>
 
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qmath.h>
diff --git a/src/declarative/scenegraph/qsgdefaultimagenode_p.h b/src/quick/scenegraph/qsgdefaultimagenode_p.h
index db11cd9181..f1b416d69c 100644
--- a/src/declarative/scenegraph/qsgdefaultimagenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultimagenode_p.h
@@ -45,14 +45,12 @@
 
 #include <private/qsgadaptationlayer_p.h>
 
-#include "qsgtexturematerial.h"
+#include <QtQuick/qsgtexturematerial.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGDefaultImageNode : public QSGImageNode
 {
 public:
diff --git a/src/declarative/scenegraph/qsgdefaultrectanglenode.cpp b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
index 4753b6021e..bb89b4a9f8 100644
--- a/src/declarative/scenegraph/qsgdefaultrectanglenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
@@ -44,10 +44,10 @@
 
 #include "qsgdefaultrectanglenode_p.h"
 
-#include <qsgvertexcolormaterial.h>
-#include "qsgtexturematerial.h"
+#include <QtQuick/qsgvertexcolormaterial.h>
+#include <QtQuick/qsgtexturematerial.h>
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 
 #include <QtCore/qmath.h>
 #include <QtCore/qvarlengtharray.h>
diff --git a/src/declarative/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
index 6a197136cf..b491913428 100644
--- a/src/declarative/scenegraph/qsgdefaultrectanglenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
@@ -45,14 +45,12 @@
 
 #include <private/qsgadaptationlayer_p.h>
 
-#include "qsgflatcolormaterial.h"
+#include <QtQuick/qsgflatcolormaterial.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGMaterial;
 class QSGContext;
 
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
index e4a39e484b..d3b90bed60 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
@@ -41,8 +41,8 @@
 
 #include "qsgdistancefieldglyphnode_p.h"
 #include "qsgdistancefieldglyphnode_p_p.h"
-#include <private/qsgdistancefieldutil_p.h>
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgdistancefieldutil_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index a506e23cc1..3852b01518 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qsgdistancefieldglyphnode_p_p.h"
-#include <private/qsgdistancefieldutil_p.h>
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgdistancefieldutil_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 #include <QtGui/qopenglfunctions.h>
 #include <qmath.h>
 
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
index f4877b0a1d..8096d4ae70 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
@@ -43,16 +43,14 @@
 #define DISTANCEFIELD_GLYPHNODE_H
 
 #include <private/qsgadaptationlayer_p.h>
-#include "qsgtexture.h"
+#include <QtQuick/qsgtexture.h>
 
-#include <private/qquicktext_p.h>
+#include <QtQuick/private/qquicktext_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGDistanceFieldGlyphCacheManager;
 class QSGDistanceFieldTextMaterial;
 class QSGDistanceFieldGlyphNode: public QSGGlyphNode
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
index c8c73bfac0..dbdc6e2498 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p_p.h
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
@@ -42,7 +42,7 @@
 #ifndef DISTANCEFIELDTEXTMATERIAL_H
 #define DISTANCEFIELDTEXTMATERIAL_H
 
-#include <qsgmaterial.h>
+#include <QtQuick/qsgmaterial.h>
 #include "qsgdistancefieldglyphnode_p.h"
 #include "qsgadaptationlayer_p.h"
 
diff --git a/src/declarative/scenegraph/qsgflashnode.cpp b/src/quick/scenegraph/qsgflashnode.cpp
index 9546e91ee1..9546e91ee1 100644
--- a/src/declarative/scenegraph/qsgflashnode.cpp
+++ b/src/quick/scenegraph/qsgflashnode.cpp
diff --git a/src/declarative/scenegraph/qsgflashnode_p.h b/src/quick/scenegraph/qsgflashnode_p.h
index 0967fa8901..71ac22d648 100644
--- a/src/declarative/scenegraph/qsgflashnode_p.h
+++ b/src/quick/scenegraph/qsgflashnode_p.h
@@ -42,14 +42,12 @@
 #ifndef QSGFLASHNODE_H
 #define QSGFLASHNODE_H
 
-#include <QSGSimpleRectNode>
+#include <QtQuick/QSGSimpleRectNode>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGFlashNode : public QSGSimpleRectNode
 {
 public:
diff --git a/src/declarative/scenegraph/qsgpathsimplifier.cpp b/src/quick/scenegraph/qsgpathsimplifier.cpp
index 9e851bf434..9e851bf434 100644
--- a/src/declarative/scenegraph/qsgpathsimplifier.cpp
+++ b/src/quick/scenegraph/qsgpathsimplifier.cpp
diff --git a/src/declarative/scenegraph/qsgpathsimplifier_p.h b/src/quick/scenegraph/qsgpathsimplifier_p.h
index 0639c4f622..0639c4f622 100644
--- a/src/declarative/scenegraph/qsgpathsimplifier_p.h
+++ b/src/quick/scenegraph/qsgpathsimplifier_p.h
diff --git a/src/declarative/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri
index 0adc20502d..0adc20502d 100644
--- a/src/declarative/scenegraph/scenegraph.pri
+++ b/src/quick/scenegraph/scenegraph.pri
diff --git a/src/declarative/scenegraph/util/qsgareaallocator.cpp b/src/quick/scenegraph/util/qsgareaallocator.cpp
index c5171f1c93..c5171f1c93 100644
--- a/src/declarative/scenegraph/util/qsgareaallocator.cpp
+++ b/src/quick/scenegraph/util/qsgareaallocator.cpp
diff --git a/src/declarative/scenegraph/util/qsgareaallocator_p.h b/src/quick/scenegraph/util/qsgareaallocator_p.h
index fd79d4c67a..be26046865 100644
--- a/src/declarative/scenegraph/util/qsgareaallocator_p.h
+++ b/src/quick/scenegraph/util/qsgareaallocator_p.h
@@ -42,6 +42,7 @@
 #ifndef AREAALLOCATOR_H
 #define AREAALLOCATOR_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QtCore/qsize.h>
 
 QT_BEGIN_NAMESPACE
@@ -49,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class QRect;
 class QPoint;
 struct QSGAreaAllocatorNode;
-class Q_DECLARATIVE_EXPORT QSGAreaAllocator
+class Q_QUICK_EXPORT QSGAreaAllocator
 {
 public:
     QSGAreaAllocator(const QSize &size);
diff --git a/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp b/src/quick/scenegraph/util/qsgdistancefieldutil.cpp
index 3429162d6b..d1b0445ee0 100644
--- a/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp
+++ b/src/quick/scenegraph/util/qsgdistancefieldutil.cpp
@@ -45,7 +45,7 @@
 #include <private/qsgpathsimplifier_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <QtGui/private/qopenglengineshadersource_p.h>
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
index 93dffab76e..bc28a4d9e1 100644
--- a/src/declarative/scenegraph/util/qsgdistancefieldutil_p.h
+++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
@@ -79,7 +79,7 @@ class QOpenGLShaderProgram;
 class QSGDistanceFieldGlyphCache;
 class QSGContext;
 
-class Q_DECLARATIVE_EXPORT QSGDistanceFieldGlyphCacheManager
+class Q_QUICK_EXPORT QSGDistanceFieldGlyphCacheManager
 {
 public:
     QSGDistanceFieldGlyphCacheManager(QSGContext *c);
diff --git a/src/declarative/scenegraph/util/qsgengine.cpp b/src/quick/scenegraph/util/qsgengine.cpp
index 88eeebc472..b8c93bab8b 100644
--- a/src/declarative/scenegraph/util/qsgengine.cpp
+++ b/src/quick/scenegraph/util/qsgengine.cpp
@@ -41,7 +41,7 @@
 
 #include "qsgengine.h"
 
-#include <qquickcanvas.h>
+#include <QtQuick/qquickcanvas.h>
 
 #include <private/qobject_p.h>
 #include <QtGui/QColor>
diff --git a/src/declarative/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h
index 0cbbcddfec..6b7ceb939f 100644
--- a/src/declarative/scenegraph/util/qsgengine.h
+++ b/src/quick/scenegraph/util/qsgengine.h
@@ -44,19 +44,17 @@
 
 #include <QObject>
 
-#include <qsgtexture.h>
+#include <QtQuick/qsgtexture.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGEnginePrivate;
 
 class QQuickCanvas;
 
-class Q_DECLARATIVE_EXPORT QSGEngine : public QObject
+class Q_QUICK_EXPORT QSGEngine : public QObject
 {
     Q_OBJECT
 
diff --git a/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
index ee73616e4f..cf5c7869ea 100644
--- a/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
@@ -122,7 +122,7 @@ const char *FlatColorMaterialShader::fragmentShader() const {
     \brief The QSGFlatColorMaterial class provides a convenient way of rendering
     solid colored geometry in the scene graph.
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     The flat color material will fill every pixel in a geometry using
     a solid color. The color can contain transparency.
diff --git a/src/declarative/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h
index f6345b6483..d788901b8a 100644
--- a/src/declarative/scenegraph/util/qsgflatcolormaterial.h
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h
@@ -42,16 +42,14 @@
 #ifndef FLATCOLORMATERIAL_H
 #define FLATCOLORMATERIAL_H
 
-#include <qsgmaterial.h>
+#include <QtQuick/qsgmaterial.h>
 #include <qcolor.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QSGFlatColorMaterial : public QSGMaterial
+class Q_QUICK_EXPORT QSGFlatColorMaterial : public QSGMaterial
 {
 public:
     QSGFlatColorMaterial();
diff --git a/src/declarative/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp
index f3e5202241..640aab967e 100644
--- a/src/declarative/scenegraph/util/qsgpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgpainternode.cpp
@@ -41,9 +41,9 @@
 
 #include "qsgpainternode_p.h"
 
-#include <private/qquickpainteditem_p.h>
+#include <QtQuick/private/qquickpainteditem_p.h>
 
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <private/qopenglextensions_p.h>
 #include <qopenglframebufferobject.h>
 #include <qopenglfunctions.h>
diff --git a/src/declarative/scenegraph/util/qsgpainternode_p.h b/src/quick/scenegraph/util/qsgpainternode_p.h
index 8e95107efc..85f26f6056 100644
--- a/src/declarative/scenegraph/util/qsgpainternode_p.h
+++ b/src/quick/scenegraph/util/qsgpainternode_p.h
@@ -42,11 +42,11 @@
 #ifndef QSGPAINTERNODE_P_H
 #define QSGPAINTERNODE_P_H
 
-#include "qsgnode.h"
+#include <QtQuick/qsgnode.h>
 #include "qsgtexturematerial.h"
 #include "qsgtexture_p.h"
 
-#include <qquickpainteditem.h>
+#include <QtQuick/qquickpainteditem.h>
 
 #include <QtGui/qcolor.h>
 
@@ -54,12 +54,10 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QOpenGLFramebufferObject;
 class QOpenGLPaintDevice;
 
-class Q_DECLARATIVE_EXPORT QSGPainterTexture : public QSGPlainTexture
+class Q_QUICK_EXPORT QSGPainterTexture : public QSGPlainTexture
 {
 public:
     QSGPainterTexture();
@@ -72,7 +70,7 @@ private:
     QRect m_dirty_rect;
 };
 
-class Q_DECLARATIVE_EXPORT QSGPainterNode : public QSGGeometryNode
+class Q_QUICK_EXPORT QSGPainterNode : public QSGGeometryNode
 {
 public:
     QSGPainterNode(QQuickPaintedItem *item);
diff --git a/src/declarative/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h
index b9e453abec..44beb135f7 100644
--- a/src/declarative/scenegraph/util/qsgsimplematerial.h
+++ b/src/quick/scenegraph/util/qsgsimplematerial.h
@@ -42,14 +42,12 @@
 #ifndef QSGSIMPLEMATERIAL_H
 #define QSGSIMPLEMATERIAL_H
 
-#include <qsgmaterial.h>
+#include <QtQuick/qsgmaterial.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 template <typename State>
 class QSGSimpleMaterialShader : public QSGMaterialShader
 {
diff --git a/src/declarative/scenegraph/util/qsgsimplerectnode.cpp b/src/quick/scenegraph/util/qsgsimplerectnode.cpp
index c3dc5354ca..c3dc5354ca 100644
--- a/src/declarative/scenegraph/util/qsgsimplerectnode.cpp
+++ b/src/quick/scenegraph/util/qsgsimplerectnode.cpp
diff --git a/src/declarative/scenegraph/util/qsgsimplerectnode.h b/src/quick/scenegraph/util/qsgsimplerectnode.h
index c06db07f93..6519290cfe 100644
--- a/src/declarative/scenegraph/util/qsgsimplerectnode.h
+++ b/src/quick/scenegraph/util/qsgsimplerectnode.h
@@ -42,16 +42,14 @@
 #ifndef SOLIDRECTNODE_H
 #define SOLIDRECTNODE_H
 
-#include "qsgnode.h"
+#include <QtQuick/qsgnode.h>
 #include "qsgflatcolormaterial.h"
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QSGSimpleRectNode : public QSGGeometryNode
+class Q_QUICK_EXPORT QSGSimpleRectNode : public QSGGeometryNode
 {
 public:
     QSGSimpleRectNode(const QRectF &rect, const QColor &color);
diff --git a/src/declarative/scenegraph/util/qsgsimpletexturenode.cpp b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp
index a0d6616371..00b240e435 100644
--- a/src/declarative/scenegraph/util/qsgsimpletexturenode.cpp
+++ b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp
@@ -61,7 +61,7 @@ static void qsgsimpletexturenode_update(QSGGeometry *g,
   \brief The QSGSimpleTextureNode class is provided for convenience to easily draw
   textured content using the QML scene graph.
 
-  \inmodule QtDeclarative
+  \inmodule QtQuick
 
   \warning The simple texture node class must have a texture before being
   added to the scene graph to be rendered.
diff --git a/src/declarative/scenegraph/util/qsgsimpletexturenode.h b/src/quick/scenegraph/util/qsgsimpletexturenode.h
index db58c30b5f..605cae11e4 100644
--- a/src/declarative/scenegraph/util/qsgsimpletexturenode.h
+++ b/src/quick/scenegraph/util/qsgsimpletexturenode.h
@@ -42,17 +42,15 @@
 #ifndef QSGSIMPLETEXTURENODE_H
 #define QSGSIMPLETEXTURENODE_H
 
-#include "qsgnode.h"
-#include "qsggeometry.h"
+#include <QtQuick/qsgnode.h>
+#include <QtQuick/qsggeometry.h>
 #include "qsgtexturematerial.h"
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QSGSimpleTextureNode : public QSGGeometryNode
+class Q_QUICK_EXPORT QSGSimpleTextureNode : public QSGGeometryNode
 {
 public:
     QSGSimpleTextureNode();
diff --git a/src/declarative/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index e2219e54f5..0abbc8dae1 100644
--- a/src/declarative/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -41,9 +41,9 @@
 
 #define GL_GLEXT_PROTOTYPES
 
-#include <private/qsgtexture_p.h>
+#include "qsgtexture_p.h"
 #include <qopenglfunctions.h>
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 #include <qthread.h>
 #include <private/qdeclarativedebugtrace_p.h>
 
diff --git a/src/declarative/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h
index 1a49fb941e..6fdab9f401 100644
--- a/src/declarative/scenegraph/util/qsgtexture.h
+++ b/src/quick/scenegraph/util/qsgtexture.h
@@ -42,6 +42,7 @@
 #ifndef QSGTEXTURE_H
 #define QSGTEXTURE_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <QObject>
 #include <QImage>
 
@@ -49,10 +50,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QSGTexturePrivate;
-class Q_DECLARATIVE_EXPORT QSGTexture : public QObject
+class Q_QUICK_EXPORT QSGTexture : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QSGTexture)
@@ -119,7 +118,7 @@ QRectF QSGTexture::convertToNormalizedSourceRect(const QRectF &rect) const
 }
 
 
-class Q_DECLARATIVE_EXPORT QSGDynamicTexture : public QSGTexture
+class Q_QUICK_EXPORT QSGDynamicTexture : public QSGTexture
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h
index f14508fd25..e1d6dd0e32 100644
--- a/src/declarative/scenegraph/util/qsgtexture_p.h
+++ b/src/quick/scenegraph/util/qsgtexture_p.h
@@ -42,12 +42,13 @@
 #ifndef QSGTEXTURE_P_H
 #define QSGTEXTURE_P_H
 
+#include <QtQuick/qtquickglobal.h>
 #include <private/qobject_p.h>
 
 #include <QtGui/qopengl.h>
 
 #include "qsgtexture.h"
-#include <private/qsgcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -66,7 +67,7 @@ public:
     uint filterMode : 2;
 };
 
-class Q_DECLARATIVE_EXPORT QSGPlainTexture : public QSGTexture
+class Q_QUICK_EXPORT QSGPlainTexture : public QSGTexture
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index 0bee81993c..0bee81993c 100644
--- a/src/declarative/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
diff --git a/src/declarative/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h
index be6ba7a8ab..b2b3ce6374 100644
--- a/src/declarative/scenegraph/util/qsgtexturematerial.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial.h
@@ -42,17 +42,14 @@
 #ifndef TEXTUREMATERIAL_H
 #define TEXTUREMATERIAL_H
 
-#include "qsgmaterial.h"
-#include <qsgtexture.h>
+#include <QtQuick/qsgmaterial.h>
+#include <QtQuick/qsgtexture.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
-class Q_DECLARATIVE_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial
+class Q_QUICK_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial
 {
 public:
     QSGOpaqueTextureMaterial();
@@ -88,7 +85,7 @@ protected:
 };
 
 
-class Q_DECLARATIVE_EXPORT QSGTextureMaterial : public QSGOpaqueTextureMaterial
+class Q_QUICK_EXPORT QSGTextureMaterial : public QSGOpaqueTextureMaterial
 {
 public:
     virtual QSGMaterialType *type() const;
diff --git a/src/declarative/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h
index a549f841d8..0ab552f4e9 100644
--- a/src/declarative/scenegraph/util/qsgtexturematerial_p.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h
@@ -48,9 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader
+class Q_QUICK_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader
 {
 public:
     virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
diff --git a/src/declarative/scenegraph/util/qsgtextureprovider.cpp b/src/quick/scenegraph/util/qsgtextureprovider.cpp
index 10faf2e5d4..10faf2e5d4 100644
--- a/src/declarative/scenegraph/util/qsgtextureprovider.cpp
+++ b/src/quick/scenegraph/util/qsgtextureprovider.cpp
diff --git a/src/declarative/scenegraph/util/qsgtextureprovider_p.h b/src/quick/scenegraph/util/qsgtextureprovider_p.h
index ebb6ca8507..bc4ffec03d 100644
--- a/src/declarative/scenegraph/util/qsgtextureprovider_p.h
+++ b/src/quick/scenegraph/util/qsgtextureprovider_p.h
@@ -49,9 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QSGTextureProvider : public QObject
+class Q_QUICK_EXPORT QSGTextureProvider : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
index 78cef55215..8c6996642b 100644
--- a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
@@ -113,7 +113,7 @@ const char *QSGVertexColorMaterialShader::fragmentShader() const {
     \brief The QSGVertexColorMaterial class provides a convenient way of rendering per-vertex
     colored geometry in the scene graph.
 
-    \inmodule QtDeclarative
+    \inmodule QtQuick
 
     The vertex color material will give each vertex in a geometry a color. Pixels between
     vertices will be linearly interpolated. The colors can contain transparency.
diff --git a/src/declarative/scenegraph/util/qsgvertexcolormaterial.h b/src/quick/scenegraph/util/qsgvertexcolormaterial.h
index c244f63834..1d3b5a82e0 100644
--- a/src/declarative/scenegraph/util/qsgvertexcolormaterial.h
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.h
@@ -42,15 +42,13 @@
 #ifndef VERTEXCOLORMATERIAL_H
 #define VERTEXCOLORMATERIAL_H
 
-#include <qsgmaterial.h>
+#include <QtQuick/qsgmaterial.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-class Q_DECLARATIVE_EXPORT QSGVertexColorMaterial : public QSGMaterial
+class Q_QUICK_EXPORT QSGVertexColorMaterial : public QSGMaterial
 {
 public:
     QSGVertexColorMaterial();
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/quick/util/qdeclarativeanimation.cpp
index 8c21d11037..8c21d11037 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/quick/util/qdeclarativeanimation.cpp
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/quick/util/qdeclarativeanimation_p.h
index c84af5a53e..6c8f552888 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/quick/util/qdeclarativeanimation_p.h
@@ -58,11 +58,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeAbstractAnimationPrivate;
 class QDeclarativeAnimationGroup;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
+class Q_QUICK_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation)
@@ -164,7 +162,7 @@ protected:
 };
 
 class QDeclarativeScriptActionPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation
+class Q_QUICK_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeScriptAction)
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/quick/util/qdeclarativeanimation_p_p.h
index dfeb767877..dfeb767877 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/quick/util/qdeclarativeanimation_p_p.h
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/quick/util/qdeclarativebehavior.cpp
index 6fb36197ef..6fb36197ef 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/quick/util/qdeclarativebehavior.cpp
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/quick/util/qdeclarativebehavior_p.h
index 613461abb1..1f8873de22 100644
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/quick/util/qdeclarativebehavior_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEBEHAVIOR_H
 #define QDECLARATIVEBEHAVIOR_H
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquickglobal_p.h>
 
 #include <private/qdeclarativepropertyvalueinterceptor_p.h>
 #include <qdeclarative.h>
@@ -52,11 +52,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeAbstractAnimation;
 class QDeclarativeBehaviorPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor
+class Q_QUICK_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeBehavior)
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/quick/util/qdeclarativebind.cpp
index 20b2caa582..20b2caa582 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/quick/util/qdeclarativebind.cpp
diff --git a/src/declarative/util/qdeclarativebind_p.h b/src/quick/util/qdeclarativebind_p.h
index 38f15a9328..dfb6103a37 100644
--- a/src/declarative/util/qdeclarativebind_p.h
+++ b/src/quick/util/qdeclarativebind_p.h
@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeBindPrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeBind : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
 {
diff --git a/src/declarative/util/qdeclarativechangeset.cpp b/src/quick/util/qdeclarativechangeset.cpp
index 81cbe3e10a..81cbe3e10a 100644
--- a/src/declarative/util/qdeclarativechangeset.cpp
+++ b/src/quick/util/qdeclarativechangeset.cpp
diff --git a/src/declarative/util/qdeclarativechangeset_p.h b/src/quick/util/qdeclarativechangeset_p.h
index b7554da503..b7554da503 100644
--- a/src/declarative/util/qdeclarativechangeset_p.h
+++ b/src/quick/util/qdeclarativechangeset_p.h
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/quick/util/qdeclarativeconnections.cpp
index ee2c6edcc5..ee2c6edcc5 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/quick/util/qdeclarativeconnections.cpp
diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/quick/util/qdeclarativeconnections_p.h
index 86e1341689..bab29e5521 100644
--- a/src/declarative/util/qdeclarativeconnections_p.h
+++ b/src/quick/util/qdeclarativeconnections_p.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeBoundSignal;
 class QDeclarativeContext;
 class QDeclarativeConnectionsPrivate;
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/quick/util/qdeclarativefontloader.cpp
index e95bd11a7b..e95bd11a7b 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/quick/util/qdeclarativefontloader.cpp
diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/quick/util/qdeclarativefontloader_p.h
index 26cad5eff4..2511908a8e 100644
--- a/src/declarative/util/qdeclarativefontloader_p.h
+++ b/src/quick/util/qdeclarativefontloader_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeFontLoaderPrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeFontLoader : public QObject
 {
diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/quick/util/qdeclarativelistaccessor.cpp
index 0063514e59..0063514e59 100644
--- a/src/declarative/util/qdeclarativelistaccessor.cpp
+++ b/src/quick/util/qdeclarativelistaccessor.cpp
diff --git a/src/declarative/util/qdeclarativelistaccessor_p.h b/src/quick/util/qdeclarativelistaccessor_p.h
index f13dca8fcf..b9fcdd01d2 100644
--- a/src/declarative/util/qdeclarativelistaccessor_p.h
+++ b/src/quick/util/qdeclarativelistaccessor_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeEngine;
 class Q_AUTOTEST_EXPORT QDeclarativeListAccessor
 {
diff --git a/src/declarative/util/qdeclarativelistcompositor.cpp b/src/quick/util/qdeclarativelistcompositor.cpp
index d73d76e386..d73d76e386 100644
--- a/src/declarative/util/qdeclarativelistcompositor.cpp
+++ b/src/quick/util/qdeclarativelistcompositor.cpp
diff --git a/src/declarative/util/qdeclarativelistcompositor_p.h b/src/quick/util/qdeclarativelistcompositor_p.h
index c808f6fe80..c808f6fe80 100644
--- a/src/declarative/util/qdeclarativelistcompositor_p.h
+++ b/src/quick/util/qdeclarativelistcompositor_p.h
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/quick/util/qdeclarativepackage.cpp
index 1d46574f02..1d46574f02 100644
--- a/src/declarative/util/qdeclarativepackage.cpp
+++ b/src/quick/util/qdeclarativepackage.cpp
diff --git a/src/declarative/util/qdeclarativepackage_p.h b/src/quick/util/qdeclarativepackage_p.h
index 8ae88488d0..76797430ce 100644
--- a/src/declarative/util/qdeclarativepackage_p.h
+++ b/src/quick/util/qdeclarativepackage_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativePackagePrivate;
 class QDeclarativePackageAttached;
 class Q_AUTOTEST_EXPORT QDeclarativePackage : public QObject
diff --git a/src/declarative/util/qdeclarativepath.cpp b/src/quick/util/qdeclarativepath.cpp
index 2ba7c372e2..2ba7c372e2 100644
--- a/src/declarative/util/qdeclarativepath.cpp
+++ b/src/quick/util/qdeclarativepath.cpp
diff --git a/src/declarative/util/qdeclarativepath_p.h b/src/quick/util/qdeclarativepath_p.h
index 537afb3b0b..afa5b0240e 100644
--- a/src/declarative/util/qdeclarativepath_p.h
+++ b/src/quick/util/qdeclarativepath_p.h
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeCurve;
 struct QDeclarativePathData
 {
diff --git a/src/declarative/util/qdeclarativepath_p_p.h b/src/quick/util/qdeclarativepath_p_p.h
index 910b7627d3..910b7627d3 100644
--- a/src/declarative/util/qdeclarativepath_p_p.h
+++ b/src/quick/util/qdeclarativepath_p_p.h
diff --git a/src/declarative/util/qdeclarativepathinterpolator.cpp b/src/quick/util/qdeclarativepathinterpolator.cpp
index 569884d33a..569884d33a 100644
--- a/src/declarative/util/qdeclarativepathinterpolator.cpp
+++ b/src/quick/util/qdeclarativepathinterpolator.cpp
diff --git a/src/declarative/util/qdeclarativepathinterpolator_p.h b/src/quick/util/qdeclarativepathinterpolator_p.h
index cb8ccfa8fb..11370a53fe 100644
--- a/src/declarative/util/qdeclarativepathinterpolator_p.h
+++ b/src/quick/util/qdeclarativepathinterpolator_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativePath;
 class Q_AUTOTEST_EXPORT QDeclarativePathInterpolator : public QObject
 {
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/quick/util/qdeclarativepixmapcache.cpp
index b57bfac585..ba155abe98 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/quick/util/qdeclarativepixmapcache.cpp
@@ -47,7 +47,7 @@
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativeengine_p.h>
 
-#include <private/qsgtexture_p.h>
+#include <QtQuick/private/qsgtexture_p.h>
 
 #include <QCoreApplication>
 #include <QImageReader>
diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/quick/util/qdeclarativepixmapcache_p.h
index a0e35aba5d..ee55519f93 100644
--- a/src/declarative/util/qdeclarativepixmapcache_p.h
+++ b/src/quick/util/qdeclarativepixmapcache_p.h
@@ -46,6 +46,7 @@
 #include <QtCore/qstring.h>
 #include <QtGui/qpixmap.h>
 #include <QtCore/qurl.h>
+#include <QtQuick/qtquickglobal.h>
 
 #include <private/qintrusivelist_p.h>
 #include <qdeclarativeimageprovider.h>
@@ -54,8 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeEngine;
 class QDeclarativePixmapData;
 class QDeclarativeTextureFactory;
@@ -78,7 +77,7 @@ private:
     QImage im;
 };
 
-class Q_DECLARATIVE_EXPORT QDeclarativePixmap
+class Q_QUICK_EXPORT QDeclarativePixmap
 {
     Q_DECLARE_TR_FUNCTIONS(QDeclarativePixmap)
 public:
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/quick/util/qdeclarativepropertychanges.cpp
index d6035fa9d2..d6035fa9d2 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/quick/util/qdeclarativepropertychanges.cpp
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/quick/util/qdeclarativepropertychanges_p.h
index 6d3e032b57..73f308874d 100644
--- a/src/declarative/util/qdeclarativepropertychanges_p.h
+++ b/src/quick/util/qdeclarativepropertychanges_p.h
@@ -49,10 +49,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-    
 class QDeclarativePropertyChangesPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation
+class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativePropertyChanges)
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/quick/util/qdeclarativesmoothedanimation.cpp
index 45c6885fbb..45c6885fbb 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/quick/util/qdeclarativesmoothedanimation.cpp
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/quick/util/qdeclarativesmoothedanimation_p.h
index 9417383c1e..d4c7716540 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p.h
+++ b/src/quick/util/qdeclarativesmoothedanimation_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeProperty;
 class QDeclarativeSmoothedAnimationPrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeSmoothedAnimation : public QDeclarativeNumberAnimation
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/quick/util/qdeclarativesmoothedanimation_p_p.h
index 08b1450342..08b1450342 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
+++ b/src/quick/util/qdeclarativesmoothedanimation_p_p.h
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/quick/util/qdeclarativespringanimation.cpp
index b0b12c7ba4..b0b12c7ba4 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/quick/util/qdeclarativespringanimation.cpp
diff --git a/src/declarative/util/qdeclarativespringanimation_p.h b/src/quick/util/qdeclarativespringanimation_p.h
index 14a34b47c5..13e983b9a5 100644
--- a/src/declarative/util/qdeclarativespringanimation_p.h
+++ b/src/quick/util/qdeclarativespringanimation_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeSpringAnimationPrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeSpringAnimation : public QDeclarativeNumberAnimation
 {
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/quick/util/qdeclarativestate.cpp
index 1250c0c2b5..1250c0c2b5 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/quick/util/qdeclarativestate.cpp
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/quick/util/qdeclarativestate_p.h
index a7aafe32fe..79038e50ea 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/quick/util/qdeclarativestate_p.h
@@ -46,19 +46,17 @@
 #include <qdeclarativeproperty.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qsharedpointer.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquickglobal_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeActionEvent;
 class QDeclarativeAbstractBinding;
 class QDeclarativeBinding;
 class QDeclarativeExpression;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAction
+class Q_QUICK_PRIVATE_EXPORT QDeclarativeAction
 {
 public:
     QDeclarativeAction();
@@ -115,7 +113,7 @@ public:
 class QDeclarativeStateGroup;
 class QDeclarativeState;
 class QDeclarativeStateOperationPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeStateOperation : public QObject
+class Q_QUICK_EXPORT QDeclarativeStateOperation : public QObject
 {
     Q_OBJECT
 public:
@@ -140,7 +138,7 @@ typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions;
 
 class QDeclarativeTransition;
 class QDeclarativeStatePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeState : public QObject
+class Q_QUICK_EXPORT QDeclarativeState : public QObject
 {
     Q_OBJECT
 
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/quick/util/qdeclarativestate_p_p.h
index 55aeecde11..55aeecde11 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/quick/util/qdeclarativestate_p_p.h
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/quick/util/qdeclarativestategroup.cpp
index 51e27e4bf0..51e27e4bf0 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/quick/util/qdeclarativestategroup.cpp
diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/quick/util/qdeclarativestategroup_p.h
index c59325580b..0ddc3db312 100644
--- a/src/declarative/util/qdeclarativestategroup_p.h
+++ b/src/quick/util/qdeclarativestategroup_p.h
@@ -48,10 +48,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeStateGroupPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus
+class Q_QUICK_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeParserStatus)
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/quick/util/qdeclarativestateoperations.cpp
index d8a5369568..d8a5369568 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/quick/util/qdeclarativestateoperations.cpp
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/quick/util/qdeclarativestateoperations_p.h
index 4975a5226f..872a296025 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/quick/util/qdeclarativestateoperations_p.h
@@ -49,9 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
-
 class QDeclarativeStateChangeScriptPrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeStateChangeScript : public QDeclarativeStateOperation, public QDeclarativeActionEvent
 {
diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/quick/util/qdeclarativestyledtext.cpp
index 1c7ca5fbfd..1c7ca5fbfd 100644
--- a/src/declarative/util/qdeclarativestyledtext.cpp
+++ b/src/quick/util/qdeclarativestyledtext.cpp
diff --git a/src/declarative/util/qdeclarativestyledtext_p.h b/src/quick/util/qdeclarativestyledtext_p.h
index beffb4d22a..beffb4d22a 100644
--- a/src/declarative/util/qdeclarativestyledtext_p.h
+++ b/src/quick/util/qdeclarativestyledtext_p.h
diff --git a/src/declarative/util/qdeclarativesvgparser.cpp b/src/quick/util/qdeclarativesvgparser.cpp
index e8ceb2116c..e8ceb2116c 100644
--- a/src/declarative/util/qdeclarativesvgparser.cpp
+++ b/src/quick/util/qdeclarativesvgparser.cpp
diff --git a/src/declarative/util/qdeclarativesvgparser_p.h b/src/quick/util/qdeclarativesvgparser_p.h
index 0d7be10761..0d7be10761 100644
--- a/src/declarative/util/qdeclarativesvgparser_p.h
+++ b/src/quick/util/qdeclarativesvgparser_p.h
diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/quick/util/qdeclarativesystempalette.cpp
index 61d8406141..61d8406141 100644
--- a/src/declarative/util/qdeclarativesystempalette.cpp
+++ b/src/quick/util/qdeclarativesystempalette.cpp
diff --git a/src/declarative/util/qdeclarativesystempalette_p.h b/src/quick/util/qdeclarativesystempalette_p.h
index e92dc514d5..25224fd4d1 100644
--- a/src/declarative/util/qdeclarativesystempalette_p.h
+++ b/src/quick/util/qdeclarativesystempalette_p.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeSystemPalettePrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeSystemPalette : public QObject
 {
diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/quick/util/qdeclarativetimeline.cpp
index 7066d3d062..7066d3d062 100644
--- a/src/declarative/util/qdeclarativetimeline.cpp
+++ b/src/quick/util/qdeclarativetimeline.cpp
diff --git a/src/declarative/util/qdeclarativetimeline_p_p.h b/src/quick/util/qdeclarativetimeline_p_p.h
index d84053903f..d84053903f 100644
--- a/src/declarative/util/qdeclarativetimeline_p_p.h
+++ b/src/quick/util/qdeclarativetimeline_p_p.h
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/quick/util/qdeclarativetimer.cpp
index a4a2362680..a4a2362680 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/quick/util/qdeclarativetimer.cpp
diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/quick/util/qdeclarativetimer_p.h
index 7de56068dd..acf728236d 100644
--- a/src/declarative/util/qdeclarativetimer_p.h
+++ b/src/quick/util/qdeclarativetimer_p.h
@@ -47,16 +47,14 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractanimation.h>
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquickglobal_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeTimerPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus
+class Q_QUICK_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeTimer)
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/quick/util/qdeclarativetransition.cpp
index 916e599cc6..916e599cc6 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/quick/util/qdeclarativetransition.cpp
diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/quick/util/qdeclarativetransition_p.h
index a53346e148..439458b6af 100644
--- a/src/declarative/util/qdeclarativetransition_p.h
+++ b/src/quick/util/qdeclarativetransition_p.h
@@ -52,12 +52,10 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeAbstractAnimation;
 class QDeclarativeTransitionPrivate;
 class QDeclarativeTransitionManager;
-class Q_DECLARATIVE_EXPORT QDeclarativeTransition : public QObject
+class Q_QUICK_EXPORT QDeclarativeTransition : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeTransition)
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/quick/util/qdeclarativetransitionmanager.cpp
index 2dd1da70ed..2dd1da70ed 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/quick/util/qdeclarativetransitionmanager.cpp
diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/quick/util/qdeclarativetransitionmanager_p_p.h
index 94a2dd1539..94a2dd1539 100644
--- a/src/declarative/util/qdeclarativetransitionmanager_p_p.h
+++ b/src/quick/util/qdeclarativetransitionmanager_p_p.h
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/quick/util/qdeclarativeutilmodule.cpp
index 2e82364a42..2e82364a42 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/quick/util/qdeclarativeutilmodule.cpp
diff --git a/src/declarative/util/qdeclarativeutilmodule_p.h b/src/quick/util/qdeclarativeutilmodule_p.h
index 7304f6fd77..13739c8170 100644
--- a/src/declarative/util/qdeclarativeutilmodule_p.h
+++ b/src/quick/util/qdeclarativeutilmodule_p.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeUtilModule
 {
 public:
diff --git a/src/quick/util/util.pri b/src/quick/util/util.pri
new file mode 100644
index 0000000000..9c8964bfef
--- /dev/null
+++ b/src/quick/util/util.pri
@@ -0,0 +1,59 @@
+SOURCES += \
+    $$PWD/qdeclarativeutilmodule.cpp\
+    $$PWD/qdeclarativeconnections.cpp \
+    $$PWD/qdeclarativepackage.cpp \
+    $$PWD/qdeclarativeanimation.cpp \
+    $$PWD/qdeclarativesystempalette.cpp \
+    $$PWD/qdeclarativespringanimation.cpp \
+    $$PWD/qdeclarativesmoothedanimation.cpp \
+    $$PWD/qdeclarativestate.cpp\
+    $$PWD/qdeclarativetransitionmanager.cpp \
+    $$PWD/qdeclarativestateoperations.cpp \
+    $$PWD/qdeclarativepropertychanges.cpp \
+    $$PWD/qdeclarativestategroup.cpp \
+    $$PWD/qdeclarativetransition.cpp \
+    $$PWD/qdeclarativelistaccessor.cpp \
+    $$PWD/qdeclarativetimeline.cpp \
+    $$PWD/qdeclarativetimer.cpp \
+    $$PWD/qdeclarativebind.cpp \
+    $$PWD/qdeclarativepixmapcache.cpp \
+    $$PWD/qdeclarativebehavior.cpp \
+    $$PWD/qdeclarativefontloader.cpp \
+    $$PWD/qdeclarativestyledtext.cpp \
+    $$PWD/qdeclarativepath.cpp \
+    $$PWD/qdeclarativechangeset.cpp \
+    $$PWD/qdeclarativelistcompositor.cpp \
+    $$PWD/qdeclarativepathinterpolator.cpp \
+    $$PWD/qdeclarativesvgparser.cpp
+
+HEADERS += \
+    $$PWD/qdeclarativeutilmodule_p.h\
+    $$PWD/qdeclarativeconnections_p.h \
+    $$PWD/qdeclarativepackage_p.h \
+    $$PWD/qdeclarativeanimation_p.h \
+    $$PWD/qdeclarativeanimation_p_p.h \
+    $$PWD/qdeclarativesystempalette_p.h \
+    $$PWD/qdeclarativespringanimation_p.h \
+    $$PWD/qdeclarativesmoothedanimation_p.h \
+    $$PWD/qdeclarativesmoothedanimation_p_p.h \
+    $$PWD/qdeclarativestate_p.h\
+    $$PWD/qdeclarativestateoperations_p.h \
+    $$PWD/qdeclarativepropertychanges_p.h \
+    $$PWD/qdeclarativestate_p_p.h\
+    $$PWD/qdeclarativetransitionmanager_p_p.h \
+    $$PWD/qdeclarativestategroup_p.h \
+    $$PWD/qdeclarativetransition_p.h \
+    $$PWD/qdeclarativelistaccessor_p.h \
+    $$PWD/qdeclarativetimeline_p_p.h \
+    $$PWD/qdeclarativetimer_p.h \
+    $$PWD/qdeclarativebind_p.h \
+    $$PWD/qdeclarativepixmapcache_p.h \
+    $$PWD/qdeclarativebehavior_p.h \
+    $$PWD/qdeclarativefontloader_p.h \
+    $$PWD/qdeclarativestyledtext_p.h \
+    $$PWD/qdeclarativepath_p.h \
+    $$PWD/qdeclarativepath_p_p.h \
+    $$PWD/qdeclarativechangeset_p.h \
+    $$PWD/qdeclarativelistcompositor_p.h \
+    $$PWD/qdeclarativepathinterpolator_p.h \
+    $$PWD/qdeclarativesvgparser_p.h
diff --git a/src/src.pro b/src/src.pro
index 3f71db2472..7518ccf8da 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += declarative qtquick1 plugins
+SUBDIRS += declarative quick qtquick1 plugins
 
 contains(QT_CONFIG, qmltest): SUBDIRS += qmltest