From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 19 Nov 2012 16:40:31 +0000 (+0100)
Subject: Fix syncqt-warnings.
X-Git-Tag: upstream/5.2.95+rc1~139
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc24af773bcdf2e90103c7a1a746d6e71acb1dd4;p=platform%2Fupstream%2Fqtmultimedia.git

Fix syncqt-warnings.

Use include with module name for the multimedia-classes.

Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---

diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index 2337da4..1af692f 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -43,8 +43,8 @@
 #ifndef QAUDIO_H
 #define QAUDIO_H
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
 #include <QtCore/qmetatype.h>
 
diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h
index ce65624..42fe7c6 100644
--- a/src/multimedia/audio/qaudiobuffer.h
+++ b/src/multimedia/audio/qaudiobuffer.h
@@ -42,13 +42,13 @@
 #ifndef QAUDIOBUFFER_H
 #define QAUDIOBUFFER_H
 
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
-#include <qaudio.h>
-#include <qaudioformat.h>
+#include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qaudioformat.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h
index 00fe138..099c895 100644
--- a/src/multimedia/audio/qaudiodecoder.h
+++ b/src/multimedia/audio/qaudiodecoder.h
@@ -42,10 +42,10 @@
 #ifndef QAUDIODECODER_H
 #define QAUDIODECODER_H
 
-#include "qmediaobject.h"
-#include "qmediaenumdebug.h"
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
-#include "qaudiobuffer.h"
+#include <QtMultimedia/qaudiobuffer.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h
index 545726f..41b37e8 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -49,11 +49,11 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qlist.h>
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
-#include <qaudio.h>
-#include <qaudioformat.h>
+#include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qaudioformat.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h
index 8acc36b..90f8a1f 100644
--- a/src/multimedia/audio/qaudioformat.h
+++ b/src/multimedia/audio/qaudioformat.h
@@ -46,8 +46,8 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h
index fbeea84..eab7979 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -45,12 +45,12 @@
 
 #include <QtCore/qiodevice.h>
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
-#include <qaudio.h>
-#include <qaudioformat.h>
-#include <qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qaudioformat.h>
+#include <QtMultimedia/qaudiodeviceinfo.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index ac1dac6..b4296e5 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -45,12 +45,12 @@
 
 #include <QtCore/qiodevice.h>
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
-#include <qaudio.h>
-#include <qaudioformat.h>
-#include <qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qaudioformat.h>
+#include <QtMultimedia/qaudiodeviceinfo.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/audio/qaudioprobe.h b/src/multimedia/audio/qaudioprobe.h
index dd2525a..7489449 100644
--- a/src/multimedia/audio/qaudioprobe.h
+++ b/src/multimedia/audio/qaudioprobe.h
@@ -42,8 +42,8 @@
 #ifndef QAUDIOPROBE_H
 #define QAUDIOPROBE_H
 
-#include <QObject>
-#include <qaudiobuffer.h>
+#include <QtCore/qobject.h>
+#include <QtMultimedia/qaudiobuffer.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/audio/qaudiosystem.h b/src/multimedia/audio/qaudiosystem.h
index b68b8f8..2cefeeb 100644
--- a/src/multimedia/audio/qaudiosystem.h
+++ b/src/multimedia/audio/qaudiosystem.h
@@ -42,12 +42,12 @@
 #ifndef QAUDIOSYSTEM_H
 #define QAUDIOSYSTEM_H
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
-#include "qaudio.h"
-#include "qaudioformat.h"
-#include "qaudiodeviceinfo.h"
+#include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qaudioformat.h>
+#include <QtMultimedia/qaudiodeviceinfo.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h
index 7430451..7a8a460 100644
--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -46,12 +46,12 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qplugin.h>
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
-#include "qaudioformat.h"
-#include "qaudiodeviceinfo.h"
-#include "qaudiosystem.h"
+#include <QtMultimedia/qaudioformat.h>
+#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiosystem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h
index f179f50..cf799e5 100644
--- a/src/multimedia/audio/qsound.h
+++ b/src/multimedia/audio/qsound.h
@@ -42,7 +42,7 @@
 #ifndef QSOUND_H
 #define QSOUND_H
 
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h
index dfc4d48..7192d03 100644
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -42,7 +42,7 @@
 #ifndef QSOUNDEFFECT_H
 #define QSOUNDEFFECT_H
 
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 7c654d9..7a6cf2e 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -48,15 +48,15 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
-#include <qmediaservice.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaservice.h>
 
