diff --git a/src/multimediakit/audio/qaudio.h b/src/multimediakit/audio/qaudio.h
index b420d878..16accfef 100644
--- a/src/multimediakit/audio/qaudio.h
+++ b/src/multimediakit/audio/qaudio.h
@@ -51,6 +51,9 @@
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 //QTM_SYNC_HEADER_EXPORT QAudio
 
 namespace QAudio
diff --git a/src/multimediakit/audio/qaudio_mac_p.h b/src/multimediakit/audio/qaudio_mac_p.h
index 4acff79d..06ce4301 100644
--- a/src/multimediakit/audio/qaudio_mac_p.h
+++ b/src/multimediakit/audio/qaudio_mac_p.h
@@ -65,6 +65,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 extern QDebug operator<<(QDebug dbg, const QAudioFormat& audioFormat);
 
diff --git a/src/multimediakit/audio/qaudiodevicefactory_p.h b/src/multimediakit/audio/qaudiodevicefactory_p.h
index 74104bb7..16ddb573 100644
--- a/src/multimediakit/audio/qaudiodevicefactory_p.h
+++ b/src/multimediakit/audio/qaudiodevicefactory_p.h
@@ -65,6 +65,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAbstractAudioInput;
 class QAbstractAudioOutput;
 class QAbstractAudioDeviceInfo;
diff --git a/src/multimediakit/audio/qaudiodeviceinfo.h b/src/multimediakit/audio/qaudiodeviceinfo.h
index 70344791..e8616ce3 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo.h
@@ -59,6 +59,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAudioDeviceFactory;
 
 class QAudioDeviceInfoPrivate;
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h
index 5afc8f8c..cf19d255 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h
@@ -65,8 +65,13 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] =
     { 8000, 11025, 22050, 44100, 48000 };
