diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 2b7a96f8244f8aa5396af6b55ef1f351e9ad26d0..bd0644db6631dbc66747d7363cfe81592ab5c16a 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -46,6 +46,7 @@
 #include <QMediaService>
 #include <QMediaRecorder>
 #include <QCameraViewfinder>
+#include <QMediaMetaData>
 
 #include <QMessageBox>
 #include <QPalette>
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index a1142bef478a0af7e4ef3e91b1f6d49a18e803b0..377a0ffb9755474c79cef8a2ba930fb7210987e3 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -47,9 +47,9 @@
 #include <QMediaService>
 #include <QMediaPlaylist>
 #include <QVideoProbe>
+#include <QMediaMetaData>
 #include <QtWidgets>
 
-
 Player::Player(QWidget *parent)
     : QWidget(parent)
     , videoWidget(0)
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index 5b7c46993e063f4af4d03d848b6e7fb58522953b..1983effa04509cb1cd9b2f4f699118c11e2ac088 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtQml/qqml.h>
+#include <QtMultimedia/qmediametadata.h>
 #include "qmediaobject.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp
index 72bb0cb2acb02ca534dc5ad3bf5e55b519ba6ce7..b7b65c98fb37180445543ce9e56575fb2399ec42 100644
--- a/src/multimedia/playback/playlistfileparser.cpp
+++ b/src/multimedia/playback/playlistfileparser.cpp
@@ -43,7 +43,7 @@
 #include <qfileinfo.h>
 #include <QtNetwork/QNetworkReply>
 #include "qmediaobject_p.h"
-#include "qmultimedia.h"
+#include "qmediametadata.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmultimedia.h b/src/multimedia/qmultimedia.h
index 22028be6c59394f3a3c1a749bf54fce236047c3f..be4737a709738639989a429874fb610c626696f2 100644
--- a/src/multimedia/qmultimedia.h
+++ b/src/multimedia/qmultimedia.h
@@ -47,7 +47,6 @@
 #include <QtCore/qstring.h>
 
 #include <QtMultimedia/qtmultimediadefs.h>
-#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp
index 9b2f4e17bfbdfc8e3bed31921d284170e1f8d25e..e52c463874ab561c705d913cbeda45925e6dab07 100644
--- a/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp
+++ b/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp
@@ -42,6 +42,7 @@
 #include "qandroidmetadatareadercontrol.h"
 
 #include "jmediametadataretriever.h"
+#include <QtMultimedia/qmediametadata.h>
 #include <qsize.h>
 #include <QDate>
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
index 01d325cf43671e56cb4f14d3139b9e8cded13a27..3a626bcde9fa2bc3c0ebf130a6c73bd25f7b7878 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
@@ -42,7 +42,7 @@
 #include "avfmediaplayermetadatacontrol.h"
 #include "avfmediaplayersession.h"
 
-#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qmediametadata.h>
 
 #import <AVFoundation/AVFoundation.h>
 
diff --git a/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp b/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp
index 95f85f5e3710b2e25c0fc81a2c1adf3e7efe25a9..99e3c51259474dcd61e61a0c828a3135ebd17aae 100644
--- a/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp
+++ b/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include "bbmetadatareadercontrol.h"
+#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index f4bbe16a7ef865109c7e23209c2bee018ed7e394..341d2cf1d72d459afa3048a76c1f9a25021114b4 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -44,9 +44,9 @@
 #include <qnetwork.h>
 
 #include "directshowmetadatacontrol.h"
-
 #include "directshowplayerservice.h"
 
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qcoreapplication.h>
 
 #ifndef QT_NO_WMSDK
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
index 0fca0c52377ead7f1732f866fa82740dc145b2ba..79cfca3bfee6607251e68cd8202def254f2826ab 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
@@ -46,6 +46,7 @@
 #include <private/qgstvideobuffer_p.h>
 #include <private/qvideosurfacegstsink_p.h>
 #include <private/qgstutils_p.h>
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qbuffer.h>
 #include <QtGui/qimagereader.h>
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
index 788233c6bdaafb9bb9e1edf4f77ca8c511f11154..353fd8be65f5dbf61d009663f6652e07a23f353a 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
@@ -41,6 +41,8 @@
 
 #include "camerabinmetadata.h"
 
+#include <QtMultimedia/qmediametadata.h>
+
 #include <gst/gst.h>
 #include <gst/gstversion.h>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