-#include <qcameraexposure.h>
-#include <qcamerafocus.h>
-#include <qcameraimageprocessing.h>
+#include <QtMultimedia/qcameraexposure.h>
+#include <QtMultimedia/qcamerafocus.h>
+#include <QtMultimedia/qcameraimageprocessing.h>
 
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index 09d6624..31be787 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -42,8 +42,8 @@
 #ifndef QCAMERAEXPOSURE_H
 #define QCAMERAEXPOSURE_H
 
-#include <qmediaobject.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 2b98257..7f50170 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -49,8 +49,8 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qshareddata.h>
 
-#include <qmediaobject.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index cd363a8..fafffcb 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -42,12 +42,12 @@
 #ifndef QCAMERAIMAGECAPTURE_H
 #define QCAMERAIMAGECAPTURE_H
 
-#include <qmediaobject.h>
-#include <qmediaencodersettings.h>
-#include <qmediabindableinterface.h>
-#include <qvideoframe.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaencodersettings.h>
+#include <QtMultimedia/qmediabindableinterface.h>
+#include <QtMultimedia/qvideoframe.h>
 
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index e48f6e4..ee3975d 100644
--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -48,10 +48,10 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
-#include <qmediaservice.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h
index 9de9433..5b5a814 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.h
+++ b/src/multimedia/controls/qaudiodecodercontrol.h
@@ -42,12 +42,12 @@
 #ifndef QAUDIODECODERCONTROL_H
 #define QAUDIODECODERCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qaudiodecoder.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qaudiodecoder.h>
 
 #include <QtCore/qpair.h>
 
-#include "qaudiobuffer.h"
+#include <QtMultimedia/qaudiobuffer.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h
index 38f9907..99e6e95 100644
--- a/src/multimedia/controls/qaudioencodersettingscontrol.h
+++ b/src/multimedia/controls/qaudioencodersettingscontrol.h
@@ -42,8 +42,8 @@
 #ifndef QAUDIOENCODERSETTINGSCONTROL_H
 #define QAUDIOENCODERSETTINGSCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmediarecorder.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediarecorder.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 
diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h
index bdf4837..a147d2a 100644
--- a/src/multimedia/controls/qaudioinputselectorcontrol.h
+++ b/src/multimedia/controls/qaudioinputselectorcontrol.h
@@ -42,8 +42,8 @@
 #ifndef QAUDIOINPUTSELECTORCONTROL_H
 #define QAUDIOINPUTSELECTORCONTROL_H
 
-#include <qaudio.h>
-#include <qmediacontrol.h>
+#include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h
index 7ee20c0..7462d9e 100644
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.h
+++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h
@@ -42,8 +42,8 @@
 #ifndef QAUDIOOUTPUTSELECTORCONTROL_H
 #define QAUDIOOUTPUTSELECTORCONTROL_H
 
-#include <qaudio.h>
-#include <qmediacontrol.h>
+#include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
index d4b3954..2cc3d03 100644
--- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
@@ -42,8 +42,8 @@
 #ifndef QCAMERACAPTUREBUFFERFORMATCONTROL_H
 #define QCAMERACAPTUREBUFFERFORMATCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qcameraimagecapture.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qcameraimagecapture.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h
index d3068a1..a1bfbba 100644
--- a/src/multimedia/controls/qcameracapturedestinationcontrol.h
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h
@@ -42,8 +42,8 @@
 #ifndef QCAMERACAPTUREDESTINATIONCONTROL_H
 #define QCAMERACAPTUREDESTINATIONCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qcameraimagecapture.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qcameraimagecapture.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h
index 416b84d..41d44bb 100644
--- a/src/multimedia/controls/qcameracontrol.h
+++ b/src/multimedia/controls/qcameracontrol.h
@@ -42,10 +42,10 @@
 #ifndef QCAMERACONTROL_H
 #define QCAMERACONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qcamera.h>
+#include <QtMultimedia/qcamera.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h
index 684a167..70b1946 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -42,12 +42,12 @@
 #ifndef QCAMERAEXPOSURECONTROL_H
 #define QCAMERAEXPOSURECONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qcameraexposure.h>