@@ -117,5 +122,8 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
 
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h b/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h
index 099d7fd6..3b9ca467 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h
@@ -62,6 +62,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAudioDeviceInfoInternal : public QAbstractAudioDeviceInfo
 {
 public:
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h b/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h
index 9ed3b66d..2d4e2710 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h
@@ -63,8 +63,13 @@
 #include <qaudiosystem.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 };
 
@@ -109,4 +114,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/audio/qaudioformat.h b/src/multimediakit/audio/qaudioformat.h
index ebee33a7..c6600cdc 100644
--- a/src/multimediakit/audio/qaudioformat.h
+++ b/src/multimediakit/audio/qaudioformat.h
@@ -53,6 +53,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class QAudioFormatPrivate;
 
diff --git a/src/multimediakit/audio/qaudioinput.h b/src/multimediakit/audio/qaudioinput.h
index 13d3cb01..8684a10f 100644
--- a/src/multimediakit/audio/qaudioinput.h
+++ b/src/multimediakit/audio/qaudioinput.h
@@ -57,6 +57,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class QAbstractAudioInput;
 
diff --git a/src/multimediakit/audio/qaudioinput_alsa_p.h b/src/multimediakit/audio/qaudioinput_alsa_p.h
index 2a5b3df1..a05f6954 100644
--- a/src/multimediakit/audio/qaudioinput_alsa_p.h
+++ b/src/multimediakit/audio/qaudioinput_alsa_p.h
@@ -67,8 +67,13 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class InputPrivate;
 
 class RingBuffer
@@ -180,4 +185,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/audio/qaudioinput_mac_p.h b/src/multimediakit/audio/qaudioinput_mac_p.h
index cc0e62b1..99e8ad06 100644
--- a/src/multimediakit/audio/qaudioinput_mac_p.h
+++ b/src/multimediakit/audio/qaudioinput_mac_p.h
@@ -72,6 +72,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QTimer;
 class QIODevice;
 class QAbstractAudioDeviceInfo;
diff --git a/src/multimediakit/audio/qaudioinput_win32_p.h b/src/multimediakit/audio/qaudioinput_win32_p.h
index 0fc1ae8a..10d41a55 100644
--- a/src/multimediakit/audio/qaudioinput_win32_p.h
+++ b/src/multimediakit/audio/qaudioinput_win32_p.h
@@ -69,8 +69,13 @@
 #include <qaudiosystem.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 // For compat with 4.6
 #if !defined(QT_WIN_CALLBACK)
 #  if defined(Q_CC_MINGW)
@@ -168,4 +173,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/audio/qaudiooutput.h b/src/multimediakit/audio/qaudiooutput.h
index bc7fa62d..b61c4d9f 100644
--- a/src/multimediakit/audio/qaudiooutput.h
+++ b/src/multimediakit/audio/qaudiooutput.h
@@ -57,6 +57,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class QAbstractAudioOutput;
 
diff --git a/src/multimediakit/audio/qaudiooutput_alsa_p.h b/src/multimediakit/audio/qaudiooutput_alsa_p.h
index 953dc7ae..f914ded2 100644
--- a/src/multimediakit/audio/qaudiooutput_alsa_p.h
+++ b/src/multimediakit/audio/qaudiooutput_alsa_p.h
@@ -66,8 +66,13 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class OutputPrivate;
 
 class QAudioOutputPrivate : public QAbstractAudioOutput
@@ -164,4 +169,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/audio/qaudiooutput_mac_p.h b/src/multimediakit/audio/qaudiooutput_mac_p.h
index 8e7a1191..d1cf680b 100644
--- a/src/multimediakit/audio/qaudiooutput_mac_p.h
+++ b/src/multimediakit/audio/qaudiooutput_mac_p.h
@@ -72,6 +72,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QIODevice;
 class QAbstractAudioDeviceInfo;
 
diff --git a/src/multimediakit/audio/qaudiooutput_win32_p.h b/src/multimediakit/audio/qaudiooutput_win32_p.h
index 6ca6fc56..aa86d4e9 100644
--- a/src/multimediakit/audio/qaudiooutput_win32_p.h
+++ b/src/multimediakit/audio/qaudiooutput_win32_p.h
@@ -76,8 +76,13 @@
 #  endif
 #endif
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAudioOutputPrivate : public QAbstractAudioOutput
 {
     Q_OBJECT
@@ -164,4 +169,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/audio/qaudiopluginloader_p.h b/src/multimediakit/audio/qaudiopluginloader_p.h
index 89d9679d..a0f130fd 100644
--- a/src/multimediakit/audio/qaudiopluginloader_p.h
+++ b/src/multimediakit/audio/qaudiopluginloader_p.h
@@ -61,8 +61,13 @@
 #include <QtCore/qpluginloader.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAudioPluginLoader
 {
 public:
@@ -89,4 +94,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QAUDIOPLUGINLOADER_H
diff --git a/src/multimediakit/audio/qaudiosystem.h b/src/multimediakit/audio/qaudiosystem.h
index 6773343a..7430528a 100644
--- a/src/multimediakit/audio/qaudiosystem.h
+++ b/src/multimediakit/audio/qaudiosystem.h
@@ -53,6 +53,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QAbstractAudioDeviceInfo : public QObject
 {
     Q_OBJECT
diff --git a/src/multimediakit/audio/qaudiosystemplugin.h b/src/multimediakit/audio/qaudiosystemplugin.h
index 13e642fd..5a876ded 100644
--- a/src/multimediakit/audio/qaudiosystemplugin.h
+++ b/src/multimediakit/audio/qaudiosystemplugin.h
@@ -58,6 +58,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface : public QFactoryInterface
 {
     virtual QList<QByteArray> availableDevices(QAudio::Mode) const = 0;
diff --git a/src/multimediakit/effects/qsamplecache_p.h b/src/multimediakit/effects/qsamplecache_p.h
index fbe24600..91ca457e 100644
--- a/src/multimediakit/effects/qsamplecache_p.h
+++ b/src/multimediakit/effects/qsamplecache_p.h
@@ -66,6 +66,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QNetworkAccessManager;
 class QSampleCache;
 class QWaveDecoder;
diff --git a/src/multimediakit/effects/qsoundeffect_p.h b/src/multimediakit/effects/qsoundeffect_p.h
index de8de12a..4d676474 100644
--- a/src/multimediakit/effects/qsoundeffect_p.h
+++ b/src/multimediakit/effects/qsoundeffect_p.h
@@ -63,6 +63,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QSoundEffectPrivate;
 
 class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
diff --git a/src/multimediakit/effects/qsoundeffect_pulse_p.h b/src/multimediakit/effects/qsoundeffect_pulse_p.h
index 6653f053..c78bcdec 100644
--- a/src/multimediakit/effects/qsoundeffect_pulse_p.h
+++ b/src/multimediakit/effects/qsoundeffect_pulse_p.h
@@ -66,6 +66,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QSoundEffectPrivate : public QObject
 {
     Q_OBJECT
diff --git a/src/multimediakit/effects/qsoundeffect_qmedia_p.h b/src/multimediakit/effects/qsoundeffect_qmedia_p.h
index 9e5dd25d..adafa04a 100644
--- a/src/multimediakit/effects/qsoundeffect_qmedia_p.h
+++ b/src/multimediakit/effects/qsoundeffect_qmedia_p.h
@@ -62,6 +62,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class QSoundEffectPrivate : public QObject
 {
diff --git a/src/multimediakit/effects/qsoundeffect_qsound_p.h b/src/multimediakit/effects/qsoundeffect_qsound_p.h
index 085a97ea..c98ad79c 100644
--- a/src/multimediakit/effects/qsoundeffect_qsound_p.h
+++ b/src/multimediakit/effects/qsoundeffect_qsound_p.h
@@ -62,6 +62,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QSound;
 
 class QSoundEffectPrivate : public QObject
diff --git a/src/multimediakit/effects/qwavedecoder_p.h b/src/multimediakit/effects/qwavedecoder_p.h
index d2e438fe..6c4c00c2 100644
--- a/src/multimediakit/effects/qwavedecoder_p.h
+++ b/src/multimediakit/effects/qwavedecoder_p.h
@@ -61,6 +61,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class QWaveDecoder : public QIODevice
 {
diff --git a/src/multimediakit/qaudiocapturesource.h b/src/multimediakit/qaudiocapturesource.h
index 7f220089..e2745051 100644
--- a/src/multimediakit/qaudiocapturesource.h
+++ b/src/multimediakit/qaudiocapturesource.h
@@ -55,8 +55,13 @@
 
 #include "qmediaserviceprovider.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAudioCaptureSourcePrivate;
 
 class Q_MULTIMEDIA_EXPORT QAudioCaptureSource : public QMediaObject
@@ -92,4 +97,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QAUDIOCAPTURESOURCE_H
diff --git a/src/multimediakit/qaudioencodercontrol.h b/src/multimediakit/qaudioencodercontrol.h
index e464bc05..2e3a4bf8 100644
--- a/src/multimediakit/qaudioencodercontrol.h
+++ b/src/multimediakit/qaudioencodercontrol.h
@@ -47,7 +47,12 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QStringList;
 class QAudioFormat;
 QT_END_NAMESPACE
@@ -84,4 +89,7 @@ Q_MEDIA_DECLARE_CONTROL(QAudioEncoderControl, QAudioEncoderControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QAUDIOCAPTUREPROPERTIESCONTROL_H
diff --git a/src/multimediakit/qaudioendpointselector.h b/src/multimediakit/qaudioendpointselector.h
index 1fc10904..00250bc5 100644
--- a/src/multimediakit/qaudioendpointselector.h
+++ b/src/multimediakit/qaudioendpointselector.h
@@ -45,8 +45,13 @@
 #include <qaudio.h>
 #include <qmediacontrol.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QAudioEndpointSelector : public QMediaControl
 {
     Q_OBJECT
@@ -75,4 +80,7 @@ Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelector, QAudioEndpointSelector_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QAUDIOENDPOINTSELECTOR_H
diff --git a/src/multimediakit/qcamera.h b/src/multimediakit/qcamera.h
index 268e09e6..5091759a 100644
--- a/src/multimediakit/qcamera.h
+++ b/src/multimediakit/qcamera.h
@@ -59,8 +59,13 @@
 #include <qmediaserviceprovider.h>
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAbstractVideoSurface;
 class QVideoWidget;
 class QGraphicsVideoItem;
@@ -228,4 +233,6 @@ Q_MEDIA_ENUM_DEBUG(QCamera, LockType)
 Q_MEDIA_ENUM_DEBUG(QCamera, LockStatus)
 Q_MEDIA_ENUM_DEBUG(QCamera, LockChangeReason)
 
+QT_END_HEADER
+
 #endif  // QCAMERA_H
diff --git a/src/multimediakit/qcameracapturebufferformatcontrol.h b/src/multimediakit/qcameracapturebufferformatcontrol.h
index cf296e60..81079a77 100644
--- a/src/multimediakit/qcameracapturebufferformatcontrol.h
+++ b/src/multimediakit/qcameracapturebufferformatcontrol.h
@@ -45,8 +45,13 @@
 #include <qmediacontrol.h>
 #include <qcameraimagecapture.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraCaptureBufferFormatControl : public QMediaControl
 {
     Q_OBJECT
@@ -69,5 +74,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferF
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
 
diff --git a/src/multimediakit/qcameracapturedestinationcontrol.h b/src/multimediakit/qcameracapturedestinationcontrol.h
index 7dcae365..cdd769a4 100644
--- a/src/multimediakit/qcameracapturedestinationcontrol.h
+++ b/src/multimediakit/qcameracapturedestinationcontrol.h
@@ -45,8 +45,13 @@
 #include <qmediacontrol.h>
 #include <qcameraimagecapture.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraCaptureDestinationControl : public QMediaControl
 {
     Q_OBJECT
@@ -69,5 +74,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinat
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
 
diff --git a/src/multimediakit/qcameracontrol.h b/src/multimediakit/qcameracontrol.h
index e64f77a6..dfc2b374 100644
--- a/src/multimediakit/qcameracontrol.h
+++ b/src/multimediakit/qcameracontrol.h
@@ -47,8 +47,13 @@
 
 #include <qcamera.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraControl : public QMediaControl
 {
     Q_OBJECT
@@ -89,5 +94,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QCAMERACONTROL_H
 
diff --git a/src/multimediakit/qcameraexposure.h b/src/multimediakit/qcameraexposure.h
index 590f7340..088e7c03 100644
--- a/src/multimediakit/qcameraexposure.h
+++ b/src/multimediakit/qcameraexposure.h
@@ -45,8 +45,13 @@
 #include <qmediaobject.h>
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QCamera;
 class QCameraExposurePrivate;
 
@@ -175,4 +180,6 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode)
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode)
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode)
 
+QT_END_HEADER
+
 #endif // QCAMERAEXPOSURE_H
diff --git a/src/multimediakit/qcameraexposurecontrol.h b/src/multimediakit/qcameraexposurecontrol.h
index b764a911..ff60784b 100644
--- a/src/multimediakit/qcameraexposurecontrol.h
+++ b/src/multimediakit/qcameraexposurecontrol.h
@@ -49,8 +49,13 @@
 #include <qcamera.h>
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QMediaControl
 {
     Q_OBJECT
@@ -112,5 +117,8 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QCAMERAEXPOSURECONTROL_H
 
diff --git a/src/multimediakit/qcameraflashcontrol.h b/src/multimediakit/qcameraflashcontrol.h
index d2b39399..89b3b9d0 100644
--- a/src/multimediakit/qcameraflashcontrol.h
+++ b/src/multimediakit/qcameraflashcontrol.h
@@ -48,8 +48,13 @@
 #include <qcameraexposure.h>
 #include <qcamera.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraFlashControl : public QMediaControl
 {
     Q_OBJECT
@@ -75,5 +80,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QCAMERAFLASHCONTROL_H
 
diff --git a/src/multimediakit/qcamerafocus.h b/src/multimediakit/qcamerafocus.h
index 78ca7540..064af7aa 100644
--- a/src/multimediakit/qcamerafocus.h
+++ b/src/multimediakit/qcamerafocus.h
@@ -52,8 +52,13 @@
 #include <qmediaobject.h>
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QCamera;
 
 class QCameraFocusZoneData;
@@ -173,4 +178,6 @@ Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode)
 Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusMode)
 Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusPointMode)
 
+QT_END_HEADER
+
 #endif  // QCAMERAFOCUS_H
diff --git a/src/multimediakit/qcamerafocuscontrol.h b/src/multimediakit/qcamerafocuscontrol.h
index 7962435a..20ffe6af 100644
--- a/src/multimediakit/qcamerafocuscontrol.h
+++ b/src/multimediakit/qcamerafocuscontrol.h
@@ -47,8 +47,13 @@
 
 #include <qcamerafocus.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QMediaControl
 {
     Q_OBJECT
@@ -91,5 +96,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QCAMERAFOCUSCONTROL_H
 
diff --git a/src/multimediakit/qcameraimagecapture.h b/src/multimediakit/qcameraimagecapture.h
index 0e33f37f..f4a5a9c1 100644
--- a/src/multimediakit/qcameraimagecapture.h
+++ b/src/multimediakit/qcameraimagecapture.h
@@ -49,7 +49,12 @@
 
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QSize;
 QT_END_NAMESPACE
 
@@ -159,5 +164,7 @@ Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestinations)
 Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error)
 Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, CaptureDestination)
 
+QT_END_HEADER
+
 #endif
 
diff --git a/src/multimediakit/qcameraimagecapturecontrol.h b/src/multimediakit/qcameraimagecapturecontrol.h
index 6915b5dd..b9ac599f 100644
--- a/src/multimediakit/qcameraimagecapturecontrol.h
+++ b/src/multimediakit/qcameraimagecapturecontrol.h
@@ -45,7 +45,12 @@
 #include <qmediacontrol.h>
 #include <qcameraimagecapture.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QImage;
 QT_END_NAMESPACE
 
@@ -87,5 +92,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_i
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QCAMERAIMAGECAPTURECONTROL_H
 
diff --git a/src/multimediakit/qcameraimageprocessing.h b/src/multimediakit/qcameraimageprocessing.h
index aba38a3d..42a7eb58 100644
--- a/src/multimediakit/qcameraimageprocessing.h
+++ b/src/multimediakit/qcameraimageprocessing.h
@@ -53,8 +53,13 @@
 #include <qmediaservice.h>
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QCamera;
 
 class QCameraImageProcessingPrivate;
@@ -114,4 +119,6 @@ Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode)
 
 Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode)
 
+QT_END_HEADER
+
 #endif  // QCAMERAIMAGEPROCESSING_H
diff --git a/src/multimediakit/qcameraimageprocessingcontrol.h b/src/multimediakit/qcameraimageprocessingcontrol.h
index db77f09a..8c739287 100644
--- a/src/multimediakit/qcameraimageprocessingcontrol.h
+++ b/src/multimediakit/qcameraimageprocessingcontrol.h
@@ -48,8 +48,13 @@
 #include <qcamera.h>
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QMediaControl
 {
     Q_OBJECT
@@ -89,5 +94,7 @@ Q_DECLARE_METATYPE(QCameraImageProcessingControl::ProcessingParameter)
 
 Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter)
 
+QT_END_HEADER
+
 #endif
 
diff --git a/src/multimediakit/qcameralockscontrol.h b/src/multimediakit/qcameralockscontrol.h
index 0d6e1a22..93120ee1 100644
--- a/src/multimediakit/qcameralockscontrol.h
+++ b/src/multimediakit/qcameralockscontrol.h
@@ -47,8 +47,13 @@
 
 #include <qcamera.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QCameraLocksControl : public QMediaControl
 {
     Q_OBJECT
@@ -74,5 +79,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QCAMERALOCKSCONTROL_H
 
diff --git a/src/multimediakit/qimageencodercontrol.h b/src/multimediakit/qimageencodercontrol.h
index cebcecb3..c8a8261a 100644
--- a/src/multimediakit/qimageencodercontrol.h
+++ b/src/multimediakit/qimageencodercontrol.h
@@ -48,7 +48,12 @@
 
 #include <QtCore/qsize.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QByteArray;
 class QStringList;
 QT_END_NAMESPACE
@@ -80,4 +85,7 @@ Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qlocalmediaplaylistprovider.h b/src/multimediakit/qlocalmediaplaylistprovider.h
index 32b50cfe..e712a3f7 100644
--- a/src/multimediakit/qlocalmediaplaylistprovider.h
+++ b/src/multimediakit/qlocalmediaplaylistprovider.h
@@ -44,8 +44,13 @@
 
 #include "qmediaplaylistprovider.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QLocalMediaPlaylistProviderPrivate;
 class Q_MULTIMEDIA_EXPORT QLocalMediaPlaylistProvider : public QMediaPlaylistProvider
 {
@@ -76,4 +81,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QLOCALMEDIAPAYLISTSOURCE_H
diff --git a/src/multimediakit/qmediabackgroundplaybackcontrol.h b/src/multimediakit/qmediabackgroundplaybackcontrol.h
index 1029ba07..2cf8d193 100644
--- a/src/multimediakit/qmediabackgroundplaybackcontrol.h
+++ b/src/multimediakit/qmediabackgroundplaybackcontrol.h
@@ -44,8 +44,13 @@
 
 #include "qmediacontrol.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QMediaBackgroundPlaybackControl : public QMediaControl
 {
     Q_OBJECT
@@ -72,4 +77,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaBackgroundPlaybackControl, QMediaBackgroundPlaybac
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIABACKGROUNDPLAYBACKCONTROL_H
diff --git a/src/multimediakit/qmediabindableinterface.h b/src/multimediakit/qmediabindableinterface.h
index 68e11fa2..02b5b1a2 100644
--- a/src/multimediakit/qmediabindableinterface.h
+++ b/src/multimediakit/qmediabindableinterface.h
@@ -44,8 +44,13 @@
 
 #include <qmediaobject.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaObject;
 
 class Q_MULTIMEDIA_EXPORT QMediaBindableInterface
@@ -66,4 +71,7 @@ Q_DECLARE_INTERFACE(QMediaBindableInterface, QMediaBindableInterface_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QMEDIABINDABLEINTERFACE_H
diff --git a/src/multimediakit/qmediacontainercontrol.h b/src/multimediakit/qmediacontainercontrol.h
index 162b9af2..af48605d 100644
--- a/src/multimediakit/qmediacontainercontrol.h
+++ b/src/multimediakit/qmediacontainercontrol.h
@@ -45,8 +45,13 @@
 
 #include "qmediacontrol.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QMediaContainerControl : public QMediaControl
 {
     Q_OBJECT
@@ -69,4 +74,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIACONTAINERCONTROL_H
diff --git a/src/multimediakit/qmediacontent.h b/src/multimediakit/qmediacontent.h
index 73e156f0..99471f30 100644
--- a/src/multimediakit/qmediacontent.h
+++ b/src/multimediakit/qmediacontent.h
@@ -50,8 +50,13 @@
 #include <qtmultimediakitdefs.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaContentPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaContent
 {
@@ -85,6 +90,6 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QMediaContent)
 
-
+QT_END_HEADER
 
 #endif  // QMEDIACONTENT_H
diff --git a/src/multimediakit/qmediacontrol.h b/src/multimediakit/qmediacontrol.h
index 171e95ba..47cc1352 100644
--- a/src/multimediakit/qmediacontrol.h
+++ b/src/multimediakit/qmediacontrol.h
@@ -49,8 +49,13 @@
 #include <QtCore/qvariant.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaControlPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaControl : public QObject
 {
@@ -76,4 +81,7 @@ template <typename T> const char *qmediacontrol_iid() { return 0; }
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QABSTRACTMEDIACONTROL_H
diff --git a/src/multimediakit/qmediacontrol_p.h b/src/multimediakit/qmediacontrol_p.h
index baf5b8e5..cde6cc68 100644
--- a/src/multimediakit/qmediacontrol_p.h
+++ b/src/multimediakit/qmediacontrol_p.h
@@ -55,8 +55,13 @@
 
 #include <qtmultimediakitdefs.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaControl;
 
 class QMediaControlPrivate
@@ -69,4 +74,7 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qmediaencodersettings.h b/src/multimediakit/qmediaencodersettings.h
index a37d1120..14edc08f 100644
--- a/src/multimediakit/qmediaencodersettings.h
+++ b/src/multimediakit/qmediaencodersettings.h
@@ -48,8 +48,13 @@
 #include <qtmultimediakitdefs.h>
 #include "qtmedianamespace.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class QAudioEncoderSettingsPrivate;
 class Q_MULTIMEDIA_EXPORT QAudioEncoderSettings
@@ -157,4 +162,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qmediaimageviewer.h b/src/multimediakit/qmediaimageviewer.h
index 8c611685..7010fad3 100644
--- a/src/multimediakit/qmediaimageviewer.h
+++ b/src/multimediakit/qmediaimageviewer.h
@@ -46,8 +46,13 @@
 #include "qmediacontent.h"
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAbstractVideoSurface;
 class QGraphicsVideoItem;
 class QMediaPlaylist;
@@ -132,4 +137,6 @@ Q_DECLARE_METATYPE(QMediaImageViewer::MediaStatus)
 Q_MEDIA_ENUM_DEBUG(QMediaImageViewer, State)
 Q_MEDIA_ENUM_DEBUG(QMediaImageViewer, MediaStatus)
 
+QT_END_HEADER
+
 #endif
diff --git a/src/multimediakit/qmediaimageviewerservice_p.h b/src/multimediakit/qmediaimageviewerservice_p.h
index 1fe4d4e2..e40cdc5f 100644
--- a/src/multimediakit/qmediaimageviewerservice_p.h
+++ b/src/multimediakit/qmediaimageviewerservice_p.h
@@ -61,7 +61,12 @@
 #include <QtCore/qpointer.h>
 #include <QtGui/qimage.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QAbstractVideoSurface;
 class QNetworkAccessManager;
 QT_END_NAMESPACE
@@ -136,4 +141,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qmedianetworkaccesscontrol.h b/src/multimediakit/qmedianetworkaccesscontrol.h
index f16edfb8..22ee9571 100644
--- a/src/multimediakit/qmedianetworkaccesscontrol.h
+++ b/src/multimediakit/qmedianetworkaccesscontrol.h
@@ -48,8 +48,13 @@
 #include <QtCore/qlist.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QMediaNetworkAccessControl : public QMediaControl
 {
     Q_OBJECT
@@ -72,4 +77,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_i
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qmediaobject.h b/src/multimediakit/qmediaobject.h
index 081764f1..0fcf4cde 100644
--- a/src/multimediakit/qmediaobject.h
+++ b/src/multimediakit/qmediaobject.h
@@ -48,8 +48,13 @@
 #include <qtmultimediakitdefs.h>
 #include "qtmedianamespace.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaService;
 class QMediaBindableInterface;
 
@@ -107,4 +112,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QABSTRACTMEDIAOBJECT_H
diff --git a/src/multimediakit/qmediaobject_p.h b/src/multimediakit/qmediaobject_p.h
index 53225d6c..f27420cf 100644
--- a/src/multimediakit/qmediaobject_p.h
+++ b/src/multimediakit/qmediaobject_p.h
@@ -59,8 +59,13 @@
 
 #include "qmediaobject.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMetaDataReaderControl;
 
 #define Q_DECLARE_NON_CONST_PUBLIC(Class) \
@@ -88,4 +93,7 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qmediaplayer.h b/src/multimediakit/qmediaplayer.h
index 8361c3ef..af096147 100644
--- a/src/multimediakit/qmediaplayer.h
+++ b/src/multimediakit/qmediaplayer.h
@@ -52,8 +52,13 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAbstractVideoSurface;
 class QMediaPlaylist;
 class QVideoWidget;
diff --git a/src/multimediakit/qmediaplayercontrol.h b/src/multimediakit/qmediaplayercontrol.h
index c83099d8..a6e02ee9 100644
--- a/src/multimediakit/qmediaplayercontrol.h
+++ b/src/multimediakit/qmediaplayercontrol.h
@@ -48,8 +48,13 @@
 
 #include <QtCore/qpair.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaPlaylist;
 
 class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QMediaControl
@@ -119,5 +124,8 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QMEDIAPLAYERCONTROL_H
 
diff --git a/src/multimediakit/qmediaplaylist.h b/src/multimediakit/qmediaplaylist.h
index ea48c3de..7b4b6226 100644
--- a/src/multimediakit/qmediaplaylist.h
+++ b/src/multimediakit/qmediaplaylist.h
@@ -50,8 +50,13 @@
 #include <qmediaenumdebug.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaPlaylistProvider;
 
 class QMediaPlaylistPrivate;
@@ -144,4 +149,6 @@ Q_DECLARE_METATYPE(QMediaPlaylist::Error)
 Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, PlaybackMode)
 Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, Error)
 
+QT_END_HEADER
+
 #endif  // QMEDIAPLAYLIST_H
diff --git a/src/multimediakit/qmediaplaylist_p.h b/src/multimediakit/qmediaplaylist_p.h
index 12a257f0..c04483c0 100644
--- a/src/multimediakit/qmediaplaylist_p.h
+++ b/src/multimediakit/qmediaplaylist_p.h
@@ -66,8 +66,13 @@
 # pragma Q_MOC_EXPAND_MACROS
 #endif
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaPlaylistControl;
 class QMediaPlaylistProvider;
 class QMediaPlaylistReader;
@@ -166,4 +171,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIAPLAYLIST_P_H
diff --git a/src/multimediakit/qmediaplaylistcontrol.h b/src/multimediakit/qmediaplaylistcontrol.h
index 5a65fef5..2cce448f 100644
--- a/src/multimediakit/qmediaplaylistcontrol.h
+++ b/src/multimediakit/qmediaplaylistcontrol.h
@@ -47,8 +47,13 @@
 #include "qmediaplaylistnavigator.h"
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaPlaylistProvider;
 
 class Q_MULTIMEDIA_EXPORT QMediaPlaylistControl : public QMediaControl
@@ -87,4 +92,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIAPLAYLISTCONTROL_H
diff --git a/src/multimediakit/qmediaplaylistioplugin.h b/src/multimediakit/qmediaplaylistioplugin.h
index 2d792df1..4234fb8e 100644
--- a/src/multimediakit/qmediaplaylistioplugin.h
+++ b/src/multimediakit/qmediaplaylistioplugin.h
@@ -50,7 +50,12 @@
 
 #include "qmediacontent.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QString;
 class QUrl;
 class QByteArray;
@@ -115,4 +120,7 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIAPLAYLISTIOPLUGIN_H
diff --git a/src/multimediakit/qmediaplaylistnavigator.h b/src/multimediakit/qmediaplaylistnavigator.h
index 4f2e15db..72e45207 100644
--- a/src/multimediakit/qmediaplaylistnavigator.h
+++ b/src/multimediakit/qmediaplaylistnavigator.h
@@ -46,8 +46,13 @@
 #include "qmediaplaylist.h"
 #include <QtCore/qobject.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaPlaylistNavigatorPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaPlaylistNavigator : public QObject
 {
@@ -104,4 +109,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIAPLAYLISTNAVIGATOR_H
diff --git a/src/multimediakit/qmediaplaylistprovider.h b/src/multimediakit/qmediaplaylistprovider.h
index 07723810..79167e8b 100644
--- a/src/multimediakit/qmediaplaylistprovider.h
+++ b/src/multimediakit/qmediaplaylistprovider.h
@@ -47,7 +47,12 @@
 #include "qmediacontent.h"
 #include "qmediaplaylist.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QString;
 QT_END_NAMESPACE
 
@@ -104,4 +109,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIAPLAYLISTPROVIDER_H
diff --git a/src/multimediakit/qmediaplaylistprovider_p.h b/src/multimediakit/qmediaplaylistprovider_p.h
index 1ca28f9e..71fb86f2 100644
--- a/src/multimediakit/qmediaplaylistprovider_p.h
+++ b/src/multimediakit/qmediaplaylistprovider_p.h
@@ -55,8 +55,13 @@
 
 #include "qmediaplaylist.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaPlaylistProviderPrivate
 {
 public:
@@ -68,5 +73,8 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 
 #endif // QMEDIAPLAYLISTSOURCE_P_H
diff --git a/src/multimediakit/qmediaplaylistsourcecontrol.h b/src/multimediakit/qmediaplaylistsourcecontrol.h
index e55287fb..040bb643 100644
--- a/src/multimediakit/qmediaplaylistsourcecontrol.h
+++ b/src/multimediakit/qmediaplaylistsourcecontrol.h
@@ -45,8 +45,13 @@
 
 #include <qmediacontrol.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaPlaylist;
 
 class Q_MULTIMEDIA_EXPORT QMediaPlaylistSourceControl : public QMediaControl
@@ -71,4 +76,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QMEDIAPLAYLISTCONTROL_H
diff --git a/src/multimediakit/qmediapluginloader_p.h b/src/multimediakit/qmediapluginloader_p.h
index 0c4ad767..2f0a4d93 100644
--- a/src/multimediakit/qmediapluginloader_p.h
+++ b/src/multimediakit/qmediapluginloader_p.h
@@ -60,8 +60,13 @@
 #include <QtCore/qmap.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaServiceProviderPlugin;
 
 class Q_AUTOTEST_EXPORT QMediaPluginLoader
@@ -88,4 +93,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QMEDIAPLUGINLOADER_H
diff --git a/src/multimediakit/qmediarecorder.h b/src/multimediakit/qmediarecorder.h
index 53e82952..1e99b95c 100644
--- a/src/multimediakit/qmediarecorder.h
+++ b/src/multimediakit/qmediarecorder.h
@@ -50,7 +50,12 @@
 
 #include <QtCore/qpair.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QUrl;
 class QSize;
 class QAudioFormat;
@@ -187,4 +192,6 @@ Q_DECLARE_METATYPE(QMediaRecorder::Error)
 Q_MEDIA_ENUM_DEBUG(QMediaRecorder, State)
 Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Error)
 
+QT_END_HEADER
+
 #endif  // QMEDIARECORDER_H
diff --git a/src/multimediakit/qmediarecordercontrol.h b/src/multimediakit/qmediarecordercontrol.h
index f7ef516b..26f244c0 100644
--- a/src/multimediakit/qmediarecordercontrol.h
+++ b/src/multimediakit/qmediarecordercontrol.h
@@ -45,7 +45,12 @@
 #include "qmediacontrol.h"
 #include "qmediarecorder.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QUrl;
 QT_END_NAMESPACE
 
@@ -90,4 +95,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qmediaresource.h b/src/multimediakit/qmediaresource.h
index 6b273818..02469e04 100644
--- a/src/multimediakit/qmediaresource.h
+++ b/src/multimediakit/qmediaresource.h
@@ -48,8 +48,13 @@
 
 #include <qtmultimediakitdefs.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QMediaResource
 {
 public:
@@ -124,5 +129,6 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QMediaResource)
 Q_DECLARE_METATYPE(QMediaResourceList)
 
+QT_END_HEADER
 
 #endif
diff --git a/src/multimediakit/qmediaservice.h b/src/multimediakit/qmediaservice.h
index 77e1615a..7bf90ba4 100644
--- a/src/multimediakit/qmediaservice.h
+++ b/src/multimediakit/qmediaservice.h
@@ -48,8 +48,13 @@
 
 #include "qmediacontrol.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaServicePrivate;
 class Q_MULTIMEDIA_EXPORT QMediaService : public QObject
 {
@@ -85,5 +90,8 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QABSTRACTMEDIASERVICE_H
 
diff --git a/src/multimediakit/qmediaservice_p.h b/src/multimediakit/qmediaservice_p.h
index a0f0b6b7..83fd7287 100644
--- a/src/multimediakit/qmediaservice_p.h
+++ b/src/multimediakit/qmediaservice_p.h
@@ -53,8 +53,13 @@
 // We mean it.
 //
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAudioDeviceControl;
 
 class QMediaServicePrivate
@@ -68,5 +73,8 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 
 #endif
diff --git a/src/multimediakit/qmediaserviceprovider.h b/src/multimediakit/qmediaserviceprovider.h
index 131b67df..6305796b 100644
--- a/src/multimediakit/qmediaserviceprovider.h
+++ b/src/multimediakit/qmediaserviceprovider.h
@@ -47,8 +47,13 @@
 #include <qtmultimediakitdefs.h>
 #include "qtmedianamespace.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaService;
 
 class QMediaServiceProviderHintPrivate;
@@ -168,4 +173,7 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QMEDIASERVICEPROVIDER_H
diff --git a/src/multimediakit/qmediaserviceproviderplugin.h b/src/multimediakit/qmediaserviceproviderplugin.h
index 6cf45fda..5d150a22 100644
--- a/src/multimediakit/qmediaserviceproviderplugin.h
+++ b/src/multimediakit/qmediaserviceproviderplugin.h
@@ -52,8 +52,13 @@
 # pragma Q_MOC_EXPAND_MACROS
 #endif
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaService;
 
 struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface : public QFactoryInterface
@@ -117,5 +122,8 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 
 #endif  // QMEDIASERVICEPROVIDERPLUGIN_H
diff --git a/src/multimediakit/qmediastreamscontrol.h b/src/multimediakit/qmediastreamscontrol.h
index dd5468ee..10c38e13 100644
--- a/src/multimediakit/qmediastreamscontrol.h
+++ b/src/multimediakit/qmediastreamscontrol.h
@@ -48,8 +48,13 @@
 #include "qtmultimediakitdefs.h"
 #include <qmediaenumdebug.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl
 {
     Q_OBJECT
@@ -84,5 +89,7 @@ Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType)
 
 Q_MEDIA_ENUM_DEBUG(QMediaStreamsControl, StreamType)
 
+QT_END_HEADER
+
 #endif // QMEDIASTREAMSCONTROL_H
 
diff --git a/src/multimediakit/qmediatimerange.h b/src/multimediakit/qmediatimerange.h
index 15ef1269..927801f3 100644
--- a/src/multimediakit/qmediatimerange.h
+++ b/src/multimediakit/qmediatimerange.h
@@ -46,8 +46,13 @@
 #include "qtmedianamespace.h"
 #include <QtCore/qshareddata.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaTimeRangePrivate;
 
 class Q_MULTIMEDIA_EXPORT QMediaTimeInterval
@@ -129,4 +134,7 @@ Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QMediaTimeRange &);
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QMEDIATIMERANGE_H
diff --git a/src/multimediakit/qmetadatareadercontrol.h b/src/multimediakit/qmetadatareadercontrol.h
index cb0ed738..4689e30b 100644
--- a/src/multimediakit/qmetadatareadercontrol.h
+++ b/src/multimediakit/qmetadatareadercontrol.h
@@ -50,8 +50,13 @@
 #include <qtmultimediakitdefs.h>
 #include "qtmedianamespace.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class Q_MULTIMEDIA_EXPORT QMetaDataReaderControl : public QMediaControl
 {
@@ -81,4 +86,7 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QMETADATAPROVIDER_H
diff --git a/src/multimediakit/qmetadatawritercontrol.h b/src/multimediakit/qmetadatawritercontrol.h
index 417e91ab..41a2fbba 100644
--- a/src/multimediakit/qmetadatawritercontrol.h
+++ b/src/multimediakit/qmetadatawritercontrol.h
@@ -50,8 +50,13 @@
 #include <qtmultimediakitdefs.h>
 #include "qtmedianamespace.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 
 class Q_MULTIMEDIA_EXPORT QMetaDataWriterControl : public QMediaControl
 {
@@ -86,4 +91,7 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qradiotuner.h b/src/multimediakit/qradiotuner.h
index e88f8488..c0f94125 100644
--- a/src/multimediakit/qradiotuner.h
+++ b/src/multimediakit/qradiotuner.h
@@ -50,8 +50,13 @@
 
 #include <QPair>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QRadioTunerPrivate;
 class Q_MULTIMEDIA_EXPORT QRadioTuner : public QMediaObject
 {
@@ -148,4 +153,6 @@ Q_MEDIA_ENUM_DEBUG(QRadioTuner, Band)
 Q_MEDIA_ENUM_DEBUG(QRadioTuner, Error)
 Q_MEDIA_ENUM_DEBUG(QRadioTuner, StereoMode)
 
+QT_END_HEADER
+
 #endif  // QRADIOPLAYER_H
diff --git a/src/multimediakit/qradiotunercontrol.h b/src/multimediakit/qradiotunercontrol.h
index dd20f8a9..ae6990dd 100644
--- a/src/multimediakit/qradiotunercontrol.h
+++ b/src/multimediakit/qradiotunercontrol.h
@@ -45,8 +45,13 @@
 #include "qmediacontrol.h"
 #include "qradiotuner.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QRadioTunerControl : public QMediaControl
 {
     Q_OBJECT
@@ -112,4 +117,7 @@ Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QRADIOTUNERCONTROL_H
diff --git a/src/multimediakit/qtmedianamespace.h b/src/multimediakit/qtmedianamespace.h
index 9e71617e..cadbc28d 100644
--- a/src/multimediakit/qtmedianamespace.h
+++ b/src/multimediakit/qtmedianamespace.h
@@ -47,8 +47,13 @@
 
 #include <qtmultimediakitdefs.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 namespace QtMultimediaKit
 {
     enum MetaData
@@ -187,4 +192,7 @@ namespace QtMultimediaKit
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qvideodevicecontrol.h b/src/multimediakit/qvideodevicecontrol.h
index 260c1586..6f44c467 100644
--- a/src/multimediakit/qvideodevicecontrol.h
+++ b/src/multimediakit/qvideodevicecontrol.h
@@ -44,8 +44,12 @@
 
 #include "qmediacontrol.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
 class Q_MULTIMEDIA_EXPORT QVideoDeviceControl : public QMediaControl
 {
     Q_OBJECT
@@ -77,7 +81,8 @@ protected:
 #define QVideoDeviceControl_iid "com.nokia.Qt.QVideoDeviceControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoDeviceControl, QVideoDeviceControl_iid)
 
-
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
 #endif // QVIDEODEVICECONTROL_H
diff --git a/src/multimediakit/qvideoencodercontrol.h b/src/multimediakit/qvideoencodercontrol.h
index bf37a836..343af803 100644
--- a/src/multimediakit/qvideoencodercontrol.h
+++ b/src/multimediakit/qvideoencodercontrol.h
@@ -48,7 +48,12 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qsize.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QByteArray;
 class QStringList;
 QT_END_NAMESPACE
@@ -87,4 +92,7 @@ Q_MEDIA_DECLARE_CONTROL(QVideoEncoderControl, QVideoEncoderControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/qvideorenderercontrol.h b/src/multimediakit/qvideorenderercontrol.h
index 70bc64f6..b3a70837 100644
--- a/src/multimediakit/qvideorenderercontrol.h
+++ b/src/multimediakit/qvideorenderercontrol.h
@@ -44,7 +44,12 @@
 
 #include "qmediacontrol.h"
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QAbstractVideoSurface;
 QT_END_NAMESPACE
 
@@ -70,4 +75,7 @@ Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif // QVIDEORENDERERCONTROL_H
diff --git a/src/multimediakit/qvideosurfaceoutput_p.h b/src/multimediakit/qvideosurfaceoutput_p.h
index d74f7308..76ec5e84 100644
--- a/src/multimediakit/qvideosurfaceoutput_p.h
+++ b/src/multimediakit/qvideosurfaceoutput_p.h
@@ -46,8 +46,13 @@
 
 #include <QtCore/qsharedpointer.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAbstractVideoSurface;
 class QVideoRendererControl;
 
@@ -75,4 +80,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/video/qabstractvideobuffer.h b/src/multimediakit/video/qabstractvideobuffer.h
index 25e63825..5662ee14 100644
--- a/src/multimediakit/video/qabstractvideobuffer.h
+++ b/src/multimediakit/video/qabstractvideobuffer.h
@@ -52,6 +52,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QVariant;
 
 class QAbstractVideoBufferPrivate;
diff --git a/src/multimediakit/video/qabstractvideobuffer_p.h b/src/multimediakit/video/qabstractvideobuffer_p.h
index 2d2107e8..80c37222 100644
--- a/src/multimediakit/video/qabstractvideobuffer_p.h
+++ b/src/multimediakit/video/qabstractvideobuffer_p.h
@@ -60,8 +60,13 @@
 #include <qtmedianamespace.h>
 
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QAbstractVideoBufferPrivate
 {
 public:
@@ -77,4 +82,7 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/video/qabstractvideosurface.h b/src/multimediakit/video/qabstractvideosurface.h
index d473a926..37c4d385 100644
--- a/src/multimediakit/video/qabstractvideosurface.h
+++ b/src/multimediakit/video/qabstractvideosurface.h
@@ -49,6 +49,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QRectF;
 class QVideoSurfaceFormat;
 
diff --git a/src/multimediakit/video/qimagevideobuffer_p.h b/src/multimediakit/video/qimagevideobuffer_p.h
index 2432f5dc..dae952ed 100644
--- a/src/multimediakit/video/qimagevideobuffer_p.h
+++ b/src/multimediakit/video/qimagevideobuffer_p.h
@@ -55,8 +55,13 @@
 
 #include <qabstractvideobuffer.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QImage;
 
 class QImageVideoBufferPrivate;
@@ -76,4 +81,7 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakit/video/qmemoryvideobuffer_p.h b/src/multimediakit/video/qmemoryvideobuffer_p.h
index 06d7d70c..d5bc4e3c 100644
--- a/src/multimediakit/video/qmemoryvideobuffer_p.h
+++ b/src/multimediakit/video/qmemoryvideobuffer_p.h
@@ -57,8 +57,13 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMemoryVideoBufferPrivate;
 
 class Q_MULTIMEDIA_EXPORT QMemoryVideoBuffer : public QAbstractVideoBuffer
@@ -76,6 +81,9 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 QT_END_HEADER
 
 #endif
diff --git a/src/multimediakit/video/qvideoframe.h b/src/multimediakit/video/qvideoframe.h
index 20890b4e..6dffaf59 100644
--- a/src/multimediakit/video/qvideoframe.h
+++ b/src/multimediakit/video/qvideoframe.h
@@ -51,6 +51,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
 class QSize;
 class QVariant;
 
diff --git a/src/multimediakit/video/qvideosurfaceformat.h b/src/multimediakit/video/qvideosurfaceformat.h
index 3fed1991..f830b80a 100644
--- a/src/multimediakit/video/qvideosurfaceformat.h
+++ b/src/multimediakit/video/qvideosurfaceformat.h
@@ -53,6 +53,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QDebug;
 
 class QVideoSurfaceFormatPrivate;
diff --git a/src/multimediakitwidgets/qcameraviewfinder.h b/src/multimediakitwidgets/qcameraviewfinder.h
index 0feee37c..4ac39ebb 100644
--- a/src/multimediakitwidgets/qcameraviewfinder.h
+++ b/src/multimediakitwidgets/qcameraviewfinder.h
@@ -55,8 +55,13 @@
 
 #include <qmediaserviceprovider.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QCamera;
 
 class QCameraViewfinderPrivate;
@@ -79,4 +84,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif  // QCAMERA_H
diff --git a/src/multimediakitwidgets/qeglimagetexturesurface_p.h b/src/multimediakitwidgets/qeglimagetexturesurface_p.h
index aa88702a..9e941049 100644
--- a/src/multimediakitwidgets/qeglimagetexturesurface_p.h
+++ b/src/multimediakitwidgets/qeglimagetexturesurface_p.h
@@ -65,7 +65,12 @@
 #include <qvideosurfaceformat.h>
 #include <qvideoframe.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QGLContext;
 class QGLShaderProgram;
 class QPainterVideoSurface;
@@ -139,4 +144,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakitwidgets/qgraphicsvideoitem.h b/src/multimediakitwidgets/qgraphicsvideoitem.h
index d670e6cf..cf891341 100644
--- a/src/multimediakitwidgets/qgraphicsvideoitem.h
+++ b/src/multimediakitwidgets/qgraphicsvideoitem.h
@@ -47,7 +47,12 @@
 #include <qvideowidget.h>
 #include <qmediabindableinterface.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QVideoSurfaceFormat;
 QT_END_NAMESPACE
 
@@ -104,4 +109,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakitwidgets/qpaintervideosurface_mac_p.h b/src/multimediakitwidgets/qpaintervideosurface_mac_p.h
index 667d4b5e..d650d9ad 100644
--- a/src/multimediakitwidgets/qpaintervideosurface_mac_p.h
+++ b/src/multimediakitwidgets/qpaintervideosurface_mac_p.h
@@ -61,6 +61,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QVideoSurfaceCoreGraphicsPainter : public QVideoSurfacePainter
 {
 public:
diff --git a/src/multimediakitwidgets/qpaintervideosurface_p.h b/src/multimediakitwidgets/qpaintervideosurface_p.h
index db6aa07e..9b46e039 100644
--- a/src/multimediakitwidgets/qpaintervideosurface_p.h
+++ b/src/multimediakitwidgets/qpaintervideosurface_p.h
@@ -61,7 +61,12 @@
 #include <qabstractvideosurface.h>
 #include <qvideoframe.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
 class QGLContext;
 QT_END_NAMESPACE
 
@@ -180,4 +185,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QPainterVideoSurface::ShaderTypes)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakitwidgets/qvideowidget.h b/src/multimediakitwidgets/qvideowidget.h
index 9af13da7..c0675c6e 100644
--- a/src/multimediakitwidgets/qvideowidget.h
+++ b/src/multimediakitwidgets/qvideowidget.h
@@ -47,8 +47,13 @@
 #include <qtmultimediakitwidgetdefs.h>
 #include <qmediabindableinterface.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaObject;
 
 class QVideoWidgetPrivate;
@@ -128,4 +133,7 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakitwidgets/qvideowidget_p.h b/src/multimediakitwidgets/qvideowidget_p.h
index 12687943..ca9bc767 100644
--- a/src/multimediakitwidgets/qvideowidget_p.h
+++ b/src/multimediakitwidgets/qvideowidget_p.h
@@ -64,8 +64,13 @@
 
 #include <QtCore/qpointer.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QMediaService;
 
 class QVideoWidgetControlInterface
@@ -279,4 +284,7 @@ public:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakitwidgets/qvideowidgetcontrol.h b/src/multimediakitwidgets/qvideowidgetcontrol.h
index e1ea83be..c5ac880f 100644
--- a/src/multimediakitwidgets/qvideowidgetcontrol.h
+++ b/src/multimediakitwidgets/qvideowidgetcontrol.h
@@ -47,8 +47,13 @@
 
 #include <QtWidgets/qwidget.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class QVideoWidgetControlPrivate;
 
 class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl
@@ -94,4 +99,7 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, QVideoWidgetControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif
diff --git a/src/multimediakitwidgets/qvideowindowcontrol.h b/src/multimediakitwidgets/qvideowindowcontrol.h
index 02849135..590ce64b 100644
--- a/src/multimediakitwidgets/qvideowindowcontrol.h
+++ b/src/multimediakitwidgets/qvideowindowcontrol.h
@@ -47,8 +47,13 @@
 
 #include <QtWidgets/qwidget.h>
 
+QT_BEGIN_HEADER
+
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Multimedia)
+
+
 class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl
 {
     Q_OBJECT
@@ -101,4 +106,7 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid)
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
+
 #endif