Remove the use of QT_MODULE()

Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154
Reviewed-by: Lars Knoll <[email protected]>

119 files changed, 0 insertions, 119 deletions

diff --git a/src/declarative/debugger/qdeclarativedebug.h b/src/declarative/debugger/qdeclarativedebug.h
index 8b0a65c251..e5af4cdcb0 100644
--- a/src/declarative/debugger/qdeclarativedebug.h
+++ b/src/declarative/debugger/qdeclarativedebug.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 struct Q_DECLARATIVE_EXPORT QDeclarativeDebuggingEnabler
 {
diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h
index a1b7297b5d..b763744364 100644
--- a/src/declarative/debugger/qdeclarativedebugclient_p.h
+++ b/src/declarative/debugger/qdeclarativedebugclient_p.h
@@ -61,7 +61,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeDebugConnectionPrivate;
 class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugConnection : public QIODevice
diff --git a/src/declarative/debugger/qdeclarativedebugserver_p.h b/src/declarative/debugger/qdeclarativedebugserver_p.h
index 538d364cf1..8a64ca9fb9 100644
--- a/src/declarative/debugger/qdeclarativedebugserver_p.h
+++ b/src/declarative/debugger/qdeclarativedebugserver_p.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeDebugService;
 
diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
index 1f237d26b0..1fa8ead5dc 100644
--- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
+++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeDebugServer;
 class Q_DECLARATIVE_EXPORT QDeclarativeDebugServerConnection
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h
index a4c9d00d88..831b5e9baa 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p.h
@@ -61,7 +61,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeDebugServicePrivate;
 class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugService : public QObject
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p_p.h b/src/declarative/debugger/qdeclarativedebugservice_p_p.h
index 14f5696090..5161d11fdf 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p_p.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeDebugServer;
 
diff --git a/src/declarative/debugger/qdeclarativedebugstatesdelegate_p.h b/src/declarative/debugger/qdeclarativedebugstatesdelegate_p.h
index 2d2462678c..7cd0f90dab 100644
--- a/src/declarative/debugger/qdeclarativedebugstatesdelegate_p.h
+++ b/src/declarative/debugger/qdeclarativedebugstatesdelegate_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeContext;
 class QDeclarativeProperty;
diff --git a/src/declarative/debugger/qdeclarativeenginedebug_p.h b/src/declarative/debugger/qdeclarativeenginedebug_p.h
index f05f443f84..a0d0ab9058 100644
--- a/src/declarative/debugger/qdeclarativeenginedebug_p.h
+++ b/src/declarative/debugger/qdeclarativeenginedebug_p.h
@@ -63,7 +63,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeDebugConnection;
 class QDeclarativeDebugWatch;
diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
index 8299eb18ae..d46db33736 100644
--- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
+++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_DECLARATIVE_EXPORT QDeclarativeInspectorInterface
 {
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
index 3bf9b6e136..857f035cdf 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h
+++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
@@ -62,7 +62,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeInspectorInterface;
 
diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h
index a138a0eb9b..b70b86678f 100644
--- a/src/declarative/debugger/qpacketprotocol_p.h
+++ b/src/declarative/debugger/qpacketprotocol_p.h
@@ -62,7 +62,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QIODevice;
 class QBuffer;
diff --git a/src/declarative/debugger/qv8debugservice_p.h b/src/declarative/debugger/qv8debugservice_p.h
index f2ac4dc7ed..15a1730ab3 100644
--- a/src/declarative/debugger/qv8debugservice_p.h
+++ b/src/declarative/debugger/qv8debugservice_p.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QV8Engine;
 class QV8DebugServicePrivate;
diff --git a/src/declarative/debugger/qv8profilerservice_p.h b/src/declarative/debugger/qv8profilerservice_p.h
index ee278e20b5..bf86e61add 100644
--- a/src/declarative/debugger/qv8profilerservice_p.h
+++ b/src/declarative/debugger/qv8profilerservice_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 struct Q_AUTOTEST_EXPORT QV8ProfilerData
 {
diff --git a/src/declarative/qml/ftw/qdeclarativerefcount_p.h b/src/declarative/qml/ftw/qdeclarativerefcount_p.h
index d7b6a9bb92..ddc6a91801 100644
--- a/src/declarative/qml/ftw/qdeclarativerefcount_p.h
+++ b/src/declarative/qml/ftw/qdeclarativerefcount_p.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeRefCount
 {
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index c2efecdb0c..66fff70ed0 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -86,7 +86,6 @@ QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativePropertyValueInterceptor;
 
diff --git a/src/declarative/qml/qdeclarativeapplication_p.h b/src/declarative/qml/qdeclarativeapplication_p.h
index 4d86e93866..de4f93c9fe 100644
--- a/src/declarative/qml/qdeclarativeapplication_p.h
+++ b/src/declarative/qml/qdeclarativeapplication_p.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeApplicationPrivate;
 class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeApplication : public QObject
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 2e33bf8aec..9baa0b0506 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QByteArray;
 class QDeclarativeEngine;
diff --git a/src/declarative/qml/qdeclarativecomponentattached_p.h b/src/declarative/qml/qdeclarativecomponentattached_p.h
index bbded8eb5e..f5f93ce7ed 100644
--- a/src/declarative/qml/qdeclarativecomponentattached_p.h
+++ b/src/declarative/qml/qdeclarativecomponentattached_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_AUTOTEST_EXPORT QDeclarativeComponentAttached : public QObject
 {
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h
index 9a068c979e..0341f01226 100644
--- a/src/declarative/qml/qdeclarativecontext.h
+++ b/src/declarative/qml/qdeclarativecontext.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QString;
 class QDeclarativeEngine;
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index 01f02d035e..b7eacbb4af 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -65,7 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeCompiler;
 
diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h
index 00cd2c257e..065a3ae2e3 100644
--- a/src/declarative/qml/qdeclarativeengine.h
+++ b/src/declarative/qml/qdeclarativeengine.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeComponent;
 class QDeclarativeEnginePrivate;
diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h
index 0de1628b82..b9d2b10ee5 100644
--- a/src/declarative/qml/qdeclarativeerror.h
+++ b/src/declarative/qml/qdeclarativeerror.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDebug;
 class QDeclarativeErrorPrivate;
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
index 63beb56a89..2c4d9aea01 100644
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QString;
 class QDeclarativeRefCount;
diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h
index a4a931d27d..fbcc32b1eb 100644
--- a/src/declarative/qml/qdeclarativeextensioninterface.h
+++ b/src/declarative/qml/qdeclarativeextensioninterface.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeEngine;
 
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h
index 52ef13eb5e..c9da5e0666 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.h
+++ b/src/declarative/qml/qdeclarativeextensionplugin.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeEngine;
 
diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h
index 63a8fed6c8..676c443fa3 100644
--- a/src/declarative/qml/qdeclarativeglobal_p.h
+++ b/src/declarative/qml/qdeclarativeglobal_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 #define DEFINE_BOOL_CONFIG_OPTION(name, var) \
     static bool name() \
diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h
index 70305258d5..5cba8fa6bb 100644
--- a/src/declarative/qml/qdeclarativeimageprovider.h
+++ b/src/declarative/qml/qdeclarativeimageprovider.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeImageProviderPrivate;
 class QSGTexture;
diff --git a/src/declarative/qml/qdeclarativeincubator.h b/src/declarative/qml/qdeclarativeincubator.h
index 1699688274..c2d5efb9a6 100644
--- a/src/declarative/qml/qdeclarativeincubator.h
+++ b/src/declarative/qml/qdeclarativeincubator.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeEngine;
 
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
index e97d841217..7d90bab740 100644
--- a/src/declarative/qml/qdeclarativeinfo.h
+++ b/src/declarative/qml/qdeclarativeinfo.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeInfoPrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index 5b2d5b4e3b..52ee485abe 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QObject;
 struct QMetaObject;
diff --git a/src/declarative/qml/qdeclarativelistmodel_p.h b/src/declarative/qml/qdeclarativelistmodel_p.h
index 256cdf1bd2..1fe8898182 100644
--- a/src/declarative/qml/qdeclarativelistmodel_p.h
+++ b/src/declarative/qml/qdeclarativelistmodel_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeListModelWorkerAgent;
 class ListModel;
diff --git a/src/declarative/qml/qdeclarativelistmodel_p_p.h b/src/declarative/qml/qdeclarativelistmodel_p_p.h
index 6b7a3478c7..b4f96c733e 100644
--- a/src/declarative/qml/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/qml/qdeclarativelistmodel_p_p.h
@@ -62,7 +62,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class DynamicRoleModelNode;
 
diff --git a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h
index 9945cad787..4c14df33c2 100644
--- a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h
@@ -65,7 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeListModel;
 
diff --git a/src/declarative/qml/qdeclarativelocale_p.h b/src/declarative/qml/qdeclarativelocale_p.h
index f4d551b749..faf5f11662 100644
--- a/src/declarative/qml/qdeclarativelocale_p.h
+++ b/src/declarative/qml/qdeclarativelocale_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeDateExtension
 {
diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
index c55f8e30bf..a9108403be 100644
--- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
+++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QNetworkAccessManager;
 class Q_DECLARATIVE_EXPORT QDeclarativeNetworkAccessManagerFactory
diff --git a/src/declarative/qml/qdeclarativeopenmetaobject_p.h b/src/declarative/qml/qdeclarativeopenmetaobject_p.h
index a3f3bf710d..f3501847ed 100644
--- a/src/declarative/qml/qdeclarativeopenmetaobject_p.h
+++ b/src/declarative/qml/qdeclarativeopenmetaobject_p.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeEngine;
 class QMetaPropertyBuilder;
diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h
index 460600af75..feed9f2a7e 100644
--- a/src/declarative/qml/qdeclarativeparserstatus.h
+++ b/src/declarative/qml/qdeclarativeparserstatus.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_DECLARATIVE_EXPORT QDeclarativeParserStatus
 {
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index 396e9dfc19..5252bb3352 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 typedef QObject *(*QDeclarativeAttachedPropertiesFunc)(QObject *);
 
diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h
index b58d780050..6db65b71b4 100644
--- a/src/declarative/qml/qdeclarativeproperty.h
+++ b/src/declarative/qml/qdeclarativeproperty.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QObject;
 class QVariant;
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h
index deb01912f3..559ece716e 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.h
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeProperty;
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource
diff --git a/src/declarative/qml/qdeclarativeproxymetaobject_p.h b/src/declarative/qml/qdeclarativeproxymetaobject_p.h
index 315983caf1..b233df6163 100644
--- a/src/declarative/qml/qdeclarativeproxymetaobject_p.h
+++ b/src/declarative/qml/qdeclarativeproxymetaobject_p.h
@@ -65,7 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeProxyMetaObject : public QAbstractDynamicMetaObject
 {
diff --git a/src/declarative/qml/qdeclarativescript_p.h b/src/declarative/qml/qdeclarativescript_p.h
index 4063c3ba95..069fc7f12b 100644
--- a/src/declarative/qml/qdeclarativescript_p.h
+++ b/src/declarative/qml/qdeclarativescript_p.h
@@ -67,7 +67,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QByteArray;
 class QDeclarativePropertyCache;
diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h
index 20bbc1bcf7..1034100fc5 100644
--- a/src/declarative/qml/qdeclarativescriptstring.h
+++ b/src/declarative/qml/qdeclarativescriptstring.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QObject;
 class QDeclarativeContext;
diff --git a/src/declarative/qml/qdeclarativetypenotavailable_p.h b/src/declarative/qml/qdeclarativetypenotavailable_p.h
index 7adce6c98d..2974b1f648 100644
--- a/src/declarative/qml/qdeclarativetypenotavailable_p.h
+++ b/src/declarative/qml/qdeclarativetypenotavailable_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeTypeNotAvailable : public QObject {
     Q_OBJECT
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h
index a3e04a88d8..0275c1dfce 100644
--- a/src/declarative/qml/qdeclarativeworkerscript_p.h
+++ b/src/declarative/qml/qdeclarativeworkerscript_p.h
@@ -64,7 +64,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeWorkerScript;
 class QDeclarativeWorkerScriptEnginePrivate;
diff --git a/src/declarative/qml/qlistmodelinterface_p.h b/src/declarative/qml/qlistmodelinterface_p.h
index ea68b12ea8..cde6392f81 100644
--- a/src/declarative/qml/qlistmodelinterface_p.h
+++ b/src/declarative/qml/qlistmodelinterface_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_DECLARATIVE_PRIVATE_EXPORT QListModelInterface : public QObject
 {
diff --git a/src/declarative/qml/v8/qjsengine.h b/src/declarative/qml/v8/qjsengine.h
index 09e055fcaf..a6c7ca7f5e 100644
--- a/src/declarative/qml/v8/qjsengine.h
+++ b/src/declarative/qml/v8/qjsengine.h
@@ -35,7 +35,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDateTime;
 class QV8Engine;
diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h
index c75bd3fdc4..6dcfe43d79 100644
--- a/src/declarative/qml/v8/qjsvalue.h
+++ b/src/declarative/qml/v8/qjsvalue.h
@@ -34,7 +34,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QJSValue;
 class QJSEngine;
diff --git a/src/declarative/qml/v8/qjsvalueiterator.h b/src/declarative/qml/v8/qjsvalueiterator.h
index d0d4065903..3b8c6cffc8 100644
--- a/src/declarative/qml/v8/qjsvalueiterator.h
+++ b/src/declarative/qml/v8/qjsvalueiterator.h
@@ -31,7 +31,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QString;
 
diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h
index 0f21725389..9fccf2f30a 100644
--- a/src/declarative/util/qdeclarativepropertymap.h
+++ b/src/declarative/util/qdeclarativepropertymap.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativePropertyMapPrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject
diff --git a/src/imports/etcprovider/plugin.h b/src/imports/etcprovider/plugin.h
index e875e4241f..8883163b64 100644
--- a/src/imports/etcprovider/plugin.h
+++ b/src/imports/etcprovider/plugin.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class EtcProviderPlugin : public QDeclarativeExtensionPlugin
 {
diff --git a/src/imports/etcprovider/qetcprovider.h b/src/imports/etcprovider/qetcprovider.h
index 721f61ab79..2979e3e7bc 100644
--- a/src/imports/etcprovider/qetcprovider.h
+++ b/src/imports/etcprovider/qetcprovider.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 // #define ETC_DEBUG
 
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
index 66d159c505..192d2d0e37 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeContext;
 class QModelIndex;
diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h
index 3048e4137f..2182e9f3dc 100644
--- a/src/imports/gestures/qdeclarativegesturearea_p.h
+++ b/src/imports/gestures/qdeclarativegesturearea_p.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeBoundSignal;
 class QDeclarativeContext;
diff --git a/src/imports/particles/V1/qdeclarativeparticles_p.h b/src/imports/particles/V1/qdeclarativeparticles_p.h
index 79213068ab..83a6674d4c 100644
--- a/src/imports/particles/V1/qdeclarativeparticles_p.h
+++ b/src/imports/particles/V1/qdeclarativeparticles_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeParticle;
 class QDeclarativeParticles;
diff --git a/src/imports/xmllistmodel/qdeclarativexmllistmodel_p.h b/src/imports/xmllistmodel/qdeclarativexmllistmodel_p.h
index 2157b3b44b..198c83ebda 100644
--- a/src/imports/xmllistmodel/qdeclarativexmllistmodel_p.h
+++ b/src/imports/xmllistmodel/qdeclarativexmllistmodel_p.h
@@ -55,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeContext;
 class QDeclarativeXmlListModelRole;
diff --git a/src/qmltest/qtestoptions_p.h b/src/qmltest/qtestoptions_p.h
index b4406d5d6f..e8f7c4fb30 100644
--- a/src/qmltest/qtestoptions_p.h
+++ b/src/qmltest/qtestoptions_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Test)
 
 namespace QTest
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h
index b64ab64600..ad616ce7e4 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_QTQUICK1_EXPORT QDeclarativeAccessibleAttached : public QObject
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h b/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h
index 97649a4ba5..440bf354f4 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1AnchorsPrivate;
 class QDeclarative1AnchorLine;
diff --git a/src/qtquick1/graphicsitems/qdeclarativeanimatedimage_p.h b/src/qtquick1/graphicsitems/qdeclarativeanimatedimage_p.h
index 02c8d5df96..449f51c2bc 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeanimatedimage_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeanimatedimage_p.h
@@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE
 
 class QMovie;
 
-QT_MODULE(Declarative)
 
 class QDeclarative1AnimatedImagePrivate;
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativeborderimage_p.h b/src/qtquick1/graphicsitems/qdeclarativeborderimage_p.h
index fdc60e4489..5bfd512438 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeborderimage_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeborderimage_p.h
@@ -49,7 +49,6 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1ScaleGrid;
 class QDeclarative1GridScaledImage;
diff --git a/src/qtquick1/graphicsitems/qdeclarativeflickable_p.h b/src/qtquick1/graphicsitems/qdeclarativeflickable_p.h
index a0c1941438..435f6f4e80 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeflickable_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1FlickablePrivate;
 class QDeclarative1FlickableVisibleArea;
diff --git a/src/qtquick1/graphicsitems/qdeclarativeflipable_p.h b/src/qtquick1/graphicsitems/qdeclarativeflipable_p.h
index 525f3da4c5..8e967d4062 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeflipable_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeflipable_p.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1FlipablePrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1Flipable : public QDeclarativeItem
diff --git a/src/qtquick1/graphicsitems/qdeclarativefocuspanel_p.h b/src/qtquick1/graphicsitems/qdeclarativefocuspanel_p.h
index fdcb1cdb51..f3bccefcba 100644
--- a/src/qtquick1/graphicsitems/qdeclarativefocuspanel_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativefocuspanel_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_AUTOTEST_EXPORT QDeclarative1FocusPanel : public QDeclarativeItem
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativefocusscope_p.h b/src/qtquick1/graphicsitems/qdeclarativefocusscope_p.h
index c8b778b25f..0355d16b42 100644
--- a/src/qtquick1/graphicsitems/qdeclarativefocusscope_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativefocusscope_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 //### set component root as focusscope
 class Q_AUTOTEST_EXPORT QDeclarative1FocusScope : public QDeclarativeItem
diff --git a/src/qtquick1/graphicsitems/qdeclarativegraphicswidget_p.h b/src/qtquick1/graphicsitems/qdeclarativegraphicswidget_p.h
index c12ec7b4c3..89b3695140 100644
--- a/src/qtquick1/graphicsitems/qdeclarativegraphicswidget_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativegraphicswidget_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QGraphicsObject;
 class QDeclarative1AnchorLine;
diff --git a/src/qtquick1/graphicsitems/qdeclarativegridview_p.h b/src/qtquick1/graphicsitems/qdeclarativegridview_p.h
index ce78dab8c5..1ce99d3cf0 100644
--- a/src/qtquick1/graphicsitems/qdeclarativegridview_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativegridview_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class QDeclarative1VisualModel;
 class QDeclarative1GridViewAttached;
 class QDeclarative1GridViewPrivate;
diff --git a/src/qtquick1/graphicsitems/qdeclarativeimage_p.h b/src/qtquick1/graphicsitems/qdeclarativeimage_p.h
index 1e37b1c3ee..812669481c 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeimage_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeimage_p.h
@@ -49,7 +49,6 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1ImagePrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1Image : public QDeclarative1ImageBase
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.h b/src/qtquick1/graphicsitems/qdeclarativeitem.h
index e372c9c8ad..0f23b962e1 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.h
@@ -57,7 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1State;
 class QDeclarative1AnchorLine;
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule_p.h b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule_p.h
index 0dad3c110d..bcd9e310be 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1ItemModule
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativelayoutitem_p.h b/src/qtquick1/graphicsitems/qdeclarativelayoutitem_p.h
index 646d5e081f..7146310fc8 100644
--- a/src/qtquick1/graphicsitems/qdeclarativelayoutitem_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativelayoutitem_p.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1LayoutItem : public QDeclarativeItem, public QGraphicsLayoutItem
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativelistview_p.h b/src/qtquick1/graphicsitems/qdeclarativelistview_p.h
index 6497def455..a45f3eae6d 100644
--- a/src/qtquick1/graphicsitems/qdeclarativelistview_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativelistview_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_AUTOTEST_EXPORT QDeclarative1ViewSection : public QObject
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativeloader_p.h b/src/qtquick1/graphicsitems/qdeclarativeloader_p.h
index 8cb4803839..57976e93fe 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeloader_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeloader_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1LoaderPrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1Loader : public QDeclarative1ImplicitSizeItem
diff --git a/src/qtquick1/graphicsitems/qdeclarativemousearea_p.h b/src/qtquick1/graphicsitems/qdeclarativemousearea_p.h
index 80b27d6b1e..0d00c9556c 100644
--- a/src/qtquick1/graphicsitems/qdeclarativemousearea_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativemousearea_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_AUTOTEST_EXPORT QDeclarative1Drag : public QObject
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativepainteditem_p.h b/src/qtquick1/graphicsitems/qdeclarativepainteditem_p.h
index cca0197e97..518f0ef848 100644
--- a/src/qtquick1/graphicsitems/qdeclarativepainteditem_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativepainteditem_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1PaintedItemPrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1PaintedItem : public QDeclarativeItem
diff --git a/src/qtquick1/graphicsitems/qdeclarativepath_p.h b/src/qtquick1/graphicsitems/qdeclarativepath_p.h
index ea535cc96c..71703fed92 100644
--- a/src/qtquick1/graphicsitems/qdeclarativepath_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativepath_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class Q_AUTOTEST_EXPORT QDeclarative1PathElement : public QObject
 {
     Q_OBJECT
diff --git a/src/qtquick1/graphicsitems/qdeclarativepathview_p.h b/src/qtquick1/graphicsitems/qdeclarativepathview_p.h
index 81e644aaa8..02a2b635ae 100644
--- a/src/qtquick1/graphicsitems/qdeclarativepathview_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativepathview_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1PathViewPrivate;
 class QDeclarative1PathViewAttached;
diff --git a/src/qtquick1/graphicsitems/qdeclarativepincharea_p.h b/src/qtquick1/graphicsitems/qdeclarativepincharea_p.h
index eed2d7e537..b77c7c9945 100644
--- a/src/qtquick1/graphicsitems/qdeclarativepincharea_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativepincharea_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_AUTOTEST_EXPORT QDeclarative1Pinch : public QObject
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h b/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h
index 521fcefac8..a2d3d670c8 100644
--- a/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class QDeclarative1BasePositionerPrivate;
 
 class Q_QTQUICK1_EXPORT QDeclarative1BasePositioner : public QDeclarative1ImplicitSizeItem
diff --git a/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h b/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h
index aac748edd4..4dadc49df5 100644
--- a/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class Q_QTQUICK1_EXPORT QDeclarative1Pen : public QObject
 {
     Q_OBJECT
diff --git a/src/qtquick1/graphicsitems/qdeclarativerepeater_p.h b/src/qtquick1/graphicsitems/qdeclarativerepeater_p.h
index 17a33c8ad2..2b0347565b 100644
--- a/src/qtquick1/graphicsitems/qdeclarativerepeater_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativerepeater_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1RepeaterPrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1Repeater : public QDeclarativeItem
diff --git a/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h b/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h
index f856b53abc..d5eadb083d 100644
--- a/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h
@@ -55,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_QTQUICK1_EXPORT QDeclarative1ScaleGrid : public QObject
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativetext_p.h b/src/qtquick1/graphicsitems/qdeclarativetext_p.h
index 55d1cbe8a0..8dff5a441a 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetext_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativetext_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 class QDeclarative1TextPrivate;
 class Q_QTQUICK1_EXPORT QDeclarative1Text : public QDeclarative1ImplicitSizeItem
 {
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextedit_p.h b/src/qtquick1/graphicsitems/qdeclarativetextedit_p.h
index b9db53e324..14ffa4aa7d 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativetextedit_p.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 
 class QDeclarative1TextEditPrivate;
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextinput_p.h b/src/qtquick1/graphicsitems/qdeclarativetextinput_p.h
index 95fe4b9ee8..11fe6d1818 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativetextinput_p.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QValidator;
 class QDeclarative1TextInputPrivate;
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextlayout_p.h b/src/qtquick1/graphicsitems/qdeclarativetextlayout_p.h
index 76d11781aa..937c58a3de 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetextlayout_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativetextlayout_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1TextLayoutPrivate;
 class QDeclarative1TextLayout : public QTextLayout
diff --git a/src/qtquick1/graphicsitems/qdeclarativetranslate_p.h b/src/qtquick1/graphicsitems/qdeclarativetranslate_p.h
index 1484c6399f..fa922fd396 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetranslate_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativetranslate_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1TranslatePrivate;
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel_p.h
index 0f973acf64..1d2fb5f442 100644
--- a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel_p.h
@@ -53,7 +53,6 @@ Q_DECLARE_METATYPE(QModelIndex)
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeComponent;
 class QDeclarativeItem;
diff --git a/src/qtquick1/qtquick1_p.h b/src/qtquick1/qtquick1_p.h
index e35691d471..4dfca2562a 100644
--- a/src/qtquick1/qtquick1_p.h
+++ b/src/qtquick1/qtquick1_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_QTQUICK1_EXPORT QDeclarativeQtQuick1Module
 {
diff --git a/src/qtquick1/util/qdeclarativeanimation_p.h b/src/qtquick1/util/qdeclarativeanimation_p.h
index bd2935f672..327c557826 100644
--- a/src/qtquick1/util/qdeclarativeanimation_p.h
+++ b/src/qtquick1/util/qdeclarativeanimation_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeItem;
 class QDeclarative1AbstractAnimationPrivate;
diff --git a/src/qtquick1/util/qdeclarativeapplication_p.h b/src/qtquick1/util/qdeclarativeapplication_p.h
index 1148fe6a61..fa75489844 100644
--- a/src/qtquick1/util/qdeclarativeapplication_p.h
+++ b/src/qtquick1/util/qdeclarativeapplication_p.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1ApplicationPrivate;
 class Q_QTQUICK1_EXPORT QDeclarative1Application : public QObject
diff --git a/src/qtquick1/util/qdeclarativebehavior_p.h b/src/qtquick1/util/qdeclarativebehavior_p.h
index d31ff7eb3a..83d831bc80 100644
--- a/src/qtquick1/util/qdeclarativebehavior_p.h
+++ b/src/qtquick1/util/qdeclarativebehavior_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1AbstractAnimation;
 class QDeclarative1BehaviorPrivate;
diff --git a/src/qtquick1/util/qdeclarativebind_p.h b/src/qtquick1/util/qdeclarativebind_p.h
index 31ddcb2862..2f318af610 100644
--- a/src/qtquick1/util/qdeclarativebind_p.h
+++ b/src/qtquick1/util/qdeclarativebind_p.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1BindPrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1Bind : public QObject, public QDeclarativeParserStatus
diff --git a/src/qtquick1/util/qdeclarativeconnections_p.h b/src/qtquick1/util/qdeclarativeconnections_p.h
index b08f467426..b692f7d20f 100644
--- a/src/qtquick1/util/qdeclarativeconnections_p.h
+++ b/src/qtquick1/util/qdeclarativeconnections_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeBoundSignal;
 class QDeclarativeContext;
diff --git a/src/qtquick1/util/qdeclarativefontloader_p.h b/src/qtquick1/util/qdeclarativefontloader_p.h
index 644418c4b9..52edf04bc4 100644
--- a/src/qtquick1/util/qdeclarativefontloader_p.h
+++ b/src/qtquick1/util/qdeclarativefontloader_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1FontLoaderPrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1FontLoader : public QObject
diff --git a/src/qtquick1/util/qdeclarativelistaccessor_p.h b/src/qtquick1/util/qdeclarativelistaccessor_p.h
index 85bade5201..fa7d86bc40 100644
--- a/src/qtquick1/util/qdeclarativelistaccessor_p.h
+++ b/src/qtquick1/util/qdeclarativelistaccessor_p.h
@@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeEngine;
 
-QT_MODULE(Declarative)
 
 class Q_AUTOTEST_EXPORT QDeclarative1ListAccessor
 {
diff --git a/src/qtquick1/util/qdeclarativelistmodel_p.h b/src/qtquick1/util/qdeclarativelistmodel_p.h
index aaf15d68b2..6d5d0dd997 100644
--- a/src/qtquick1/util/qdeclarativelistmodel_p.h
+++ b/src/qtquick1/util/qdeclarativelistmodel_p.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class FlatListModel_1;
 class NestedListModel_1;
diff --git a/src/qtquick1/util/qdeclarativelistmodel_p_p.h b/src/qtquick1/util/qdeclarativelistmodel_p_p.h
index 137e94cd87..51005a6777 100644
--- a/src/qtquick1/util/qdeclarativelistmodel_p_p.h
+++ b/src/qtquick1/util/qdeclarativelistmodel_p_p.h
@@ -66,7 +66,6 @@ QT_BEGIN_NAMESPACE
 
 class QScriptEngine;
 
-QT_MODULE(Declarative)
 
 class QDeclarative1OpenMetaObject;
 class QDeclarative1ListModelWorkerAgent;
diff --git a/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h b/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h
index 48e12a4348..bc3b657ea6 100644
--- a/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h
@@ -63,7 +63,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1ListModel;
 class FlatListScriptClass_1;
diff --git a/src/qtquick1/util/qdeclarativeopenmetaobject_p.h b/src/qtquick1/util/qdeclarativeopenmetaobject_p.h
index bb9d4bd851..cdd8d25be1 100644
--- a/src/qtquick1/util/qdeclarativeopenmetaobject_p.h
+++ b/src/qtquick1/util/qdeclarativeopenmetaobject_p.h
@@ -56,7 +56,6 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeEngine;
 class QMetaPropertyBuilder;
 
-QT_MODULE(Declarative)
 
 class QDeclarative1OpenMetaObjectTypePrivate;
 class Q_QTQUICK1_EXPORT QDeclarative1OpenMetaObjectType : public QDeclarativeRefCount
diff --git a/src/qtquick1/util/qdeclarativepackage_p.h b/src/qtquick1/util/qdeclarativepackage_p.h
index f2b6dfe689..9b70eba65c 100644
--- a/src/qtquick1/util/qdeclarativepackage_p.h
+++ b/src/qtquick1/util/qdeclarativepackage_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1PackagePrivate;
 class QDeclarative1PackageAttached;
diff --git a/src/qtquick1/util/qdeclarativepixmapcache_p.h b/src/qtquick1/util/qdeclarativepixmapcache_p.h
index 207ae69712..d009796879 100644
--- a/src/qtquick1/util/qdeclarativepixmapcache_p.h
+++ b/src/qtquick1/util/qdeclarativepixmapcache_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeEngine;
 
-QT_MODULE(Declarative)
 
 class QDeclarative1PixmapData;
 class Q_QTQUICK1_EXPORT QDeclarative1Pixmap
diff --git a/src/qtquick1/util/qdeclarativepropertychanges_p.h b/src/qtquick1/util/qdeclarativepropertychanges_p.h
index 9d822cfa6c..e88775d7ff 100644
--- a/src/qtquick1/util/qdeclarativepropertychanges_p.h
+++ b/src/qtquick1/util/qdeclarativepropertychanges_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
     
 class QDeclarative1PropertyChangesPrivate;
 class Q_QTQUICK1_EXPORT QDeclarative1PropertyChanges : public QDeclarative1StateOperation
diff --git a/src/qtquick1/util/qdeclarativesmoothedanimation_p.h b/src/qtquick1/util/qdeclarativesmoothedanimation_p.h
index 6163c75b65..d05515fe24 100644
--- a/src/qtquick1/util/qdeclarativesmoothedanimation_p.h
+++ b/src/qtquick1/util/qdeclarativesmoothedanimation_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeProperty;
 
-QT_MODULE(Declarative)
 
 class QDeclarative1SmoothedAnimationPrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1SmoothedAnimation : public QDeclarative1NumberAnimation
diff --git a/src/qtquick1/util/qdeclarativespringanimation_p.h b/src/qtquick1/util/qdeclarativespringanimation_p.h
index 3490a5d7a2..1bc26e5661 100644
--- a/src/qtquick1/util/qdeclarativespringanimation_p.h
+++ b/src/qtquick1/util/qdeclarativespringanimation_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1SpringAnimationPrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1SpringAnimation : public QDeclarative1NumberAnimation
diff --git a/src/qtquick1/util/qdeclarativestate_p.h b/src/qtquick1/util/qdeclarativestate_p.h
index 6c1fd06f6d..bd63b27f57 100644
--- a/src/qtquick1/util/qdeclarativestate_p.h
+++ b/src/qtquick1/util/qdeclarativestate_p.h
@@ -56,7 +56,6 @@ class QDeclarativeAbstractBinding;
 class QDeclarativeBinding;
 class QDeclarativeExpression;
 
-QT_MODULE(Declarative)
 
 class QDeclarative1ActionEvent;
 class Q_QTQUICK1_EXPORT QDeclarative1Action
diff --git a/src/qtquick1/util/qdeclarativestategroup_p.h b/src/qtquick1/util/qdeclarativestategroup_p.h
index dc83975349..431886be7e 100644
--- a/src/qtquick1/util/qdeclarativestategroup_p.h
+++ b/src/qtquick1/util/qdeclarativestategroup_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
-QT_MODULE(Declarative)
 
 class QDeclarative1StateGroupPrivate;
 class Q_QTQUICK1_EXPORT QDeclarative1StateGroup : public QObject, public QDeclarativeParserStatus
diff --git a/src/qtquick1/util/qdeclarativestateoperations_p.h b/src/qtquick1/util/qdeclarativestateoperations_p.h
index 1cf9b73698..b8ca061cc7 100644
--- a/src/qtquick1/util/qdeclarativestateoperations_p.h
+++ b/src/qtquick1/util/qdeclarativestateoperations_p.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1ParentChangePrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1ParentChange : public QDeclarative1StateOperation, public QDeclarative1ActionEvent
diff --git a/src/qtquick1/util/qdeclarativesystempalette_p.h b/src/qtquick1/util/qdeclarativesystempalette_p.h
index 713e5238ab..b1a5dc35cf 100644
--- a/src/qtquick1/util/qdeclarativesystempalette_p.h
+++ b/src/qtquick1/util/qdeclarativesystempalette_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1SystemPalettePrivate;
 class Q_AUTOTEST_EXPORT QDeclarative1SystemPalette : public QObject
diff --git a/src/qtquick1/util/qdeclarativetimer_p.h b/src/qtquick1/util/qdeclarativetimer_p.h
index 4beeb0112f..06c0be4a65 100644
--- a/src/qtquick1/util/qdeclarativetimer_p.h
+++ b/src/qtquick1/util/qdeclarativetimer_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1TimerPrivate;
 class Q_QTQUICK1_EXPORT QDeclarative1Timer : public QObject, public QDeclarativeParserStatus
diff --git a/src/qtquick1/util/qdeclarativetransition_p.h b/src/qtquick1/util/qdeclarativetransition_p.h
index f58c36e0ba..dd8fcca4f9 100644
--- a/src/qtquick1/util/qdeclarativetransition_p.h
+++ b/src/qtquick1/util/qdeclarativetransition_p.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1AbstractAnimation;
 class QDeclarative1TransitionPrivate;
diff --git a/src/qtquick1/util/qdeclarativeutilmodule_p.h b/src/qtquick1/util/qdeclarativeutilmodule_p.h
index 8063fb198c..34a8d61f0e 100644
--- a/src/qtquick1/util/qdeclarativeutilmodule_p.h
+++ b/src/qtquick1/util/qdeclarativeutilmodule_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarative1UtilModule
 {
diff --git a/src/qtquick1/util/qdeclarativeview.h b/src/qtquick1/util/qdeclarativeview.h
index a6dac8062c..82b1c49436 100644
--- a/src/qtquick1/util/qdeclarativeview.h
+++ b/src/qtquick1/util/qdeclarativeview.h
@@ -59,7 +59,6 @@ class QDeclarativeContext;
 class QDeclarativeError;
 class QDeclarativeItem;
 
-QT_MODULE(Declarative)
 
 class QDeclarativeViewPrivate;
 class Q_QTQUICK1_EXPORT QDeclarativeView : public QGraphicsView
diff --git a/src/qtquick1/util/qdeclarativexmllistmodel_p.h b/src/qtquick1/util/qdeclarativexmllistmodel_p.h
index 2b344b2c23..416b20cdae 100644
--- a/src/qtquick1/util/qdeclarativexmllistmodel_p.h
+++ b/src/qtquick1/util/qdeclarativexmllistmodel_p.h
@@ -55,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QDeclarativeContext;
 class QDeclarative1XmlListModelRole;
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h
index cb9892b34c..92c8378c84 100644
--- a/src/quick/items/qquickaccessibleattached_p.h
+++ b/src/quick/items/qquickaccessibleattached_p.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class Q_QUICK_PRIVATE_EXPORT QQuickAccessibleAttached : public QObject
 {
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h
index b90508a092..553c1192e7 100644
--- a/src/quick/items/qquickscreen_p.h
+++ b/src/quick/items/qquickscreen_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QQuickItem;
 class QQuickCanvas;
diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h
index 0ea21169c9..1f267ddaee 100644
--- a/src/quick/items/qquicktextcontrol_p.h
+++ b/src/quick/items/qquicktextcontrol_p.h
@@ -67,7 +67,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QStyleSheet;
 class QTextDocument;
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index c111a74955..789a7570cb 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QQuickWindowModule
 {
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index a4cdecacaf..208a13a2a9 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
 
 class QSGContextPrivate;
 class QSGRectangleNode;