-#include <qcamera.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qcameraexposure.h>
+#include <QtMultimedia/qcamera.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h
index 27532a6..c355c4c 100644
--- a/src/multimedia/controls/qcamerafeedbackcontrol.h
+++ b/src/multimedia/controls/qcamerafeedbackcontrol.h
@@ -44,11 +44,11 @@
 #ifndef QCAMERAFEEDBACKCONTROL_H
 #define QCAMERAFEEDBACKCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qcamera.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qcamera.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h
index 1f29c46..5fd19bc 100644
--- a/src/multimedia/controls/qcameraflashcontrol.h
+++ b/src/multimedia/controls/qcameraflashcontrol.h
@@ -42,11 +42,11 @@
 #ifndef QCAMERAFLASHCONTROL_H
 #define QCAMERAFLASHCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qcameraexposure.h>
-#include <qcamera.h>
+#include <QtMultimedia/qcameraexposure.h>
+#include <QtMultimedia/qcamera.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h
index 00bdf7c..362f75b 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.h
+++ b/src/multimedia/controls/qcamerafocuscontrol.h
@@ -42,10 +42,10 @@
 #ifndef QCAMERAFOCUSCONTROL_H
 #define QCAMERAFOCUSCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qcamerafocus.h>
+#include <QtMultimedia/qcamerafocus.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h
index 085a42f..c738c0a 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.h
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.h
@@ -42,8 +42,8 @@
 #ifndef QCAMERAIMAGECAPTURECONTROL_H
 #define QCAMERAIMAGECAPTURECONTROL_H
 
-#include <qmediacontrol.h>
-#include <qcameraimagecapture.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qcameraimagecapture.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h
index 1fe1cf7..9b5456a 100644
--- a/src/multimedia/controls/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h
@@ -42,11 +42,11 @@
 #ifndef QCAMERAIMAGEPROCESSINGCONTROL_H
 #define QCAMERAIMAGEPROCESSINGCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qcamera.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qcamera.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h
index e85bf47..89a72b9 100644
--- a/src/multimedia/controls/qcameralockscontrol.h
+++ b/src/multimedia/controls/qcameralockscontrol.h
@@ -42,10 +42,10 @@
 #ifndef QCAMERALOCKSCONTROL_H
 #define QCAMERALOCKSCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qcamera.h>
+#include <QtMultimedia/qcamera.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
index 297732f..31aa81b 100644
--- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h
+++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
@@ -44,7 +44,7 @@
 #ifndef QCAMERAVIEWFINDERSETTINGSCONTROL_H
 #define QCAMERAVIEWFINDERSETTINGSCONTROL_H
 
-#include <qmediacontrol.h>
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h
index b60dc49..d143abc 100644
--- a/src/multimedia/controls/qcamerazoomcontrol.h
+++ b/src/multimedia/controls/qcamerazoomcontrol.h
@@ -42,8 +42,8 @@
 #ifndef QCAMERAZOOMCONTROL_H
 #define QCAMERAZOOMCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h
index 4d6de65..b870499 100644
--- a/src/multimedia/controls/qimageencodercontrol.h
+++ b/src/multimedia/controls/qimageencodercontrol.h
@@ -42,9 +42,9 @@
 #ifndef QIMAGEENCODERCONTROL_H
 #define QIMAGEENCODERCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmediarecorder.h"
-#include "qmediaencodersettings.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediarecorder.h>
+#include <QtMultimedia/qmediaencodersettings.h>
 
 #include <QtCore/qsize.h>
 
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h
index 02846d1..de13af8 100644
--- a/src/multimedia/controls/qmediaaudioprobecontrol.h
+++ b/src/multimedia/controls/qmediaaudioprobecontrol.h
@@ -42,7 +42,7 @@
 #ifndef QMEDIAAUDIOPROBECONTROL_H
 #define QMEDIAAUDIOPROBECONTROL_H
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h
index 190e460..781d173 100644
--- a/src/multimedia/controls/qmediaavailabilitycontrol.h
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.h
@@ -42,9 +42,9 @@
 #ifndef QMEDIAAVAILABILITYCONTROL_H
 #define QMEDIAAVAILABILITYCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h