index dd3d6a4fb7dbe90893419de7f020926e51caacdc..fd7fb7d82a82bbd5fd8092b9ba2d24c8a4d017c9 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
@@ -41,6 +41,8 @@
 
 #include "qgstreamercapturemetadatacontrol.h"
 
+#include <QtMultimedia/qmediametadata.h>
+
 #include <gst/gst.h>
 #include <gst/gstversion.h>
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 841c13ff62cdd0fd25e95d7c72f39fd52cc9ee22..22f2036652111ffd8d2e884747c3d96028c09a7d 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -42,6 +42,7 @@
 #include "qgstreamermetadataprovider.h"
 #include "qgstreamerplayersession.h"
 #include <QDebug>
+#include <QtMultimedia/qmediametadata.h>
 
 #include <gst/gstversion.h>
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index 36db670548547bd2d2346cc1c46ca4524f007006..04d612b0648e5bff48c20a6c8570a6861752beca 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -52,6 +52,7 @@
 #include <gst/gstvalue.h>
 #include <gst/base/gstbasesrc.h>
 
+#include <QtMultimedia/qmediametadata.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qsize.h>
diff --git a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
index 18e2f920e578e49704d09bb52f5710317ea95b80..84d434be26a6246ca98f8bd7780480f716f71276 100644
--- a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
@@ -43,6 +43,7 @@
 #include "qt7playermetadata.h"
 #include "qt7playersession.h"
 #include <QtCore/qvarlengtharray.h>
+#include <QtMultimedia/qmediametadata.h>
 
 #import <QTKit/QTMovie.h>
 
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/plugins/wmf/player/mfmetadatacontrol.cpp
index f27370ed291c7d9260c05f33a81e65357ea01cf7..23e81f48d7f6395e2c04ad4598032f1b621cf90c 100644
--- a/src/plugins/wmf/player/mfmetadatacontrol.cpp
+++ b/src/plugins/wmf/player/mfmetadatacontrol.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include <qmediametadata.h>
 #include <qdatetime.h>
 #include <qimage.h>
 
diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index b6b3f1632082880c2bc617dc81d60f4f6a3413ce..57f820b54710fdf845e4823fc47929fe6e21af90 100644
--- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -46,6 +46,7 @@
 #include "qdeclarativeaudio_p.h"
 #include "qdeclarativemediametadata_p.h"
 
+#include <QtMultimedia/qmediametadata.h>
 #include <qmediaplayercontrol.h>
 #include <qmediaservice.h>
 #include <private/qmediaserviceprovider_p.h>
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
index 0ac26680989860e9eaeaae6f59d2a4cb77786bcf..8d0bf889ea285691d99539d4aaa2cf5ffaf70ce6 100644
--- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
+++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
@@ -45,6 +45,7 @@
 
 #include <QtCore/qtimer.h>
 
+#include <QtMultimedia/qmediametadata.h>
 #include <qmediaobject.h>
 #include <qmediaservice.h>
 #include <qmetadatareadercontrol.h>
diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
index 37c7e096a581436157f6dd3f809cb624c0feb203..51467861765346288d6e0051a2b1d9f615f35866 100644
--- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
@@ -43,6 +43,7 @@
 
 #include <QtTest/QtTest>
 #include <QDebug>
+#include <QtMultimedia/qmediametadata.h>
 #include <qmediaobject.h>
 #include <qmediacontrol.h>
 #include <qmediaservice.h>
diff --git a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
index b9b8358435f9bc6d82f7cc36e6011ceeb463b420..b03ded400ffe7c54e42dbbb94402590492aae4f5 100644
--- a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
+++ b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
@@ -41,6 +41,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 #include <QtCore/QCoreApplication>
+#include <QtMultimedia/qmediametadata.h>
 
 #include "mockmetadatareadercontrol.h"
 
diff --git a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
index 8e08f809094d9de1ebd5e6bc1184e84a392436db..9baf91b706e29983df290e5952c2ba3eee2961c4 100644
--- a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
+++ b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
@@ -41,6 +41,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 #include <QtCore/QCoreApplication>
+#include <QtMultimedia/qmediametadata.h>
 #include "qmetadatawritercontrol.h"
 
 #include "mockmetadatawritercontrol.h"
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
index cc374e91a6463e161f35bce2c62f69cc205da153..c8e174a826efb8e74fb2ef4a47764a7e67816c36 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
@@ -44,6 +44,7 @@
 
 #include <QDateTime>
 #include <QTimer>
+#include <QtMultimedia/qmediametadata.h>
 
 #include "qcameraimagecapturecontrol.h"
 #include "qcameracontrol.h"