index 888b7dc..7600811 100644
--- a/src/multimedia/controls/qmediacontainercontrol.h
+++ b/src/multimedia/controls/qmediacontainercontrol.h
@@ -43,7 +43,7 @@
 #ifndef QMEDIACONTAINERCONTROL_H
 #define QMEDIACONTAINERCONTROL_H
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
index 56eda71..050edf9 100644
--- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h
+++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
@@ -41,8 +41,8 @@
 #ifndef QMEDIAGAPLESSPLAYBACKCONTROL_H
 #define QMEDIAGAPLESSPLAYBACKCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmediacontent.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediacontent.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h
index 1e595cc..fb5847d 100644
--- a/src/multimedia/controls/qmedianetworkaccesscontrol.h
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h
@@ -43,7 +43,7 @@
 #ifndef QMEDIANETWORKACCESSCONTROL_H
 #define QMEDIANETWORKACCESSCONTROL_H
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 
 #include <QtCore/qlist.h>
 #include <QtNetwork/qnetworkconfiguration.h>
diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h
index 7430418..9c54ff2 100644
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -42,9 +42,9 @@
 #ifndef QMEDIAPLAYERCONTROL_H
 #define QMEDIAPLAYERCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmediaplayer.h"
-#include "qmediatimerange.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaplayer.h>
+#include <QtMultimedia/qmediatimerange.h>
 
 #include <QtCore/qpair.h>
 
diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h
index a9bf5bc..e254390 100644
--- a/src/multimedia/controls/qmediarecordercontrol.h
+++ b/src/multimedia/controls/qmediarecordercontrol.h
@@ -42,8 +42,8 @@
 #ifndef QMEDIARECORDERCONTROL_H
 #define QMEDIARECORDERCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmediarecorder.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediarecorder.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h
index de13f95..f7a92fe 100644
--- a/src/multimedia/controls/qmediastreamscontrol.h
+++ b/src/multimedia/controls/qmediastreamscontrol.h
@@ -43,10 +43,10 @@
 #ifndef QMEDIASTREAMSCONTROL_H
 #define QMEDIASTREAMSCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmultimedia.h"
-#include "qtmultimediadefs.h"
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h
index 0085ebd..7764cc1 100644
--- a/src/multimedia/controls/qmediavideoprobecontrol.h
+++ b/src/multimedia/controls/qmediavideoprobecontrol.h
@@ -44,7 +44,7 @@
 #ifndef QMEDIAVIDEOPROBECONTROL_H
 #define QMEDIAVIDEOPROBECONTROL_H
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h
index 1d9b94a..9399618 100644
--- a/src/multimedia/controls/qmetadatareadercontrol.h
+++ b/src/multimedia/controls/qmetadatareadercontrol.h
@@ -42,13 +42,13 @@
 #ifndef QMETADATAREADERCONTROL_H
 #define QMETADATAREADERCONTROL_H
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include <qmediaresource.h>
+#include <QtMultimedia/qmediaresource.h>
 
-#include <qtmultimediadefs.h>
-#include "qmultimedia.h"
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h
index ecbf329..dcd62f2 100644
--- a/src/multimedia/controls/qmetadatawritercontrol.h
+++ b/src/multimedia/controls/qmetadatawritercontrol.h
@@ -42,13 +42,13 @@
 #ifndef QMETADATAWRITERCONTROL_H
 #define QMETADATAWRITERCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmediaobject.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
 
-#include "qmediaresource.h"
+#include <QtMultimedia/qmediaresource.h>
 
-#include <qtmultimediadefs.h>
-#include "qmultimedia.h"
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h
index 7097946..7d485a3 100644
--- a/src/multimedia/controls/qradiodatacontrol.h
+++ b/src/multimedia/controls/qradiodatacontrol.h
@@ -42,8 +42,8 @@
 #ifndef QRADIODATACONTROL_H
 #define QRADIODATACONTROL_H
 
-#include "qmediacontrol.h"
-#include "qradiodata.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qradiodata.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h
index 72aac32..1bc24fc 100644
--- a/src/multimedia/controls/qradiotunercontrol.h
+++ b/src/multimedia/controls/qradiotunercontrol.h
@@ -42,8 +42,8 @@
 #ifndef QRADIOTUNERCONTROL_H
 #define QRADIOTUNERCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qradiotuner.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qradiotuner.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h
index cee69c3..c7ee9b5 100644
--- a/src/multimedia/controls/qvideodeviceselectorcontrol.h
+++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h
@@ -42,7 +42,7 @@
 #ifndef QVIDEODEVICESELECTORCONTROL_H
 #define QVIDEODEVICESELECTORCONTROL_H
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h
index 88f4fc9..a7a6aa8 100644
--- a/src/multimedia/controls/qvideoencodersettingscontrol.h
+++ b/src/multimedia/controls/qvideoencodersettingscontrol.h
@@ -42,8 +42,8 @@
 #ifndef QVIDEOENCODERSETTINGSCONTROL_H
 #define QVIDEOENCODERSETTINGSCONTROL_H
 
-#include "qmediacontrol.h"
-#include "qmediarecorder.h"
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediarecorder.h>
 
 #include <QtCore/qpair.h>
 #include <QtCore/qsize.h>
diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h
index e6a6994..0d1a186 100644
--- a/src/multimedia/controls/qvideorenderercontrol.h
+++ b/src/multimedia/controls/qvideorenderercontrol.h
@@ -42,7 +42,7 @@
 #ifndef QVIDEORENDERERCONTROL_H
 #define QVIDEORENDERERCONTROL_H
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h
index 556d1eb..443417a 100644
--- a/src/multimedia/controls/qvideowindowcontrol.h
+++ b/src/multimedia/controls/qvideowindowcontrol.h
@@ -42,7 +42,7 @@
 #ifndef QVIDEOWINDOWCONTROL_H
 #define QVIDEOWINDOWCONTROL_H
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qsize.h>
 #include <QtGui/qwindowdefs.h>
diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h
index fb16d4d..2e7a941 100644
--- a/src/multimedia/playback/qmediacontent.h
+++ b/src/multimedia/playback/qmediacontent.h
@@ -45,9 +45,9 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qshareddata.h>
 
-#include "qmediaresource.h"
+#include <QtMultimedia/qmediaresource.h>
 
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index ab8f214..df75d61 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -42,9 +42,9 @@
 #ifndef QMEDIAPLAYER_H
 #define QMEDIAPLAYER_H
 
-#include "qmediaobject.h"
-#include "qmediacontent.h"
-#include "qmediaenumdebug.h"
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediacontent.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 #include <QtNetwork/qnetworkconfiguration.h>
 
diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
index f88b94e..78bde5c 100644
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
@@ -44,10 +44,10 @@
 
 #include <QtCore/qobject.h>
 
-#include <qmediacontent.h>
-#include <qmediaobject.h>
-#include <qmediabindableinterface.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediacontent.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediabindableinterface.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/playback/qmediaresource.h b/src/multimedia/playback/qmediaresource.h
index 805ce5c..ff29d49 100644
--- a/src/multimedia/playback/qmediaresource.h
+++ b/src/multimedia/playback/qmediaresource.h
@@ -46,7 +46,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtNetwork/qnetworkrequest.h>
 
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/qmediabindableinterface.h b/src/multimedia/qmediabindableinterface.h
index b45c901..d8c8566 100644
--- a/src/multimedia/qmediabindableinterface.h
+++ b/src/multimedia/qmediabindableinterface.h
@@ -42,7 +42,7 @@
 #ifndef QMEDIABINDABLEINTERFACE_H
 #define QMEDIABINDABLEINTERFACE_H
 
-#include <qmediaobject.h>
+#include <QtMultimedia/qmediaobject.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h
index 0356fc5..b014a14 100644
--- a/src/multimedia/qmediacontrol.h
+++ b/src/multimedia/qmediacontrol.h
@@ -42,7 +42,7 @@
 #ifndef QABSTRACTMEDIACONTROL_H
 #define QABSTRACTMEDIACONTROL_H
 
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
diff --git a/src/multimedia/qmediametadata.h b/src/multimedia/qmediametadata.h
index 87a7232..9939874 100644
--- a/src/multimedia/qmediametadata.h
+++ b/src/multimedia/qmediametadata.h
@@ -46,7 +46,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qstring.h>
 
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h
index 7a70bb4..3726af5 100644
--- a/src/multimedia/qmediaobject.h
+++ b/src/multimedia/qmediaobject.h
@@ -45,8 +45,8 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
-#include <qtmultimediadefs.h>
-#include "qmultimedia.h"
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h
index 0ca3e02..91b8fcf 100644
--- a/src/multimedia/qmediaservice.h
+++ b/src/multimedia/qmediaservice.h
@@ -42,11 +42,11 @@
 #ifndef QABSTRACTMEDIASERVICE_H
 #define QABSTRACTMEDIASERVICE_H
 
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qstringlist.h>
 
-#include "qmediacontrol.h"
+#include <QtMultimedia/qmediacontrol.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h
index 65dbae1..870ee59 100644
--- a/src/multimedia/qmediaserviceproviderplugin.h
+++ b/src/multimedia/qmediaserviceproviderplugin.h
@@ -44,8 +44,8 @@
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qplugin.h>
-#include <qmultimedia.h>
-#include <qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
 
 #ifdef Q_MOC_RUN
 # pragma Q_MOC_EXPAND_MACROS
diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h
index 4f5ad1d..c0a6993 100644
--- a/src/multimedia/qmediatimerange.h
+++ b/src/multimedia/qmediatimerange.h
@@ -42,8 +42,8 @@
 #ifndef QMEDIATIMERANGE_H
 #define QMEDIATIMERANGE_H
 
-#include <qtmultimediadefs.h>
-#include "qmultimedia.h"
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 #include <QtCore/qshareddata.h>
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/qmultimedia.h b/src/multimedia/qmultimedia.h
index 336c418..c0dafe7 100644
--- a/src/multimedia/qmultimedia.h
+++ b/src/multimedia/qmultimedia.h
@@ -46,8 +46,8 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qstring.h>
 
-#include <qtmultimediadefs.h>
-#include <qmediametadata.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h
index 6d67bce..92d08b9 100644
--- a/src/multimedia/radio/qradiodata.h
+++ b/src/multimedia/radio/qradiodata.h
@@ -44,9 +44,9 @@
 
 #include <QtCore/qobject.h>
 
-#include <qmediaobject.h>
-#include <qmediabindableinterface.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediabindableinterface.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h
index 463cafd..de92e95 100644
--- a/src/multimedia/radio/qradiotuner.h
+++ b/src/multimedia/radio/qradiotuner.h
@@ -44,10 +44,10 @@
 
 #include <QtCore/qobject.h>
 
-#include "qmediaobject.h"
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
-#include <QPair>
+#include <QtCore/qpair.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h
index 1ab6a34..cb1d0a7 100644
--- a/src/multimedia/recording/qaudiorecorder.h
+++ b/src/multimedia/recording/qaudiorecorder.h
@@ -42,10 +42,10 @@
 #ifndef QAUDIORECORDER_H
 #define QAUDIORECORDER_H
 
-#include <qmediarecorder.h>
-#include <qmediaobject.h>
-#include <qmediaencodersettings.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmediarecorder.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaencodersettings.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 #include <QtCore/qpair.h>
 
diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h
index 6cd3e55..06ee921 100644
--- a/src/multimedia/recording/qmediaencodersettings.h
+++ b/src/multimedia/recording/qmediaencodersettings.h
@@ -46,8 +46,8 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qvariant.h>
-#include <qtmultimediadefs.h>
-#include "qmultimedia.h"
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index 1f27b6f..7c019d7 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -42,11 +42,11 @@
 #ifndef QMEDIARECORDER_H
 #define QMEDIARECORDER_H
 
-#include <qmultimedia.h>
-#include <qmediaobject.h>
-#include <qmediaencodersettings.h>
-#include <qmediabindableinterface.h>
-#include <qmediaenumdebug.h>
+#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaencodersettings.h>
+#include <QtMultimedia/qmediabindableinterface.h>
+#include <QtMultimedia/qmediaenumdebug.h>
 
 #include <QtCore/qpair.h>
 
diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h
index 59edc32..b3b0644 100644
--- a/src/multimedia/video/qabstractvideobuffer.h
+++ b/src/multimedia/video/qabstractvideobuffer.h
@@ -42,8 +42,8 @@
 #ifndef QABSTRACTVIDEOBUFFER_H
 #define QABSTRACTVIDEOBUFFER_H
 
-#include <qtmultimediadefs.h>
-#include <qmultimedia.h>
+#include <QtMultimedia/qtmultimediadefs.h>
+#include <QtMultimedia/qmultimedia.h>
 
 
 #include <QtCore/qmetatype.h>
diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h
index d0fc919..bd634f6 100644
--- a/src/multimedia/video/qabstractvideosurface.h
+++ b/src/multimedia/video/qabstractvideosurface.h
@@ -43,7 +43,7 @@
 #define QABSTRACTVIDEOSURFACE_H
 
 #include <QtCore/qobject.h>
-#include <qvideoframe.h>
+#include <QtMultimedia/qvideoframe.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h
index eb073cb..84a048e 100644
--- a/src/multimedia/video/qvideoframe.h
+++ b/src/multimedia/video/qvideoframe.h
@@ -45,7 +45,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qshareddata.h>
 #include <QtGui/qimage.h>
-#include <qabstractvideobuffer.h>
+#include <QtMultimedia/qabstractvideobuffer.h>
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_HEADER
diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h
index 34c315b..e7718c6 100644
--- a/src/multimedia/video/qvideoprobe.h
+++ b/src/multimedia/video/qvideoprobe.h
@@ -43,7 +43,7 @@
 #define QVIDEOPROBE_H
 
 #include <QObject>
-#include <qvideoframe.h>
+#include <QtMultimedia/qvideoframe.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h
index e0abf71..617ecca 100644
--- a/src/multimedia/video/qvideosurfaceformat.h
+++ b/src/multimedia/video/qvideosurfaceformat.h
@@ -47,7 +47,7 @@
 #include <QtCore/qshareddata.h>
 #include <QtCore/qsize.h>
 #include <QtGui/qimage.h>
-#include <qvideoframe.h>
+#include <QtMultimedia/qvideoframe.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h
index b3e5065..134ec41 100644
--- a/src/multimediawidgets/qcameraviewfinder.h
+++ b/src/multimediawidgets/qcameraviewfinder.h
@@ -48,10 +48,10 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
 
-#include <qmediacontrol.h>
-#include <qmediaobject.h>
-#include <qmediaservice.h>
-#include <qvideowidget.h>
+#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qmediaobject.h>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimediaWidgets/qvideowidget.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index 367c434..6137846 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -44,8 +44,8 @@
 
 #include <QtWidgets/qgraphicsitem.h>
 
-#include <qvideowidget.h>
-#include <qmediabindableinterface.h>
+#include <QtMultimediaWidgets/qvideowidget.h>
+#include <QtMultimedia/qmediabindableinterface.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h
index 3c034d4..8ffaffb 100644
--- a/src/multimediawidgets/qvideowidget.h
+++ b/src/multimediawidgets/qvideowidget.h
@@ -44,8 +44,8 @@
 
 #include <QtWidgets/qwidget.h>
 
-#include <qtmultimediawidgetdefs.h>
-#include <qmediabindableinterface.h>
+#include <QtMultimediaWidgets/qtmultimediawidgetdefs.h>
+#include <QtMultimedia/qmediabindableinterface.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h
index 6615f8d..8726210 100644
--- a/src/multimediawidgets/qvideowidgetcontrol.h
+++ b/src/multimediawidgets/qvideowidgetcontrol.h
@@ -42,8 +42,8 @@
 #ifndef QVIDEOWIDGETCONTROL_H
 #define QVIDEOWIDGETCONTROL_H
 
-#include "qvideowidget.h"
-#include "qmediacontrol.h"
+#include <QtMultimediaWidgets/qvideowidget.h>
+#include <QtMultimedia/qmediacontrol.h>
 
 #include <QtWidgets/qwidget.h>
 
diff --git a/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h
index 0f64a48..a72b4eb 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h
@@ -42,7 +42,7 @@
 #ifndef MOCKCAMERACAPTUREDESTINATIONCONTROL_H
 #define MOCKCAMERACAPTUREDESTINATIONCONTROL_H
 
-#include "qcameracapturedestinationcontrol.h"
+#include <QtMultimedia/qcameracapturedestinationcontrol.h>
 
 class MockCaptureDestinationControl : public QCameraCaptureDestinationControl
 {