455 files changed, 3869 insertions, 2509 deletions

diff --git a/examples/multimedia/declarative-camera/Info.plist b/examples/multimedia/declarative-camera/Info.plist
index 462df2ae0..d664a2460 100644
--- a/examples/multimedia/declarative-camera/Info.plist
+++ b/examples/multimedia/declarative-camera/Info.plist
@@ -2,40 +2,42 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleExecutable</key>
-	<string>declarative-camera</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.qt-company.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>NOTE</key>
-	<string>This file was generated by Qt/QMake.</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Qt Multimedia Example</string>
+    <key>CFBundleIconFile</key>
+    <string></string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleGetInfoString</key>
+    <string>Created by Qt/QMake</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleExecutable</key>
+    <string>declarative-camera</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.digia.${PRODUCT_NAME:rfc1034identifier}</string>
+    <key>CFBundleDisplayName</key>
+    <string>declarative-camera</string>
+    <key>CFBundleName</key>
+    <string>declarative-camera</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1.0</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+            <string>UIInterfaceOrientationPortrait</string>
+            <string>UIInterfaceOrientationPortraitUpsideDown</string>
+            <string>UIInterfaceOrientationLandscapeLeft</string>
+            <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>NSCameraUsageDescription</key>
+    <string>Qt Multimedia Example</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Qt Multimedia Example</string>
+    <key>NOTE</key>
+    <string>This file was generated by Qt/QMake.</string>
 </dict>
 </plist>
diff --git a/src/.prev_CMakeLists.txt b/src/.prev_CMakeLists.txt
new file mode 100644
index 000000000..513092649
--- /dev/null
+++ b/src/.prev_CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from src.pro.
+
+add_subdirectory(multimedia)
+if(ANDROID)
+    add_subdirectory(android)
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6761cf84..54f109164 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,9 @@
 # Generated from src.pro.
 
 add_subdirectory(multimedia)
+if(ANDROID)
+    add_subdirectory(android)
+endif()
 
 # special case begin
 if(TARGET Qt::Quick)
diff --git a/src/android/CMakeLists.txt b/src/android/CMakeLists.txt
new file mode 100644
index 000000000..d437e8f0a
--- /dev/null
+++ b/src/android/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from android.pro.
+
+add_subdirectory(jar)
diff --git a/src/android/android.pro b/src/android/android.pro
new file mode 100644
index 000000000..df5846945
--- /dev/null
+++ b/src/android/android.pro
@@ -0,0 +1,2 @@
+TEMPLATE      = subdirs
+SUBDIRS       = jar
diff --git a/src/plugins/android/jar/AndroidManifest.xml b/src/android/jar/AndroidManifest.xml
index 17019fb34..17019fb34 100644
--- a/src/plugins/android/jar/AndroidManifest.xml
+++ b/src/android/jar/AndroidManifest.xml
diff --git a/src/plugins/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt
index 796bf43a1..796bf43a1 100644
--- a/src/plugins/android/jar/CMakeLists.txt
+++ b/src/android/jar/CMakeLists.txt
diff --git a/src/plugins/android/jar/jar.pro b/src/android/jar/jar.pro
index 0ef830f32..0ef830f32 100644
--- a/src/plugins/android/jar/jar.pro
+++ b/src/android/jar/jar.pro
diff --git a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java
index aa706179c..aa706179c 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java
diff --git a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtCameraListener.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtCameraListener.java
index ff26d90c3..ff26d90c3 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtCameraListener.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtCameraListener.java
diff --git a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java
index bf1763dee..bf1763dee 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java
diff --git a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java
index 28d56e0dd..28d56e0dd 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java
diff --git a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java
index 62000716b..62000716b 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java
diff --git a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java
index ea7a41505..ea7a41505 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java
diff --git a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java
index 4d929c6ad..4d929c6ad 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java
+++ b/src/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java
diff --git a/src/multimedia/.prev_CMakeLists.txt b/src/multimedia/.prev_CMakeLists.txt
new file mode 100644
index 000000000..7e8f007a4
--- /dev/null
+++ b/src/multimedia/.prev_CMakeLists.txt
@@ -0,0 +1,569 @@
+# Generated from multimedia.pro.
+
+#####################################################################
+## Multimedia Module:
+#####################################################################
+
+qt_internal_add_module(Multimedia
+    PLUGIN_TYPES video/gstvideorenderer video/videonode
+    SOURCES
+        audio/qaudio.cpp audio/qaudio.h
+        audio/qaudiobuffer.cpp audio/qaudiobuffer.h audio/qaudiobuffer_p.h
+        audio/qaudiodecoder.cpp audio/qaudiodecoder.h
+        audio/qaudiodevicefactory.cpp audio/qaudiodevicefactory_p.h
+        audio/qaudiodeviceinfo.cpp audio/qaudiodeviceinfo.h
+        audio/qaudioformat.cpp audio/qaudioformat.h
+        audio/qaudiohelpers.cpp audio/qaudiohelpers_p.h
+        audio/qaudioinput.cpp audio/qaudioinput.h
+        audio/qaudiooutput.cpp audio/qaudiooutput.h
+        audio/qaudioprobe.cpp audio/qaudioprobe.h
+        audio/qaudiosystem.cpp audio/qaudiosystem_p.h
+        audio/qsamplecache_p.cpp audio/qsamplecache_p.h
+        audio/qsoundeffect.cpp audio/qsoundeffect.h
+        audio/qwavedecoder_p.cpp audio/qwavedecoder_p.h
+        camera/qcamera.cpp camera/qcamera.h camera/qcamera_p.h
+        camera/qcameraexposure.cpp camera/qcameraexposure.h
+        camera/qcamerafocus.cpp camera/qcamerafocus.h
+        camera/qcameraimagecapture.cpp camera/qcameraimagecapture.h
+        camera/qcameraimageprocessing.cpp camera/qcameraimageprocessing.h
+        camera/qcamerainfo.cpp camera/qcamerainfo.h
+        camera/qcameraviewfindersettings.cpp camera/qcameraviewfindersettings.h
+        controls/qaudiodecodercontrol.cpp controls/qaudiodecodercontrol.h
+        controls/qaudioencodersettingscontrol.cpp controls/qaudioencodersettingscontrol.h
+        controls/qaudioinputselectorcontrol.cpp controls/qaudioinputselectorcontrol.h
+        controls/qaudiooutputselectorcontrol.cpp controls/qaudiooutputselectorcontrol.h
+        controls/qcameracontrol.cpp controls/qcameracontrol.h
+        controls/qcameraexposurecontrol.cpp controls/qcameraexposurecontrol.h
+        controls/qcamerafocuscontrol.cpp controls/qcamerafocuscontrol.h
+        controls/qcameraimagecapturecontrol.cpp controls/qcameraimagecapturecontrol.h
+        controls/qcameraimageprocessingcontrol.cpp controls/qcameraimageprocessingcontrol.h
+        controls/qimageencodercontrol.cpp controls/qimageencodercontrol.h
+        controls/qmediaaudioprobecontrol.cpp controls/qmediaaudioprobecontrol.h
+        controls/qmediacontainercontrol.cpp controls/qmediacontainercontrol.h
+        controls/qmediaplayercontrol.cpp controls/qmediaplayercontrol.h
+        controls/qmediarecordercontrol.cpp controls/qmediarecordercontrol.h
+        controls/qmediastreamscontrol.cpp controls/qmediastreamscontrol.h
+        controls/qmediavideoprobecontrol.cpp controls/qmediavideoprobecontrol.h
+        controls/qmetadatareadercontrol.cpp controls/qmetadatareadercontrol.h
+        controls/qmetadatawritercontrol.cpp controls/qmetadatawritercontrol.h
+        controls/qvideodeviceselectorcontrol.cpp controls/qvideodeviceselectorcontrol.h
+        controls/qvideoencodersettingscontrol.cpp controls/qvideoencodersettingscontrol.h
+        controls/qvideorenderercontrol.cpp controls/qvideorenderercontrol.h
+        controls/qvideowindowcontrol.cpp controls/qvideowindowcontrol.h
+        playback/qmediaplayer.cpp playback/qmediaplayer.h
+        playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h
+        playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h
+        qmediaenumdebug.h
+        qmediametadata.cpp qmediametadata.h
+        qmediapluginloader.cpp qmediapluginloader_p.h
+        qmediaservice.cpp qmediaservice.h qmediaservice_p.h
+        qmediaserviceprovider.cpp qmediaserviceprovider_p.h
+        qmediaserviceproviderplugin.h
+        qmediasink.cpp qmediasink.h
+        qmediasource.cpp qmediasource.h qmediasource_p.h
+        qmediastoragelocation.cpp qmediastoragelocation_p.h
+        qmediatimerange.cpp qmediatimerange.h
+        qmultimedia.cpp qmultimedia.h
+        qmultimediautils.cpp qmultimediautils_p.h
+        qtmultimediaglobal.h qtmultimediaglobal_p.h
+        recording/qmediaencodersettings.cpp recording/qmediaencodersettings.h
+        recording/qmediarecorder.cpp recording/qmediarecorder.h recording/qmediarecorder_p.h
+        video/qabstractvideobuffer.cpp video/qabstractvideobuffer.h video/qabstractvideobuffer_p.h
+        video/qabstractvideofilter.cpp video/qabstractvideofilter.h
+        video/qabstractvideosurface.cpp video/qabstractvideosurface.h
+        video/qimagevideobuffer.cpp video/qimagevideobuffer_p.h
+        video/qmemoryvideobuffer.cpp video/qmemoryvideobuffer_p.h
+        video/qvideoframe.cpp video/qvideoframe.h
+        video/qvideoframeconversionhelper.cpp video/qvideoframeconversionhelper_p.h
+        video/qvideooutputorientationhandler.cpp video/qvideooutputorientationhandler_p.h
+        video/qvideoprobe.cpp video/qvideoprobe.h
+        video/qvideosurfaceformat.cpp video/qvideosurfaceformat.h
+        video/qvideosurfaceoutput.cpp video/qvideosurfaceoutput_p.h
+        video/qvideosurfaces.cpp video/qvideosurfaces_p.h
+    INCLUDE_DIRECTORIES
+        .
+        audio
+        camera
+        controls
+        playback
+        recording
+        video
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Network
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+
+qt_internal_add_simd_part(Multimedia SIMD sse2
+    SOURCES
+        video/qvideoframeconversionhelper_sse2.cpp
+)
+
+qt_internal_add_simd_part(Multimedia SIMD ssse3
+    SOURCES
+        video/qvideoframeconversionhelper_ssse3.cpp
+)
+
+qt_internal_add_simd_part(Multimedia SIMD avx2
+    SOURCES
+        video/qvideoframeconversionhelper_avx2.cpp
+)
+
+
+if(ANDROID)
+    set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+        jar/QtAndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils
+    )
+    set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
+        lib/libQt5MultimediaQuick.so:Qt5Quick
+        plugins/mediaservice/libplugins_mediaservice_qtmedia_android.so
+    )
+    set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_BUNDLED_FILES
+        lib/libQt5MultimediaQuick.so
+    )
+    set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_PERMISSIONS
+        android.permission.CAMERA android.permission.RECORD_AUDIO
+    )
+endif()
+
+#### Keys ignored in scope 1:.:.:multimedia.pro:<TRUE>:
+# ANDROID_FEATURES = "android.hardware.camera" "android.hardware.camera.autofocus" "android.hardware.microphone"
+# MODULE_WINRT_CAPABILITIES_DEVICE = "microphone" "webcam"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(Multimedia CONDITION WIN32
+    SOURCES
+        platform/wasapi/qwindowsaudiodeviceinfo.cpp platform/wasapi/qwindowsaudiodeviceinfo_p.h
+        platform/wasapi/qwindowsaudioinput.cpp platform/wasapi/qwindowsaudioinput_p.h
+        platform/wasapi/qwindowsaudiointerface.cpp platform/wasapi/qwindowsaudiointerface_p.h
+        platform/wasapi/qwindowsaudiooutput.cpp platform/wasapi/qwindowsaudiooutput_p.h
+        platform/wasapi/qwindowsaudioutils.cpp platform/wasapi/qwindowsaudioutils_p.h
+        platform/wmf/decoder/mfaudiodecodercontrol.cpp platform/wmf/decoder/mfaudiodecodercontrol_p.h
+        platform/wmf/decoder/mfdecodersourcereader.cpp platform/wmf/decoder/mfdecodersourcereader_p.h
+        platform/wmf/evr/evrcustompresenter.cpp platform/wmf/evr/evrcustompresenter_p.h
+        platform/wmf/evr/evrd3dpresentengine.cpp platform/wmf/evr/evrd3dpresentengine_p.h
+        platform/wmf/evr/evrdefs.cpp platform/wmf/evr/evrdefs_p.h
+        platform/wmf/evr/evrhelpers.cpp platform/wmf/evr/evrhelpers_p.h
+        platform/wmf/evr/evrvideowindowcontrol.cpp platform/wmf/evr/evrvideowindowcontrol_p.h
+        platform/wmf/mfstream.cpp platform/wmf/mfstream_p.h
+        platform/wmf/player/mfactivate.cpp platform/wmf/player/mfactivate_p.h
+        platform/wmf/player/mfaudioendpointcontrol.cpp platform/wmf/player/mfaudioendpointcontrol_p.h
+        platform/wmf/player/mfaudioprobecontrol.cpp platform/wmf/player/mfaudioprobecontrol_p.h
+        platform/wmf/player/mfevrvideowindowcontrol.cpp platform/wmf/player/mfevrvideowindowcontrol_p.h
+        platform/wmf/player/mfmetadatacontrol.cpp platform/wmf/player/mfmetadatacontrol_p.h
+        platform/wmf/player/mfplayercontrol.cpp platform/wmf/player/mfplayercontrol_p.h
+        platform/wmf/player/mfplayerservice.cpp platform/wmf/player/mfplayerservice_p.h
+        platform/wmf/player/mfplayersession.cpp platform/wmf/player/mfplayersession_p.h
+        platform/wmf/player/mftvideo.cpp platform/wmf/player/mftvideo_p.h
+        platform/wmf/player/mfvideoprobecontrol.cpp platform/wmf/player/mfvideoprobecontrol_p.h
+        platform/wmf/player/mfvideorenderercontrol.cpp platform/wmf/player/mfvideorenderercontrol_p.h
+        platform/wmf/player/samplegrabber.cpp platform/wmf/player/samplegrabber_p.h
+        platform/wmf/sourceresolver.cpp platform/wmf/sourceresolver_p.h
+        platform/wmf/wmfserviceplugin.cpp platform/wmf/wmfserviceplugin_p.h
+    INCLUDE_DIRECTORIES
+        .
+        platform/wmf/decoder
+        platform/wmf/evr
+        platform/wmf/player
+    LIBRARIES
+        Qt::GuiPrivate
+        uuid
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Network
+        d3d9
+        dxva2
+        evr
+        gdi32
+        mf
+        mfplat
+        mfreadwrite
+        mfuuid
+        ole32
+        oleaut32
+        strmiids
+        user32
+        winmm
+        wmcodecdspuuid
+        wmf
+    PRIVATE_MODULE_INTERFACE
+        Qt::GuiPrivate
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer
+    SOURCES
+        platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h
+        platform/gstreamer/audio/qaudioengine_gstreamer.cpp platform/gstreamer/audio/qaudioengine_gstreamer_p.h
+        platform/gstreamer/audio/qaudioinput_gstreamer.cpp platform/gstreamer/audio/qaudioinput_gstreamer_p.h
+        platform/gstreamer/audio/qaudiointerface_gstreamer.cpp platform/gstreamer/audio/qaudiointerface_gstreamer_p.h
+        platform/gstreamer/audio/qaudiooutput_gstreamer.cpp platform/gstreamer/audio/qaudiooutput_gstreamer_p.h
+        platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
+        platform/gstreamer/common/qgstappsrc.cpp platform/gstreamer/common/qgstappsrc_p.h
+        platform/gstreamer/common/qgstcodecsinfo.cpp platform/gstreamer/common/qgstcodecsinfo_p.h
+        platform/gstreamer/common/qgstreameraudioinputselector.cpp platform/gstreamer/common/qgstreameraudioinputselector_p.h
+        platform/gstreamer/common/qgstreameraudioprobecontrol.cpp platform/gstreamer/common/qgstreameraudioprobecontrol_p.h
+        platform/gstreamer/common/qgstreamerbufferprobe.cpp platform/gstreamer/common/qgstreamerbufferprobe_p.h
+        platform/gstreamer/common/qgstreamerbushelper.cpp platform/gstreamer/common/qgstreamerbushelper_p.h
+        platform/gstreamer/common/qgstreamermessage.cpp platform/gstreamer/common/qgstreamermessage_p.h
+        platform/gstreamer/common/qgstreamerplayercontrol.cpp platform/gstreamer/common/qgstreamerplayercontrol_p.h
+        platform/gstreamer/common/qgstreamerplayersession.cpp platform/gstreamer/common/qgstreamerplayersession_p.h
+        platform/gstreamer/common/qgstreamervideoinputdevicecontrol.cpp platform/gstreamer/common/qgstreamervideoinputdevicecontrol_p.h
+        platform/gstreamer/common/qgstreamervideooverlay.cpp platform/gstreamer/common/qgstreamervideooverlay_p.h
+        platform/gstreamer/common/qgstreamervideoprobecontrol.cpp platform/gstreamer/common/qgstreamervideoprobecontrol_p.h
+        platform/gstreamer/common/qgstreamervideorenderer.cpp platform/gstreamer/common/qgstreamervideorenderer_p.h
+        platform/gstreamer/common/qgstreamervideorendererinterface.cpp platform/gstreamer/common/qgstreamervideorendererinterface_p.h
+        platform/gstreamer/common/qgstreamervideowindow.cpp platform/gstreamer/common/qgstreamervideowindow_p.h
+        platform/gstreamer/common/qgstutils.cpp platform/gstreamer/common/qgstutils_p.h
+        platform/gstreamer/common/qgstvideobuffer.cpp platform/gstreamer/common/qgstvideobuffer_p.h
+        platform/gstreamer/common/qgstvideorendererplugin.cpp platform/gstreamer/common/qgstvideorendererplugin_p.h
+        platform/gstreamer/common/qgstvideorenderersink.cpp platform/gstreamer/common/qgstvideorenderersink_p.h
+        platform/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp platform/gstreamer/mediaplayer/qgstreamermetadataprovider_p.h
+        platform/gstreamer/mediaplayer/qgstreamerplayerservice.cpp platform/gstreamer/mediaplayer/qgstreamerplayerservice_p.h
+        platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin_p.h
+        platform/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp platform/gstreamer/mediaplayer/qgstreamerstreamscontrol_p.h
+    DEFINES
+        GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
+    INCLUDE_DIRECTORIES
+        platform/gstreamer/mediaplayer
+    LIBRARIES
+        gstreamer
+        gstreamer_app
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND use_camerabin
+    SOURCES
+        platform/gstreamer/camerabin/camerabinaudioencoder.cpp platform/gstreamer/camerabin/camerabinaudioencoder_p.h
+        platform/gstreamer/camerabin/camerabincontainer.cpp platform/gstreamer/camerabin/camerabincontainer_p.h
+        platform/gstreamer/camerabin/camerabincontrol.cpp platform/gstreamer/camerabin/camerabincontrol_p.h
+        platform/gstreamer/camerabin/camerabinimagecapture.cpp platform/gstreamer/camerabin/camerabinimagecapture_p.h
+        platform/gstreamer/camerabin/camerabinimageencoder.cpp platform/gstreamer/camerabin/camerabinimageencoder_p.h
+        platform/gstreamer/camerabin/camerabinimageprocessing.cpp platform/gstreamer/camerabin/camerabinimageprocessing_p.h
+        platform/gstreamer/camerabin/camerabinmetadata.cpp platform/gstreamer/camerabin/camerabinmetadata_p.h
+        platform/gstreamer/camerabin/camerabinrecorder.cpp platform/gstreamer/camerabin/camerabinrecorder_p.h
+        platform/gstreamer/camerabin/camerabinservice.cpp platform/gstreamer/camerabin/camerabinservice_p.h
+        platform/gstreamer/camerabin/camerabinserviceplugin.cpp platform/gstreamer/camerabin/camerabinserviceplugin_p.h
+        platform/gstreamer/camerabin/camerabinsession.cpp platform/gstreamer/camerabin/camerabinsession_p.h
+        platform/gstreamer/camerabin/camerabinvideoencoder.cpp platform/gstreamer/camerabin/camerabinvideoencoder_p.h
+    DEFINES
+        GST_USE_CAMERABIN
+)
+
+qt_internal_extend_target(Multimedia CONDITION ((QT_FEATURE_gstreamer) AND (use_camerabin)) AND (qtConfig(gstreamer__p.hotography))
+    SOURCES
+        platform/gstreamer/camerabin/camerabinexposure.cpp platform/gstreamer/camerabin/camerabinexposure_p.h
+        platform/gstreamer/camerabin/camerabinfocus.cpp platform/gstreamer/camerabin/camerabinfocus_p.h
+    DEFINES
+        GST_USE_UNSTABLE_API
+    PUBLIC_LIBRARIES
+        gstreamer_photography
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_gstreamer_gl AND use_camerabin
+    PUBLIC_LIBRARIES
+        gstreamer_gl
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_linux_v4l AND use_camerabin
+    SOURCES
+        platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND NOT use_camerabin
+    SOURCES
+        platform/gstreamer/mediacapture/qgstreameraudioencode.cpp platform/gstreamer/mediacapture/qgstreameraudioencode_p.h
+        platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
+        platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin_p.h
+        platform/gstreamer/mediacapture/qgstreamercapturesession.cpp platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
+        platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamerimageencode.cpp platform/gstreamer/mediacapture/qgstreamerimageencode_p.h
+        platform/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp platform/gstreamer/mediacapture/qgstreamermediacontainercontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamervideoencode.cpp platform/gstreamer/mediacapture/qgstreamervideoencode_p.h
+    INCLUDE_DIRECTORIES
+        platform/gstreamer/mediacapture
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_linux_v4l AND use_gstreamer_camera AND NOT use_camerabin
+    SOURCES
+        platform/gstreamer/mediacapture/qgstreamerv4l2input.cpp platform/gstreamer/mediacapture/qgstreamerv4l2input_p.h
+    DEFINES
+        USE_GSTREAMER_CAMERA
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_gstreamer_gl
+    PUBLIC_LIBRARIES
+        gstreamer_gl
+)
+
+qt_internal_extend_target(Multimedia CONDITION ANDROID AND QT_FEATURE_gstreamer
+    LIBRARIES
+        # Remove: L$ENV{GSTREAMER_ROOT_ANDROID}/armv7/lib
+        # Remove: Wl,--_p.hole-archive
+        # Remove: Wl,--no-_p.hole-archive
+        WrapIconv::WrapIconv
+        ffi
+        glib-2.0
+        gmodule-2.0
+        gobject-2.0
+        gstapp-1.0
+        gstaudio-1.0
+        gstbase-1.0
+        gstpbutils-1.0
+        gstreamer-1.0
+        gsttag-1.0
+        gstvideo-1.0
+        intl
+        orc-0.4
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio
+    SOURCES
+        platform/pulseaudio/qaudiodeviceinfo_pulse.cpp platform/pulseaudio/qaudiodeviceinfo_pulse_p.h
+        platform/pulseaudio/qaudioengine_pulse.cpp platform/pulseaudio/qaudioengine_pulse_p.h
+        platform/pulseaudio/qaudioinput_pulse.cpp platform/pulseaudio/qaudioinput_pulse_p.h
+        platform/pulseaudio/qaudiointerface_pulse.cpp platform/pulseaudio/qaudiointerface_pulse_p.h
+        platform/pulseaudio/qaudiooutput_pulse.cpp platform/pulseaudio/qaudiooutput_pulse_p.h
+        platform/pulseaudio/qpuls_p.helpers.cpp platform/pulseaudio/qpuls_p.helpers_p.h
+    LIBRARIES
+        pulseaudio
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_alsa
+    SOURCES
+        platform/alsa/qalsaaudiodeviceinfo.cpp platform/alsa/qalsaaudiodeviceinfo_p.h
+        platform/alsa/qalsaaudioinput.cpp platform/alsa/qalsaaudioinput_p.h
+        platform/alsa/qalsaaudiooutput.cpp platform/alsa/qalsaaudiooutput_p.h
+        platform/alsa/qalsainterface.cpp platform/alsa/qalsainterface_p.h
+    LIBRARIES
+        alsa
+)
+
+qt_internal_extend_target(Multimedia CONDITION ANDROID
+    SOURCES
+        platform/android/common/qandroidglobal_p.h
+        platform/android/common/qandroidmultimediautils.cpp platform/android/common/qandroidmultimediautils_p.h
+        platform/android/common/qandroidvideooutput.cpp platform/android/common/qandroidvideooutput_p.h
+        platform/android/mediacapture/qandroidaudioencodersettingscontrol.cpp platform/android/mediacapture/qandroidaudioencodersettingscontrol_p.h
+        platform/android/mediacapture/qandroidaudioinputselectorcontrol.cpp platform/android/mediacapture/qandroidaudioinputselectorcontrol_p.h
+        platform/android/mediacapture/qandroidcameracontrol.cpp platform/android/mediacapture/qandroidcameracontrol_p.h
+        platform/android/mediacapture/qandroidcameraexposurecontrol.cpp platform/android/mediacapture/qandroidcameraexposurecontrol_p.h
+        platform/android/mediacapture/qandroidcamerafocuscontrol.cpp platform/android/mediacapture/qandroidcamerafocuscontrol_p.h
+        platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
+        platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h
+        platform/android/mediacapture/qandroidcamerasession.cpp platform/android/mediacapture/qandroidcamerasession_p.h
+        platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp platform/android/mediacapture/qandroidcameravideorenderercontrol_p.h
+        platform/android/mediacapture/qandroidcaptureservice.cpp platform/android/mediacapture/qandroidcaptureservice_p.h
+        platform/android/mediacapture/qandroidcapturesession.cpp platform/android/mediacapture/qandroidcapturesession_p.h
+        platform/android/mediacapture/qandroidimageencodercontrol.cpp platform/android/mediacapture/qandroidimageencodercontrol_p.h
+        platform/android/mediacapture/qandroidmediacontainercontrol.cpp platform/android/mediacapture/qandroidmediacontainercontrol_p.h
+        platform/android/mediacapture/qandroidmediarecordercontrol.cpp platform/android/mediacapture/qandroidmediarecordercontrol_p.h
+        platform/android/mediacapture/qandroidmediavideoprobecontrol.cpp platform/android/mediacapture/qandroidmediavideoprobecontrol_p.h
+        platform/android/mediacapture/qandroidvideodeviceselectorcontrol.cpp platform/android/mediacapture/qandroidvideodeviceselectorcontrol_p.h
+        platform/android/mediacapture/qandroidvideoencodersettingscontrol.cpp platform/android/mediacapture/qandroidvideoencodersettingscontrol_p.h
+        platform/android/mediaplayer/qandroidmediaplayercontrol.cpp platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
+        platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol_p.h
+        platform/android/mediaplayer/qandroidmediaservice.cpp platform/android/mediaplayer/qandroidmediaservice_p.h
+        platform/android/mediaplayer/qandroidmetadatareadercontrol.cpp platform/android/mediaplayer/qandroidmetadatareadercontrol_p.h
+        platform/android/qandroidmediaserviceplugin.cpp platform/android/qandroidmediaserviceplugin_p.h
+        platform/android/wrappers/jni/androidcamera.cpp platform/android/wrappers/jni/androidcamera_p.h
+        platform/android/wrappers/jni/androidmediametadataretriever.cpp platform/android/wrappers/jni/androidmediametadataretriever_p.h
+        platform/android/wrappers/jni/androidmediaplayer.cpp platform/android/wrappers/jni/androidmediaplayer_p.h
+        platform/android/wrappers/jni/androidmediarecorder.cpp platform/android/wrappers/jni/androidmediarecorder_p.h
+        platform/android/wrappers/jni/androidmultimediautils.cpp platform/android/wrappers/jni/androidmultimediautils_p.h
+        platform/android/wrappers/jni/androidsurfacetexture.cpp platform/android/wrappers/jni/androidsurfacetexture_p.h
+        platform/android/wrappers/jni/androidsurfaceview.cpp platform/android/wrappers/jni/androidsurfaceview_p.h
+        platform/opensles/qopenslesaudioinput.cpp platform/opensles/qopenslesaudioinput_p.h
+        platform/opensles/qopenslesaudiooutput.cpp platform/opensles/qopenslesaudiooutput_p.h
+        platform/opensles/qopenslesdeviceinfo.cpp platform/opensles/qopenslesdeviceinfo_p.h
+        platform/opensles/qopenslesengine.cpp platform/opensles/qopenslesengine_p.h
+        platform/opensles/qopenslesinterface.cpp platform/opensles/qopenslesinterface_p.h
+    INCLUDE_DIRECTORIES
+        platform/android/common
+        platform/android/mediacapture
+        platform/android/mediaplayer
+        platform/android/wrappers/jni
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        OpenSLES
+        Qt::Core
+        Qt::Network
+        Qt::OpenGL
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+)
+
+qt_internal_extend_target(Multimedia CONDITION WIN32 AND NOT TARGET Qt::OpenGL
+    LIBRARIES
+        gdi32
+        user32
+)
+
+qt_internal_extend_target(Multimedia CONDITION TARGET Qt::Widgets AND WIN32
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS
+    SOURCES
+        platform/avfoundation/mediaplayer/avfmediaplayercontrol.mm platform/avfoundation/mediaplayer/avfmediaplayercontrol_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayerservice.mm platform/avfoundation/mediaplayer/avfmediaplayerservice_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin.mm platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayersession.mm platform/avfoundation/mediaplayer/avfmediaplayersession_p.h
+        platform/avfoundation/mediaplayer/avfvideooutput.mm platform/avfoundation/mediaplayer/avfvideooutput_p.h
+        platform/avfoundation/mediaplayer/avfvideowindowcontrol.mm platform/avfoundation/mediaplayer/avfvideowindowcontrol_p.h
+        platform/coreaudio/qcoreaudiodeviceinfo.mm platform/coreaudio/qcoreaudiodeviceinfo_p.h
+        platform/coreaudio/qcoreaudioinput.mm platform/coreaudio/qcoreaudioinput_p.h
+        platform/coreaudio/qcoreaudiointerface.mm platform/coreaudio/qcoreaudiointerface_p.h
+        platform/coreaudio/qcoreaudiooutput.mm platform/coreaudio/qcoreaudiooutput_p.h
+        platform/coreaudio/qcoreaudioutils.mm platform/coreaudio/qcoreaudioutils_p.h
+    PUBLIC_LIBRARIES
+        ${FWAudioToolbox}
+        ${FWCoreAudio}
+        ${FWCoreFoundation}
+        ${FWCoreMedia}
+        ${FWCoreVideo}
+        ${FWFoundation}
+        ${FWMetal}
+        ${FWQuartzCore}
+        Qt::Network
+        Qt::OpenGL
+        avfoundation
+)
+
+qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS AND (IOS OR TVOS)
+    SOURCES
+        platform/coreaudio/qcoreaudiosessionmanager.mm platform/coreaudio/qcoreaudiosessionmanager_p.h
+    PUBLIC_LIBRARIES
+        ${FWAVFoundation}
+        ${FWFoundation}
+)
+
+qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT IOS AND NOT TVOS AND NOT WATCHOS
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWApplicationServices}
+        ${FWAudioUnit}
+)
+
+qt_internal_extend_target(Multimedia CONDITION MACOS AND NOT WATCHOS
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWAudioUnit}
+)
+
+qt_internal_extend_target(Multimedia CONDITION IOS AND NOT WATCHOS
+    PUBLIC_LIBRARIES
+        ${FWCoreGraphics}
+        ${FWCoreVideo}
+)
+
+qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT TVOS AND NOT WATCHOS
+    SOURCES
+        platform/avfoundation/camera/avfaudioencodersettingscontrol.mm platform/avfoundation/camera/avfaudioencodersettingscontrol_p.h
+        platform/avfoundation/camera/avfaudioinputselectorcontrol.mm platform/avfoundation/camera/avfaudioinputselectorcontrol_p.h
+        platform/avfoundation/camera/avfcameracontrol.mm platform/avfoundation/camera/avfcameracontrol_p.h
+        platform/avfoundation/camera/avfcameradebug_p.h
+        platform/avfoundation/camera/avfcameradevicecontrol.mm platform/avfoundation/camera/avfcameradevicecontrol_p.h
+        platform/avfoundation/camera/avfcameraexposurecontrol.mm platform/avfoundation/camera/avfcameraexposurecontrol_p.h
+        platform/avfoundation/camera/avfcamerafocuscontrol.mm platform/avfoundation/camera/avfcamerafocuscontrol_p.h
+        platform/avfoundation/camera/avfcamerametadatacontrol.mm platform/avfoundation/camera/avfcamerametadatacontrol_p.h
+        platform/avfoundation/camera/avfcamerarenderercontrol.mm platform/avfoundation/camera/avfcamerarenderercontrol_p.h
+        platform/avfoundation/camera/avfcameraservice.mm platform/avfoundation/camera/avfcameraservice_p.h
+        platform/avfoundation/camera/avfcameraserviceplugin.mm platform/avfoundation/camera/avfcameraserviceplugin_p.h
+        platform/avfoundation/camera/avfcamerasession.mm platform/avfoundation/camera/avfcamerasession_p.h
+        platform/avfoundation/camera/avfcamerautility.mm platform/avfoundation/camera/avfcamerautility_p.h
+        platform/avfoundation/camera/avfcamerawindowcontrol.mm platform/avfoundation/camera/avfcamerawindowcontrol_p.h
+        platform/avfoundation/camera/avfimagecapturecontrol.mm platform/avfoundation/camera/avfimagecapturecontrol_p.h
+        platform/avfoundation/camera/avfimageencodercontrol.mm platform/avfoundation/camera/avfimageencodercontrol_p.h
+        platform/avfoundation/camera/avfmediacontainercontrol.mm platform/avfoundation/camera/avfmediacontainercontrol_p.h
+        platform/avfoundation/camera/avfmediavideoprobecontrol.mm platform/avfoundation/camera/avfmediavideoprobecontrol_p.h
+        platform/avfoundation/camera/avfstoragelocation.mm platform/avfoundation/camera/avfstoragelocation_p.h
+        platform/avfoundation/camera/avfvideoencodersettingscontrol.mm platform/avfoundation/camera/avfvideoencodersettingscontrol_p.h
+)
+
+qt_internal_extend_target(Multimedia CONDITION MACOS AND NOT TVOS AND NOT WATCHOS
+    SOURCES
+        platform/avfoundation/camera/avfmediarecordercontrol.mm platform/avfoundation/camera/avfmediarecordercontrol_p.h
+)
+
+qt_internal_extend_target(Multimedia CONDITION IOS AND NOT TVOS AND NOT WATCHOS
+    SOURCES
+        platform/avfoundation/camera/avfmediaassetwriter.mm platform/avfoundation/camera/avfmediaassetwriter_p.h
+        platform/avfoundation/camera/avfmediarecordercontrol_ios.mm platform/avfoundation/camera/avfmediarecordercontrol_ios_p.h
+)
+
+qt_internal_extend_target(Multimedia CONDITION APPLE AND QT_FEATURE_opengl AND NOT WATCHOS AND (IOS OR TVOS)
+    SOURCES
+        platform/avfoundation/mediaplayer/avfdisplaylink.mm platform/avfoundation/mediaplayer/avfdisplaylink_p.h
+        platform/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm platform/avfoundation/mediaplayer/avfvideoframerenderer_ios_p.h
+        platform/avfoundation/mediaplayer/avfvideorenderercontrol.mm platform/avfoundation/mediaplayer/avfvideorenderercontrol_p.h
+)
+
+qt_internal_extend_target(Multimedia CONDITION APPLE AND QT_FEATURE_opengl AND NOT IOS AND NOT TVOS AND NOT WATCHOS
+    SOURCES
+        platform/avfoundation/mediaplayer/avfdisplaylink.mm platform/avfoundation/mediaplayer/avfdisplaylink_p.h
+        platform/avfoundation/mediaplayer/avfvideoframerenderer.mm platform/avfoundation/mediaplayer/avfvideoframerenderer_p.h
+        platform/avfoundation/mediaplayer/avfvideorenderercontrol.mm platform/avfoundation/mediaplayer/avfvideorenderercontrol_p.h
+)
+
+qt_internal_extend_target(Multimedia CONDITION QNX
+    SOURCES
+        platform/qnx/camera/bbcameraaudioencodersettingscontrol.cpp platform/qnx/camera/bbcameraaudioencodersettingscontrol_p.h
+        platform/qnx/camera/bbcameracontrol.cpp platform/qnx/camera/bbcameracontrol_p.h
+        platform/qnx/camera/bbcameraexposurecontrol.cpp platform/qnx/camera/bbcameraexposurecontrol_p.h
+        platform/qnx/camera/bbcamerafocuscontrol.cpp platform/qnx/camera/bbcamerafocuscontrol_p.h
+        platform/qnx/camera/bbcameraimagecapturecontrol.cpp platform/qnx/camera/bbcameraimagecapturecontrol_p.h
+        platform/qnx/camera/bbcameraimageprocessingcontrol.cpp platform/qnx/camera/bbcameraimageprocessingcontrol_p.h
+        platform/qnx/camera/bbcameramediarecordercontrol.cpp platform/qnx/camera/bbcameramediarecordercontrol_p.h
+        platform/qnx/camera/bbcameraorientatio_p.handler.cpp platform/qnx/camera/bbcameraorientatio_p.handler.h
+        platform/qnx/camera/bbcameraservice.cpp platform/qnx/camera/bbcameraservice_p.h
+        platform/qnx/camera/bbcamerasession.cpp platform/qnx/camera/bbcamerasession_p.h
+        platform/qnx/camera/bbcameravideoencodersettingscontrol.cpp platform/qnx/camera/bbcameravideoencodersettingscontrol_p.h
+        platform/qnx/camera/bbcameraviewfindersettingscontrol.cpp platform/qnx/camera/bbcameraviewfindersettingscontrol_p.h
+        platform/qnx/camera/bbimageencodercontrol.cpp platform/qnx/camera/bbimageencodercontrol_p.h
+        platform/qnx/camera/bbmediastoragelocation.cpp platform/qnx/camera/bbmediastoragelocation_p.h
+        platform/qnx/camera/bbvideodeviceselectorcontrol.cpp platform/qnx/camera/bbvideodeviceselectorcontrol_p.h
+        platform/qnx/camera/bbvideorenderercontrol.cpp platform/qnx/camera/bbvideorenderercontrol_p.h
+        platform/qnx/common/windowgrabber.cpp platform/qnx/common/windowgrabber_p.h
+        platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
+        platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h
+        platform/qnx/mediaplayer/mmrenderermetadata.cpp platform/qnx/mediaplayer/mmrenderermetadata_p.h
+        platform/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp platform/qnx/mediaplayer/mmrenderermetadatareadercontrol_p.h
+        platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol_p.h
+        platform/qnx/mediaplayer/mmrendererutil.cpp platform/qnx/mediaplayer/mmrendererutil_p.h
+        platform/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp platform/qnx/mediaplayer/mmrenderervideowindowcontrol_p.h
+        platform/qnx/mediaplayer/mmrevent_p.hread.cpp platform/qnx/mediaplayer/mmrevent_p.hread.h
+        platform/qnx/mediaplayer/mmreventmediaplayercontrol.cpp platform/qnx/mediaplayer/mmreventmediaplayercontrol_p.h
+        platform/qnx/neutrinoserviceplugin.cpp platform/qnx/neutrinoserviceplugin_p.h
+        platform/qnx/qnxaudiodeviceinfo.cpp platform/qnx/qnxaudiodeviceinfo_p.h
+        platform/qnx/qnxaudioinput.cpp platform/qnx/qnxaudioinput_p.h
+        platform/qnx/qnxaudiointerface.cpp platform/qnx/qnxaudiointerface_p.h
+        platform/qnx/qnxaudiooutput.cpp platform/qnx/qnxaudiooutput_p.h
+        platform/qnx/qnxaudioutils.cpp platform/qnx/qnxaudioutils_p.h
+    INCLUDE_DIRECTORIES
+        platform/qnx/camera
+        platform/qnx/common
+        platform/qnx/mediaplayer
+    PUBLIC_LIBRARIES
+        asound
+        audio_manager
+        camapi
+        mmrenderer
+)
+qt_internal_add_docs(Multimedia
+    doc/qtmultimedia.qdocconf
+)
+
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 1c3162458..fd8f195e3 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -4,8 +4,8 @@
 ## Multimedia Module:
 #####################################################################
 
-qt_add_module(Multimedia
-    PLUGIN_TYPES mediaservice audio video/bufferpool video/gstvideorenderer video/videonode playlistformats
+qt_internal_add_module(Multimedia
+    PLUGIN_TYPES video/gstvideorenderer video/videonode
     SOURCES
         audio/qaudio.cpp audio/qaudio.h
         audio/qaudiobuffer.cpp audio/qaudiobuffer.h audio/qaudiobuffer_p.h
@@ -53,20 +53,19 @@ qt_add_module(Multimedia
         playback/qmediaplayer.cpp playback/qmediaplayer.h
         playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h
         playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h
-        qmediasink.cpp qmediasink.h
         qmediaenumdebug.h
         qmediametadata.cpp qmediametadata.h
-        qmediasource.cpp qmediasource.h qmediasource_p.h
         qmediapluginloader.cpp qmediapluginloader_p.h
         qmediaservice.cpp qmediaservice.h qmediaservice_p.h
         qmediaserviceprovider.cpp qmediaserviceprovider_p.h
         qmediaserviceproviderplugin.h
+        qmediasink.cpp qmediasink.h
+        qmediasource.cpp qmediasource.h qmediasource_p.h
         qmediastoragelocation.cpp qmediastoragelocation_p.h
         qmediatimerange.cpp qmediatimerange.h
         qmultimedia.cpp qmultimedia.h
         qmultimediautils.cpp qmultimediautils_p.h
         qtmultimediaglobal.h qtmultimediaglobal_p.h
-        recording/qaudiorecorder.cpp recording/qaudiorecorder.h
         recording/qmediaencodersettings.cpp recording/qmediaencodersettings.h
         recording/qmediarecorder.cpp recording/qmediarecorder.h recording/qmediarecorder_p.h
         video/qabstractvideobuffer.cpp video/qabstractvideobuffer.h video/qabstractvideobuffer_p.h
@@ -102,17 +101,17 @@ qt_add_module(Multimedia
 )
 
 
-qt_add_simd_part(Multimedia SIMD sse2
+qt_internal_add_simd_part(Multimedia SIMD sse2
     SOURCES
         video/qvideoframeconversionhelper_sse2.cpp
 )
 
-qt_add_simd_part(Multimedia SIMD ssse3
+qt_internal_add_simd_part(Multimedia SIMD ssse3
     SOURCES
         video/qvideoframeconversionhelper_ssse3.cpp
 )
 
-qt_add_simd_part(Multimedia SIMD avx2
+qt_internal_add_simd_part(Multimedia SIMD avx2
     SOURCES
         video/qvideoframeconversionhelper_avx2.cpp
 )
@@ -141,72 +140,313 @@ endif()
 ## Scopes:
 #####################################################################
 
-if(ANDROID AND (QT_FEATURE_gstreamer))
-    set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
-        plugins/mediaservice/libgstaudiodecoder.so
-        plugins/mediaservice/libgstcamerabin.so
-        plugins/mediaservice/libgstmediacapture.so
-        plugins/mediaservice/libgstmediaplayer.so
-    )
-endif()
-
-qt_extend_target(Multimedia CONDITION WIN32
+qt_internal_extend_target(Multimedia CONDITION WIN32
     SOURCES
-        audio/windows/qwindowsaudiodeviceinfo.cpp audio/windows/qwindowsaudiodeviceinfo_p.h
-        audio/windows/qwindowsaudioinput.cpp audio/windows/qwindowsaudioinput_p.h
-        audio/windows/qwindowsaudiointerface.cpp audio/windows/qwindowsaudiointerface_p.h
-        audio/windows/qwindowsaudiooutput.cpp audio/windows/qwindowsaudiooutput_p.h
-        audio/windows/qwindowsaudioutils.cpp audio/windows/qwindowsaudioutils_p.h
+        platform/wasapi/qwindowsaudiodeviceinfo.cpp platform/wasapi/qwindowsaudiodeviceinfo_p.h
+        platform/wasapi/qwindowsaudioinput.cpp platform/wasapi/qwindowsaudioinput_p.h
+        platform/wasapi/qwindowsaudiointerface.cpp platform/wasapi/qwindowsaudiointerface_p.h
+        platform/wasapi/qwindowsaudiooutput.cpp platform/wasapi/qwindowsaudiooutput_p.h
+        platform/wasapi/qwindowsaudioutils.cpp platform/wasapi/qwindowsaudioutils_p.h
+        platform/wmf/decoder/mfaudiodecodercontrol.cpp platform/wmf/decoder/mfaudiodecodercontrol_p.h
+        platform/wmf/decoder/mfdecodersourcereader.cpp platform/wmf/decoder/mfdecodersourcereader_p.h
+        platform/wmf/evr/evrcustompresenter.cpp platform/wmf/evr/evrcustompresenter_p.h
+        platform/wmf/evr/evrd3dpresentengine.cpp platform/wmf/evr/evrd3dpresentengine_p.h
+        platform/wmf/evr/evrdefs.cpp platform/wmf/evr/evrdefs_p.h
+        platform/wmf/evr/evrhelpers.cpp platform/wmf/evr/evrhelpers_p.h
+        platform/wmf/evr/evrvideowindowcontrol.cpp platform/wmf/evr/evrvideowindowcontrol_p.h
+        platform/wmf/mfstream.cpp platform/wmf/mfstream_p.h
+        platform/wmf/player/mfactivate.cpp platform/wmf/player/mfactivate_p.h
+        platform/wmf/player/mfaudioendpointcontrol.cpp platform/wmf/player/mfaudioendpointcontrol_p.h
+        platform/wmf/player/mfaudioprobecontrol.cpp platform/wmf/player/mfaudioprobecontrol_p.h
+        platform/wmf/player/mfevrvideowindowcontrol.cpp platform/wmf/player/mfevrvideowindowcontrol_p.h
+        platform/wmf/player/mfmetadatacontrol.cpp platform/wmf/player/mfmetadatacontrol_p.h
+        platform/wmf/player/mfplayercontrol.cpp platform/wmf/player/mfplayercontrol_p.h
+        platform/wmf/player/mfplayerservice.cpp platform/wmf/player/mfplayerservice_p.h
+        platform/wmf/player/mfplayersession.cpp platform/wmf/player/mfplayersession_p.h
+        platform/wmf/player/mftvideo.cpp platform/wmf/player/mftvideo_p.h
+        platform/wmf/player/mfvideoprobecontrol.cpp platform/wmf/player/mfvideoprobecontrol_p.h
+        platform/wmf/player/mfvideorenderercontrol.cpp platform/wmf/player/mfvideorenderercontrol_p.h
+        platform/wmf/player/samplegrabber.cpp platform/wmf/player/samplegrabber_p.h
+        platform/wmf/sourceresolver.cpp platform/wmf/sourceresolver_p.h
+        platform/wmf/wmfserviceplugin.cpp platform/wmf/wmfserviceplugin_p.h
+    INCLUDE_DIRECTORIES
+        .
+        platform/wmf/decoder
+        platform/wmf/evr
+        platform/wmf/player
     LIBRARIES
+        Qt::GuiPrivate
         uuid
     PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Network
+        d3d9
+        dxva2
+        evr
+        gdi32
+        mf
+        mfplat
+        mfreadwrite
+        mfuuid
         ole32
         oleaut32
         strmiids
+        user32
         winmm
+        wmcodecdspuuid
+        wmf
+    PRIVATE_MODULE_INTERFACE
+        Qt::GuiPrivate
 )
 
-qt_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer
     SOURCES
-        audio/pulseaudio/qaudiodeviceinfo_pulse.cpp audio/pulseaudio/qaudiodeviceinfo_pulse_p.h
-        audio/pulseaudio/qaudioengine_pulse.cpp audio/pulseaudio/qaudioengine_pulse_p.h
-        audio/pulseaudio/qaudioinput_pulse.cpp audio/pulseaudio/qaudioinput_pulse_p.h
-        audio/pulseaudio/qaudiointerface_pulse.cpp audio/pulseaudio/qaudiointerface_pulse_p.h
-        audio/pulseaudio/qaudiooutput_pulse.cpp audio/pulseaudio/qaudiooutput_pulse_p.h
-        audio/pulseaudio/qpulsehelpers.cpp audio/pulseaudio/qpulsehelpers_p.h
+        platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h
+        platform/gstreamer/audio/qaudioengine_gstreamer.cpp platform/gstreamer/audio/qaudioengine_gstreamer_p.h
+        platform/gstreamer/audio/qaudioinput_gstreamer.cpp platform/gstreamer/audio/qaudioinput_gstreamer_p.h
+        platform/gstreamer/audio/qaudiointerface_gstreamer.cpp platform/gstreamer/audio/qaudiointerface_gstreamer_p.h
+        platform/gstreamer/audio/qaudiooutput_gstreamer.cpp platform/gstreamer/audio/qaudiooutput_gstreamer_p.h
+        platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
+        platform/gstreamer/common/qgstappsrc.cpp platform/gstreamer/common/qgstappsrc_p.h
+        platform/gstreamer/common/qgstcodecsinfo.cpp platform/gstreamer/common/qgstcodecsinfo_p.h
+        platform/gstreamer/common/qgstreameraudioinputselector.cpp platform/gstreamer/common/qgstreameraudioinputselector_p.h
+        platform/gstreamer/common/qgstreameraudioprobecontrol.cpp platform/gstreamer/common/qgstreameraudioprobecontrol_p.h
+        platform/gstreamer/common/qgstreamerbufferprobe.cpp platform/gstreamer/common/qgstreamerbufferprobe_p.h
+        platform/gstreamer/common/qgstreamerbushelper.cpp platform/gstreamer/common/qgstreamerbushelper_p.h
+        platform/gstreamer/common/qgstreamermessage.cpp platform/gstreamer/common/qgstreamermessage_p.h
+        platform/gstreamer/common/qgstreamerplayercontrol.cpp platform/gstreamer/common/qgstreamerplayercontrol_p.h
+        platform/gstreamer/common/qgstreamerplayersession.cpp platform/gstreamer/common/qgstreamerplayersession_p.h
+        platform/gstreamer/common/qgstreamervideoinputdevicecontrol.cpp platform/gstreamer/common/qgstreamervideoinputdevicecontrol_p.h
+        platform/gstreamer/common/qgstreamervideooverlay.cpp platform/gstreamer/common/qgstreamervideooverlay_p.h
+        platform/gstreamer/common/qgstreamervideoprobecontrol.cpp platform/gstreamer/common/qgstreamervideoprobecontrol_p.h
+        platform/gstreamer/common/qgstreamervideorenderer.cpp platform/gstreamer/common/qgstreamervideorenderer_p.h
+        platform/gstreamer/common/qgstreamervideorendererinterface.cpp platform/gstreamer/common/qgstreamervideorendererinterface_p.h
+        platform/gstreamer/common/qgstreamervideowindow.cpp platform/gstreamer/common/qgstreamervideowindow_p.h
+        platform/gstreamer/common/qgstutils.cpp platform/gstreamer/common/qgstutils_p.h
+        platform/gstreamer/common/qgstvideobuffer.cpp platform/gstreamer/common/qgstvideobuffer_p.h
+        platform/gstreamer/common/qgstvideorendererplugin.cpp platform/gstreamer/common/qgstvideorendererplugin_p.h
+        platform/gstreamer/common/qgstvideorenderersink.cpp platform/gstreamer/common/qgstvideorenderersink_p.h
+        platform/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp platform/gstreamer/mediaplayer/qgstreamermetadataprovider_p.h
+        platform/gstreamer/mediaplayer/qgstreamerplayerservice.cpp platform/gstreamer/mediaplayer/qgstreamerplayerservice_p.h
+        platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin_p.h
+        platform/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp platform/gstreamer/mediaplayer/qgstreamerstreamscontrol_p.h
+    DEFINES
+        GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
+    INCLUDE_DIRECTORIES
+        platform/gstreamer/mediaplayer
+    LIBRARIES
+        gstreamer
+        gstreamer_app
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND use_camerabin
+    SOURCES
+        platform/gstreamer/camerabin/camerabinaudioencoder.cpp platform/gstreamer/camerabin/camerabinaudioencoder_p.h
+        platform/gstreamer/camerabin/camerabincontainer.cpp platform/gstreamer/camerabin/camerabincontainer_p.h
+        platform/gstreamer/camerabin/camerabincontrol.cpp platform/gstreamer/camerabin/camerabincontrol_p.h
+        platform/gstreamer/camerabin/camerabinimagecapture.cpp platform/gstreamer/camerabin/camerabinimagecapture_p.h
+        platform/gstreamer/camerabin/camerabinimageencoder.cpp platform/gstreamer/camerabin/camerabinimageencoder_p.h
+        platform/gstreamer/camerabin/camerabinimageprocessing.cpp platform/gstreamer/camerabin/camerabinimageprocessing_p.h
+        platform/gstreamer/camerabin/camerabinmetadata.cpp platform/gstreamer/camerabin/camerabinmetadata_p.h
+        platform/gstreamer/camerabin/camerabinrecorder.cpp platform/gstreamer/camerabin/camerabinrecorder_p.h
+        platform/gstreamer/camerabin/camerabinservice.cpp platform/gstreamer/camerabin/camerabinservice_p.h
+        platform/gstreamer/camerabin/camerabinserviceplugin.cpp platform/gstreamer/camerabin/camerabinserviceplugin_p.h
+        platform/gstreamer/camerabin/camerabinsession.cpp platform/gstreamer/camerabin/camerabinsession_p.h
+        platform/gstreamer/camerabin/camerabinvideoencoder.cpp platform/gstreamer/camerabin/camerabinvideoencoder_p.h
+    DEFINES
+        GST_USE_CAMERABIN
+)
+
+qt_internal_extend_target(Multimedia CONDITION ((QT_FEATURE_gstreamer) AND (use_camerabin)) AND (qtConfig(gstreamer__p.hotography))
+    SOURCES
+        platform/gstreamer/camerabin/camerabinexposure.cpp platform/gstreamer/camerabin/camerabinexposure_p.h
+        platform/gstreamer/camerabin/camerabinfocus.cpp platform/gstreamer/camerabin/camerabinfocus_p.h
+    DEFINES
+        GST_USE_UNSTABLE_API
+    PUBLIC_LIBRARIES
+        gstreamer_photography
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_gstreamer_gl AND use_camerabin
+    PUBLIC_LIBRARIES
+        gstreamer_gl
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_linux_v4l AND use_camerabin
+    SOURCES
+        platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND NOT use_camerabin
+    SOURCES
+        platform/gstreamer/mediacapture/qgstreameraudioencode.cpp platform/gstreamer/mediacapture/qgstreameraudioencode_p.h
+        platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
+        platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin_p.h
+        platform/gstreamer/mediacapture/qgstreamercapturesession.cpp platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
+        platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamerimageencode.cpp platform/gstreamer/mediacapture/qgstreamerimageencode_p.h
+        platform/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp platform/gstreamer/mediacapture/qgstreamermediacontainercontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h
+        platform/gstreamer/mediacapture/qgstreamervideoencode.cpp platform/gstreamer/mediacapture/qgstreamervideoencode_p.h
+    INCLUDE_DIRECTORIES
+        platform/gstreamer/mediacapture
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_linux_v4l AND use_gstreamer_camera AND NOT use_camerabin
+    SOURCES
+        platform/gstreamer/mediacapture/qgstreamerv4l2input.cpp platform/gstreamer/mediacapture/qgstreamerv4l2input_p.h
+    DEFINES
+        USE_GSTREAMER_CAMERA
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_gstreamer_gl
+    PUBLIC_LIBRARIES
+        gstreamer_gl
+)
+
+qt_internal_extend_target(Multimedia CONDITION ANDROID AND QT_FEATURE_gstreamer
+    LIBRARIES
+        # Remove: L$ENV{GSTREAMER_ROOT_ANDROID}/armv7/lib
+        # Remove: Wl,--_p.hole-archive
+        # Remove: Wl,--no-_p.hole-archive
+        WrapIconv::WrapIconv
+        ffi
+        glib-2.0
+        gmodule-2.0
+        gobject-2.0
+        gstapp-1.0
+        gstaudio-1.0
+        gstbase-1.0
+        gstpbutils-1.0
+        gstreamer-1.0
+        gsttag-1.0
+        gstvideo-1.0
+        intl
+        orc-0.4
+)
+
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio
+    SOURCES
+        platform/pulseaudio/qaudiodeviceinfo_pulse.cpp platform/pulseaudio/qaudiodeviceinfo_pulse_p.h
+        platform/pulseaudio/qaudioengine_pulse.cpp platform/pulseaudio/qaudioengine_pulse_p.h
+        platform/pulseaudio/qaudioinput_pulse.cpp platform/pulseaudio/qaudioinput_pulse_p.h
+        platform/pulseaudio/qaudiointerface_pulse.cpp platform/pulseaudio/qaudiointerface_pulse_p.h
+        platform/pulseaudio/qaudiooutput_pulse.cpp platform/pulseaudio/qaudiooutput_pulse_p.h
+        platform/pulseaudio/qpuls_p.helpers.cpp platform/pulseaudio/qpuls_p.helpers_p.h
     LIBRARIES
         pulseaudio
-    PRIVATE_MODULE_INTERFACE
-        pulseaudio
 )
 
-qt_extend_target(Multimedia CONDITION ANDROID
+qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_alsa
+    SOURCES
+        platform/alsa/qalsaaudiodeviceinfo.cpp platform/alsa/qalsaaudiodeviceinfo_p.h
+        platform/alsa/qalsaaudioinput.cpp platform/alsa/qalsaaudioinput_p.h
+        platform/alsa/qalsaaudiooutput.cpp platform/alsa/qalsaaudiooutput_p.h
+        platform/alsa/qalsainterface.cpp platform/alsa/qalsainterface_p.h
+    LIBRARIES
+        alsa
+)
+
+qt_internal_extend_target(Multimedia CONDITION ANDROID
     SOURCES
-        audio/opensles/qopenslesaudioinput.cpp audio/opensles/qopenslesaudioinput_p.h
-        audio/opensles/qopenslesaudiooutput.cpp audio/opensles/qopenslesaudiooutput_p.h
-        audio/opensles/qopenslesdeviceinfo.cpp audio/opensles/qopenslesdeviceinfo_p.h
-        audio/opensles/qopenslesengine.cpp audio/opensles/qopenslesengine_p.h
-        audio/opensles/qopenslesinterface.cpp audio/opensles/qopenslesinterface_p.h
+        platform/android/common/qandroidglobal_p.h
+        platform/android/common/qandroidmultimediautils.cpp platform/android/common/qandroidmultimediautils_p.h
+        platform/android/common/qandroidvideooutput.cpp platform/android/common/qandroidvideooutput_p.h
+        platform/android/mediacapture/qandroidaudioencodersettingscontrol.cpp platform/android/mediacapture/qandroidaudioencodersettingscontrol_p.h
+        platform/android/mediacapture/qandroidaudioinputselectorcontrol.cpp platform/android/mediacapture/qandroidaudioinputselectorcontrol_p.h
+        platform/android/mediacapture/qandroidcameracontrol.cpp platform/android/mediacapture/qandroidcameracontrol_p.h
+        platform/android/mediacapture/qandroidcameraexposurecontrol.cpp platform/android/mediacapture/qandroidcameraexposurecontrol_p.h
+        platform/android/mediacapture/qandroidcamerafocuscontrol.cpp platform/android/mediacapture/qandroidcamerafocuscontrol_p.h
+        platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
+        platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h
+        platform/android/mediacapture/qandroidcamerasession.cpp platform/android/mediacapture/qandroidcamerasession_p.h
+        platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp platform/android/mediacapture/qandroidcameravideorenderercontrol_p.h
+        platform/android/mediacapture/qandroidcaptureservice.cpp platform/android/mediacapture/qandroidcaptureservice_p.h
+        platform/android/mediacapture/qandroidcapturesession.cpp platform/android/mediacapture/qandroidcapturesession_p.h
+        platform/android/mediacapture/qandroidimageencodercontrol.cpp platform/android/mediacapture/qandroidimageencodercontrol_p.h
+        platform/android/mediacapture/qandroidmediacontainercontrol.cpp platform/android/mediacapture/qandroidmediacontainercontrol_p.h
+        platform/android/mediacapture/qandroidmediarecordercontrol.cpp platform/android/mediacapture/qandroidmediarecordercontrol_p.h
+        platform/android/mediacapture/qandroidmediavideoprobecontrol.cpp platform/android/mediacapture/qandroidmediavideoprobecontrol_p.h
+        platform/android/mediacapture/qandroidvideodeviceselectorcontrol.cpp platform/android/mediacapture/qandroidvideodeviceselectorcontrol_p.h
+        platform/android/mediacapture/qandroidvideoencodersettingscontrol.cpp platform/android/mediacapture/qandroidvideoencodersettingscontrol_p.h
+        platform/android/mediaplayer/qandroidmediaplayercontrol.cpp platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
+        platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol_p.h
+        platform/android/mediaplayer/qandroidmediaservice.cpp platform/android/mediaplayer/qandroidmediaservice_p.h
+        platform/android/mediaplayer/qandroidmetadatareadercontrol.cpp platform/android/mediaplayer/qandroidmetadatareadercontrol_p.h
+        platform/android/qandroidmediaserviceplugin.cpp platform/android/qandroidmediaserviceplugin_p.h
+        platform/android/wrappers/jni/androidcamera.cpp platform/android/wrappers/jni/androidcamera_p.h
+        platform/android/wrappers/jni/androidmediametadataretriever.cpp platform/android/wrappers/jni/androidmediametadataretriever_p.h
+        platform/android/wrappers/jni/androidmediaplayer.cpp platform/android/wrappers/jni/androidmediaplayer_p.h
+        platform/android/wrappers/jni/androidmediarecorder.cpp platform/android/wrappers/jni/androidmediarecorder_p.h
+        platform/android/wrappers/jni/androidmultimediautils.cpp platform/android/wrappers/jni/androidmultimediautils_p.h
+        platform/android/wrappers/jni/androidsurfacetexture.cpp platform/android/wrappers/jni/androidsurfacetexture_p.h
+        platform/android/wrappers/jni/androidsurfaceview.cpp platform/android/wrappers/jni/androidsurfaceview_p.h
+        platform/opensles/qopenslesaudioinput.cpp platform/opensles/qopenslesaudioinput_p.h
+        platform/opensles/qopenslesaudiooutput.cpp platform/opensles/qopenslesaudiooutput_p.h
+        platform/opensles/qopenslesdeviceinfo.cpp platform/opensles/qopenslesdeviceinfo_p.h
+        platform/opensles/qopenslesengine.cpp platform/opensles/qopenslesengine_p.h
+        platform/opensles/qopenslesinterface.cpp platform/opensles/qopenslesinterface_p.h
+    INCLUDE_DIRECTORIES
+        platform/android/common
+        platform/android/mediacapture
+        platform/android/mediaplayer
+        platform/android/wrappers/jni
+    LIBRARIES
+        Qt::CorePrivate
     PUBLIC_LIBRARIES
         OpenSLES
+        Qt::Core
+        Qt::Network
+        Qt::OpenGL
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
 )
 qt_internal_find_apple_system_framework(FWCoreAudio CoreAudio) # special case
 
+qt_internal_extend_target(Multimedia CONDITION WIN32 AND NOT TARGET Qt::OpenGL
+    LIBRARIES
+        gdi32
+        user32
+)
+
+qt_internal_extend_target(Multimedia CONDITION TARGET Qt::Widgets AND WIN32
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
 qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS
     SOURCES
-        audio/coreaudio/qcoreaudiodeviceinfo.mm audio/coreaudio/qcoreaudiodeviceinfo_p.h
-        audio/coreaudio/qcoreaudioinput.mm audio/coreaudio/qcoreaudioinput_p.h
-        audio/coreaudio/qcoreaudiointerface.mm audio/coreaudio/qcoreaudiointerface_p.h
-        audio/coreaudio/qcoreaudiooutput.mm audio/coreaudio/qcoreaudiooutput_p.h
-        audio/coreaudio/qcoreaudioutils.mm audio/coreaudio/qcoreaudioutils_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayercontrol.mm platform/avfoundation/mediaplayer/avfmediaplayercontrol_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayerservice.mm platform/avfoundation/mediaplayer/avfmediaplayerservice_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin.mm platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin_p.h
+        platform/avfoundation/mediaplayer/avfmediaplayersession.mm platform/avfoundation/mediaplayer/avfmediaplayersession_p.h
+        platform/avfoundation/mediaplayer/avfvideooutput.mm platform/avfoundation/mediaplayer/avfvideooutput_p.h
+        platform/avfoundation/mediaplayer/avfvideowindowcontrol.mm platform/avfoundation/mediaplayer/avfvideowindowcontrol_p.h
+        platform/coreaudio/qcoreaudiodeviceinfo.mm platform/coreaudio/qcoreaudiodeviceinfo_p.h
+        platform/coreaudio/qcoreaudioinput.mm platform/coreaudio/qcoreaudioinput_p.h
+        platform/coreaudio/qcoreaudiointerface.mm platform/coreaudio/qcoreaudiointerface_p.h
+        platform/coreaudio/qcoreaudiooutput.mm platform/coreaudio/qcoreaudiooutput_p.h
+        platform/coreaudio/qcoreaudioutils.mm platform/coreaudio/qcoreaudioutils_p.h
     PUBLIC_LIBRARIES
         ${FWAudioToolbox}
         ${FWCoreAudio}
+        ${FWCoreFoundation}
+        ${FWCoreMedia}
+        ${FWCoreVideo}
+        ${FWFoundation}
+        ${FWMetal}
+        ${FWQuartzCore}
+        Qt::Network
+        Qt::OpenGL
+        avfoundation
 )
 
 qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS AND (IOS OR TVOS)
     SOURCES
-        qcoreaudiosessionmanager.mm qcoreaudiosessionmanager_p.h
+        platform/coreaudio/qcoreaudiosessionmanager.mm platform/coreaudio/qcoreaudiosessionmanager_p.h
     PUBLIC_LIBRARIES
         ${FWAVFoundation}
         ${FWFoundation}
@@ -214,94 +454,117 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS AND (IOS OR
 
 qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT IOS AND NOT TVOS AND NOT WATCHOS
     PUBLIC_LIBRARIES
+        ${FWAppKit}
         ${FWApplicationServices}
         ${FWAudioUnit}
 )
 
-qt_extend_target(Multimedia CONDITION QNX
-    SOURCES
-        audio/qnx/qnxaudiodeviceinfo.cpp audio/qnx/qnxaudiodeviceinfo_p.h
-        audio/qnx/qnxaudioinput.cpp audio/qnx/qnxaudioinput_p.h
-        audio/qnx/qnxaudiointerface.cpp audio/qnx/qnxaudiointerface_p.h
-        audio/qnx/qnxaudiooutput.cpp audio/qnx/qnxaudiooutput_p.h
-        audio/qnx/qnxaudioutils.cpp audio/qnx/qnxaudioutils_p.h
+qt_internal_extend_target(Multimedia CONDITION MACOS AND NOT WATCHOS
     PUBLIC_LIBRARIES
-        asound
+        ${FWAppKit}
+        ${FWAudioUnit}
+)
+
+qt_internal_extend_target(Multimedia CONDITION IOS AND NOT WATCHOS
+    PUBLIC_LIBRARIES
+        ${FWCoreGraphics}
+        ${FWCoreVideo}
 )
 
-qt_extend_target(Multimedia CONDITION QT_FEATURE_alsa
+qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT TVOS AND NOT WATCHOS
     SOURCES
-        audio/alsa/qalsaaudiodeviceinfo.cpp audio/alsa/qalsaaudiodeviceinfo_p.h
-        audio/alsa/qalsaaudioinput.cpp audio/alsa/qalsaaudioinput_p.h
-        audio/alsa/qalsaaudiooutput.cpp audio/alsa/qalsaaudiooutput_p.h
-        audio/alsa/qalsainterface.cpp audio/alsa/qalsainterface_p.h
-    LIBRARIES
-        alsa
+        platform/avfoundation/camera/avfaudioencodersettingscontrol.mm platform/avfoundation/camera/avfaudioencodersettingscontrol_p.h
+        platform/avfoundation/camera/avfaudioinputselectorcontrol.mm platform/avfoundation/camera/avfaudioinputselectorcontrol_p.h
+        platform/avfoundation/camera/avfcameracontrol.mm platform/avfoundation/camera/avfcameracontrol_p.h
+        platform/avfoundation/camera/avfcameradebug_p.h
+        platform/avfoundation/camera/avfcameradevicecontrol.mm platform/avfoundation/camera/avfcameradevicecontrol_p.h
+        platform/avfoundation/camera/avfcameraexposurecontrol.mm platform/avfoundation/camera/avfcameraexposurecontrol_p.h
+        platform/avfoundation/camera/avfcamerafocuscontrol.mm platform/avfoundation/camera/avfcamerafocuscontrol_p.h
+        platform/avfoundation/camera/avfcamerametadatacontrol.mm platform/avfoundation/camera/avfcamerametadatacontrol_p.h
+        platform/avfoundation/camera/avfcamerarenderercontrol.mm platform/avfoundation/camera/avfcamerarenderercontrol_p.h
+        platform/avfoundation/camera/avfcameraservice.mm platform/avfoundation/camera/avfcameraservice_p.h
+        platform/avfoundation/camera/avfcameraserviceplugin.mm platform/avfoundation/camera/avfcameraserviceplugin_p.h
+        platform/avfoundation/camera/avfcamerasession.mm platform/avfoundation/camera/avfcamerasession_p.h
+        platform/avfoundation/camera/avfcamerautility.mm platform/avfoundation/camera/avfcamerautility_p.h
+        platform/avfoundation/camera/avfcamerawindowcontrol.mm platform/avfoundation/camera/avfcamerawindowcontrol_p.h
+        platform/avfoundation/camera/avfimagecapturecontrol.mm platform/avfoundation/camera/avfimagecapturecontrol_p.h
+        platform/avfoundation/camera/avfimageencodercontrol.mm platform/avfoundation/camera/avfimageencodercontrol_p.h
+        platform/avfoundation/camera/avfmediacontainercontrol.mm platform/avfoundation/camera/avfmediacontainercontrol_p.h
+        platform/avfoundation/camera/avfmediavideoprobecontrol.mm platform/avfoundation/camera/avfmediavideoprobecontrol_p.h
+        platform/avfoundation/camera/avfstoragelocation.mm platform/avfoundation/camera/avfstoragelocation_p.h
+        platform/avfoundation/camera/avfvideoencodersettingscontrol.mm platform/avfoundation/camera/avfvideoencodersettingscontrol_p.h
 )
-qt_add_docs(Multimedia
-    doc/qtmultimedia.qdocconf
+
+qt_internal_extend_target(Multimedia CONDITION MACOS AND NOT TVOS AND NOT WATCHOS
+    SOURCES
+        platform/avfoundation/camera/avfmediarecordercontrol.mm platform/avfoundation/camera/avfmediarecordercontrol_p.h
 )
 
-qt_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer
+qt_internal_extend_target(Multimedia CONDITION IOS AND NOT TVOS AND NOT WATCHOS
     SOURCES
-        qaudiodeviceinfo_gstreamer.cpp qaudiodeviceinfo_gstreamer_p.h
-        qaudioengine_gstreamer.cpp qaudioengine_gstreamer_p.h
-        qaudioinput_gstreamer.cpp qaudioinput_gstreamer_p.h
-        qaudiointerface_gstreamer.cpp qaudiointerface_gstreamer_p.h
-        qaudiooutput_gstreamer.cpp qaudiooutput_gstreamer_p.h
-        gstreamer/qgstcodecsinfo.cpp qgstcodecsinfo_p.h
-        gstreamer/qgstreameraudioinputselector.cpp gstreamer/qgstreameraudioinputselector_p.h
-        gstreamer/qgstreameraudioprobecontrol.cpp gstreamer/qgstreameraudioprobecontrol_p.h
-        gstreamer/qgstreamerbufferprobe.cpp gstreamer/qgstreamerbufferprobe_p.h
-        gstreamer/qgstreamerbushelper.cpp gstreamer/qgstreamerbushelper_p.h
-        gstreamer/qgstreamermessage.cpp gstreamer/qgstreamermessage_p.h
-        gstreamer/qgstreamerplayercontrol.cpp gstreamer/qgstreamerplayercontrol_p.h
-        gstreamer/qgstreamerplayersession.cpp gstreamer/qgstreamerplayersession_p.h
-        gstreamer/qgstreamervideoinputdevicecontrol.cpp gstreamer/qgstreamervideoinputdevicecontrol_p.h
-        gstreamer/qgstreamervideooverlay.cpp gstreamer/qgstreamervideooverlay_p.h
-        gstreamer/qgstreamervideoprobecontrol.cpp gstreamer/qgstreamervideoprobecontrol_p.h
-        gstreamer/qgstreamervideorenderer.cpp gstreamer/qgstreamervideorenderer_p.h
-        gstreamer/qgstreamervideorendererinterface.cpp gstreamer/qgstreamervideorendererinterface_p.h
-        gstreamer/qgstreamervideowindow.cpp gstreamer/qgstreamervideowindow_p.h
-        gstreamer/qgstutils.cpp gstreamer/qgstutils_p.h
-        gstreamer/qgstvideobuffer.cpp gstreamer/qgstvideobuffer_p.h
-        gstreamer/qgstvideorendererplugin.cpp gstreamer/qgstvideorendererplugin_p.h
-        gstreamer/qgstvideorenderersink.cpp gstreamer/qgstvideorenderersink_p.h
-    DEFINES
-        GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
-    PUBLIC_LIBRARIES
-        gstreamer
+        platform/avfoundation/camera/avfmediaassetwriter.mm platform/avfoundation/camera/avfmediaassetwriter_p.h
+        platform/avfoundation/camera/avfmediarecordercontrol_ios.mm platform/avfoundation/camera/avfmediarecordercontrol_ios_p.h
 )
 
-qt_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer_gl
-    PUBLIC_LIBRARIES
-        gstreamer_gl
+qt_internal_extend_target(Multimedia CONDITION APPLE AND QT_FEATURE_opengl AND NOT WATCHOS AND (IOS OR TVOS)
+    SOURCES
+        platform/avfoundation/mediaplayer/avfdisplaylink.mm platform/avfoundation/mediaplayer/avfdisplaylink_p.h
+        platform/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm platform/avfoundation/mediaplayer/avfvideoframerenderer_ios_p.h
+        platform/avfoundation/mediaplayer/avfvideorenderercontrol.mm platform/avfoundation/mediaplayer/avfvideorenderercontrol_p.h
 )
 
-qt_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer_app
+qt_internal_extend_target(Multimedia CONDITION APPLE AND QT_FEATURE_opengl AND NOT IOS AND NOT TVOS AND NOT WATCHOS
     SOURCES
-        gstreamer/qgstappsrc.cpp gstreamer/qgstappsrc_p.h # special case
-    PUBLIC_LIBRARIES
-        gstreamer_app
+        platform/avfoundation/mediaplayer/avfdisplaylink.mm platform/avfoundation/mediaplayer/avfdisplaylink_p.h
+        platform/avfoundation/mediaplayer/avfvideoframerenderer.mm platform/avfoundation/mediaplayer/avfvideoframerenderer_p.h
+        platform/avfoundation/mediaplayer/avfvideorenderercontrol.mm platform/avfoundation/mediaplayer/avfvideorenderercontrol_p.h
 )
 
-qt_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND ANDROID
-    LIBRARIES
-        # Remove: L$ENV{GSTREAMER_ROOT_ANDROID}/armv7/lib
-        # Remove: Wl,--no-whole-archive
-        # Remove: Wl,--whole-archive
-        WrapIconv::WrapIconv
-        ffi
-        glib-2.0
-        gmodule-2.0
-        gobject-2.0
-        gstapp-1.0
-        gstaudio-1.0
-        gstbase-1.0
-        gstpbutils-1.0
-        gstreamer-1.0
-        gsttag-1.0
-        gstvideo-1.0
-        intl
-        orc-0.4
+qt_internal_extend_target(Multimedia CONDITION QNX
+    SOURCES
+        platform/qnx/camera/bbcameraaudioencodersettingscontrol.cpp platform/qnx/camera/bbcameraaudioencodersettingscontrol_p.h
+        platform/qnx/camera/bbcameracontrol.cpp platform/qnx/camera/bbcameracontrol_p.h
+        platform/qnx/camera/bbcameraexposurecontrol.cpp platform/qnx/camera/bbcameraexposurecontrol_p.h
+        platform/qnx/camera/bbcamerafocuscontrol.cpp platform/qnx/camera/bbcamerafocuscontrol_p.h
+        platform/qnx/camera/bbcameraimagecapturecontrol.cpp platform/qnx/camera/bbcameraimagecapturecontrol_p.h
+        platform/qnx/camera/bbcameraimageprocessingcontrol.cpp platform/qnx/camera/bbcameraimageprocessingcontrol_p.h
+        platform/qnx/camera/bbcameramediarecordercontrol.cpp platform/qnx/camera/bbcameramediarecordercontrol_p.h
+        platform/qnx/camera/bbcameraorientatio_p.handler.cpp platform/qnx/camera/bbcameraorientatio_p.handler.h
+        platform/qnx/camera/bbcameraservice.cpp platform/qnx/camera/bbcameraservice_p.h
+        platform/qnx/camera/bbcamerasession.cpp platform/qnx/camera/bbcamerasession_p.h
+        platform/qnx/camera/bbcameravideoencodersettingscontrol.cpp platform/qnx/camera/bbcameravideoencodersettingscontrol_p.h
+        platform/qnx/camera/bbcameraviewfindersettingscontrol.cpp platform/qnx/camera/bbcameraviewfindersettingscontrol_p.h
+        platform/qnx/camera/bbimageencodercontrol.cpp platform/qnx/camera/bbimageencodercontrol_p.h
+        platform/qnx/camera/bbmediastoragelocation.cpp platform/qnx/camera/bbmediastoragelocation_p.h
+        platform/qnx/camera/bbvideodeviceselectorcontrol.cpp platform/qnx/camera/bbvideodeviceselectorcontrol_p.h
+        platform/qnx/camera/bbvideorenderercontrol.cpp platform/qnx/camera/bbvideorenderercontrol_p.h
+        platform/qnx/common/windowgrabber.cpp platform/qnx/common/windowgrabber_p.h
+        platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
+        platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h
+        platform/qnx/mediaplayer/mmrenderermetadata.cpp platform/qnx/mediaplayer/mmrenderermetadata_p.h
+        platform/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp platform/qnx/mediaplayer/mmrenderermetadatareadercontrol_p.h
+        platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol_p.h
+        platform/qnx/mediaplayer/mmrendererutil.cpp platform/qnx/mediaplayer/mmrendererutil_p.h
+        platform/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp platform/qnx/mediaplayer/mmrenderervideowindowcontrol_p.h
+        platform/qnx/mediaplayer/mmrevent_p.hread.cpp platform/qnx/mediaplayer/mmrevent_p.hread.h
+        platform/qnx/mediaplayer/mmreventmediaplayercontrol.cpp platform/qnx/mediaplayer/mmreventmediaplayercontrol_p.h
+        platform/qnx/neutrinoserviceplugin.cpp platform/qnx/neutrinoserviceplugin_p.h
+        platform/qnx/qnxaudiodeviceinfo.cpp platform/qnx/qnxaudiodeviceinfo_p.h
+        platform/qnx/qnxaudioinput.cpp platform/qnx/qnxaudioinput_p.h
+        platform/qnx/qnxaudiointerface.cpp platform/qnx/qnxaudiointerface_p.h
+        platform/qnx/qnxaudiooutput.cpp platform/qnx/qnxaudiooutput_p.h
+        platform/qnx/qnxaudioutils.cpp platform/qnx/qnxaudioutils_p.h
+    INCLUDE_DIRECTORIES
+        platform/qnx/camera
+        platform/qnx/common
+        platform/qnx/mediaplayer
+    PUBLIC_LIBRARIES
+        asound
+        audio_manager
+        camapi
+        mmrenderer
+)
+qt_internal_add_docs(Multimedia
+    doc/qtmultimedia.qdocconf
 )
+
diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp
index 57976f496..af2cdd13c 100644
--- a/src/multimedia/audio/qaudiodecoder.cpp
+++ b/src/multimedia/audio/qaudiodecoder.cpp
@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include "qtmultimediaglobal_p.h"
 #include "qaudiodecoder.h"
 
 #include "qmediasource_p.h"
@@ -44,6 +45,13 @@
 #include "qaudiodecodercontrol.h"
 #include <private/qmediaserviceprovider_p.h>
 
+#if QT_CONFIG(gstreamer)
+#include <private/qgstreameraudiodecodercontrol_p.h>
+#include <private/qgstutils_p.h>
+#elif defined(Q_OS_WIN)
+#include <private/mfaudiodecodercontrol_p.h>
+#endif
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qtimer.h>
@@ -121,27 +129,28 @@ void QAudioDecoderPrivate::_q_error(int error, const QString &errorString)
 QAudioDecoder::QAudioDecoder(QObject *parent)
     : QMediaSource(*new QAudioDecoderPrivate,
                    parent,
-                   QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_AUDIODECODER))
+                   nullptr)
 {
     Q_D(QAudioDecoder);
 
-    d->provider = QMediaServiceProvider::defaultServiceProvider();
-    if (d->service) {
-        d->control = qobject_cast<QAudioDecoderControl*>(d->service->requestControl(QAudioDecoderControl_iid));
-        if (d->control != nullptr) {
-            connect(d->control, SIGNAL(stateChanged(QAudioDecoder::State)), SLOT(_q_stateChanged(QAudioDecoder::State)));
-            connect(d->control, SIGNAL(error(int,QString)), SLOT(_q_error(int,QString)));
-
-            connect(d->control, SIGNAL(formatChanged(QAudioFormat)), SIGNAL(formatChanged(QAudioFormat)));
-            connect(d->control, SIGNAL(sourceChanged()), SIGNAL(sourceChanged()));
-            connect(d->control, SIGNAL(bufferReady()), this, SIGNAL(bufferReady()));
-            connect(d->control ,SIGNAL(bufferAvailableChanged(bool)), this, SIGNAL(bufferAvailableChanged(bool)));
-            connect(d->control ,SIGNAL(finished()), this, SIGNAL(finished()));
-            connect(d->control ,SIGNAL(positionChanged(qint64)), this, SIGNAL(positionChanged(qint64)));
-            connect(d->control ,SIGNAL(durationChanged(qint64)), this, SIGNAL(durationChanged(qint64)));
-        }
-    }
-    if (!d->control) {
+#if QT_CONFIG(gstreamer)
+    gst_init(nullptr, nullptr);
+    d->control = new QGstreamerAudioDecoderControl(this);
+#elif defined(Q_OS_WIN)
+    d->control = new MFAudioDecoderControl(this);
+#endif
+    if (d->control != nullptr) {
+        connect(d->control, SIGNAL(stateChanged(QAudioDecoder::State)), SLOT(_q_stateChanged(QAudioDecoder::State)));
+        connect(d->control, SIGNAL(error(int,QString)), SLOT(_q_error(int,QString)));
+
+        connect(d->control, SIGNAL(formatChanged(QAudioFormat)), SIGNAL(formatChanged(QAudioFormat)));
+        connect(d->control, SIGNAL(sourceChanged()), SIGNAL(sourceChanged()));
+        connect(d->control, SIGNAL(bufferReady()), this, SIGNAL(bufferReady()));
+        connect(d->control ,SIGNAL(bufferAvailableChanged(bool)), this, SIGNAL(bufferAvailableChanged(bool)));
+        connect(d->control ,SIGNAL(finished()), this, SIGNAL(finished()));
+        connect(d->control ,SIGNAL(positionChanged(qint64)), this, SIGNAL(positionChanged(qint64)));
+        connect(d->control ,SIGNAL(durationChanged(qint64)), this, SIGNAL(durationChanged(qint64)));
+    } else {
        d->error = ServiceMissingError;
        d->errorString = tr("The QAudioDecoder object does not have a valid service");
     }
@@ -155,12 +164,8 @@ QAudioDecoder::~QAudioDecoder()
 {
     Q_D(QAudioDecoder);
 
-    if (d->service) {
-        if (d->control)
-            d->service->releaseControl(d->control);
-
-        d->provider->releaseService(d->service);
-    }
+    if (d->control)
+        delete d->control;
 }
 
 QAudioDecoder::State QAudioDecoder::state() const
@@ -330,9 +335,23 @@ void QAudioDecoder::setAudioFormat(const QAudioFormat &format)
 QMultimedia::SupportEstimate QAudioDecoder::hasSupport(const QString &mimeType,
                                                const QStringList& codecs)
 {
-    return QMediaServiceProvider::defaultServiceProvider()->hasSupport(QByteArray(Q_MEDIASERVICE_AUDIODECODER),
-                                                                    mimeType,
-                                                                    codecs);
+#if QT_CONFIG(gstreamer)
+    // ### this code should not be there
+    auto isDecoderOrDemuxer = [](GstElementFactory *factory) -> bool
+    {
+        return gst_element_factory_list_is_type(factory, GST_ELEMENT_FACTORY_TYPE_DEMUXER)
+                || gst_element_factory_list_is_type(factory, GST_ELEMENT_FACTORY_TYPE_DECODER
+                                                           | GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO);
+    };
+    gst_init(nullptr, nullptr);
+    auto set = QGstUtils::supportedMimeTypes(isDecoderOrDemuxer);
+    return QGstUtils::hasSupport(mimeType, codecs, set);
+#elif defined(Q_OS_WIN)
+    return QMultimedia::MaybeSupported;
+#endif
+    Q_UNUSED(mimeType);
+    Q_UNUSED(codecs);
+    return QMultimedia::NotSupported;
 }
 
 /*!
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index b6f119bb8..bb2f42c34 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -2,12 +2,8 @@ TARGET = QtMultimedia
 QT = core-private network gui-private
 
 MODULE_PLUGIN_TYPES = \
-    mediaservice \
-    audio \
-    video/bufferpool \
     video/gstvideorenderer \
     video/videonode \
-    playlistformats \
 
 QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf
 
diff --git a/src/multimedia/platform/alsa/alsa.json b/src/multimedia/platform/alsa/alsa.json
deleted file mode 100644
index c2b22dfec..000000000
--- a/src/multimedia/platform/alsa/alsa.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": ["alsa"]
-}
diff --git a/src/multimedia/platform/alsa/alsa.pri b/src/multimedia/platform/alsa/alsa.pri
index 354e2c03d..aeec7da8a 100644
--- a/src/multimedia/platform/alsa/alsa.pri
+++ b/src/multimedia/platform/alsa/alsa.pri
@@ -1,11 +1,11 @@
 QMAKE_USE_PRIVATE += alsa
 
-HEADERS += platform/alsa/qalsaaudiodeviceinfo_p.h \
-           platform/alsa/qalsaaudioinput_p.h \
-           platform/alsa/qalsaaudiooutput_p.h \
-           platform/alsa/qalsainterface_p.h
+HEADERS += $$PWD/qalsaaudiodeviceinfo_p.h \
+           $$PWD/qalsaaudioinput_p.h \
+           $$PWD/qalsaaudiooutput_p.h \
+           $$PWD/qalsainterface_p.h
 
-SOURCES += platform/alsa/qalsaaudiodeviceinfo.cpp \
-           platform/alsa/qalsaaudioinput.cpp \
-           platform/alsa/qalsaaudiooutput.cpp \
-           platform/alsa/qalsainterface.cpp
+SOURCES += $$PWD/qalsaaudiodeviceinfo.cpp \
+           $$PWD/qalsaaudioinput.cpp \
+           $$PWD/qalsaaudiooutput.cpp \
+           $$PWD/qalsainterface.cpp
diff --git a/src/multimedia/platform/android/android.pri b/src/multimedia/platform/android/android.pri
new file mode 100644
index 000000000..ce9fa093e
--- /dev/null
+++ b/src/multimedia/platform/android/android.pri
@@ -0,0 +1,12 @@
+QT += opengl core-private network
+
+HEADERS += \
+    $$PWD/qandroidmediaserviceplugin_p.h
+
+SOURCES += \
+    $$PWD/qandroidmediaserviceplugin.cpp
+
+include(wrappers/jni/jni.pri)
+include(common/common.pri)
+include(mediaplayer/mediaplayer.pri)
+include(mediacapture/mediacapture.pri)
diff --git a/src/plugins/android/src/common/common.pri b/src/multimedia/platform/android/common/common.pri
index 1b02b99ea..67a5116d2 100644
--- a/src/plugins/android/src/common/common.pri
+++ b/src/multimedia/platform/android/common/common.pri
@@ -1,9 +1,9 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qandroidglobal.h \
-    $$PWD/qandroidvideooutput.h \
-    $$PWD/qandroidmultimediautils.h
+    $$PWD/qandroidglobal_p.h \
+    $$PWD/qandroidvideooutput_p.h \
+    $$PWD/qandroidmultimediautils_p.h
 
 SOURCES += \
     $$PWD/qandroidvideooutput.cpp \
diff --git a/src/plugins/android/src/common/qandroidglobal.h b/src/multimedia/platform/android/common/qandroidglobal_p.h
index e7342be97..45bd22ffb 100644
--- a/src/plugins/android/src/common/qandroidglobal.h
+++ b/src/multimedia/platform/android/common/qandroidglobal_p.h
@@ -40,6 +40,18 @@
 #ifndef QANDROIDGLOBAL_H
 #define QANDROIDGLOBAL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qtmultimediaglobal_p.h>
 #include <QtCore/qglobal.h>
 #include <QtCore/qloggingcategory.h>
 
diff --git a/src/plugins/android/src/common/qandroidmultimediautils.cpp b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp
index 1f03d5d29..850b3d7ea 100644
--- a/src/plugins/android/src/common/qandroidmultimediautils.cpp
+++ b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qandroidmultimediautils.h"
-#include "qandroidglobal.h"
+#include "qandroidmultimediautils_p.h"
+#include "qandroidglobal_p.h"
 
 #include <qlist.h>
 #include <QtCore/private/qjni_p.h>
diff --git a/src/plugins/android/src/common/qandroidmultimediautils.h b/src/multimedia/platform/android/common/qandroidmultimediautils_p.h
index 381671cb8..205244eb5 100644
--- a/src/plugins/android/src/common/qandroidmultimediautils.h
+++ b/src/multimedia/platform/android/common/qandroidmultimediautils_p.h
@@ -40,9 +40,20 @@
 #ifndef QANDROIDMULTIMEDIAUTILS_H
 #define QANDROIDMULTIMEDIAUTILS_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qglobal.h>
 #include <qsize.h>
-#include "androidcamera.h"
+#include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/common/qandroidvideooutput.cpp b/src/multimedia/platform/android/common/qandroidvideooutput.cpp
index 3c6472482..0fa6cb84a 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.cpp
+++ b/src/multimedia/platform/android/common/qandroidvideooutput.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qandroidvideooutput.h"
+#include "qandroidvideooutput_p.h"
 
-#include "androidsurfacetexture.h"
+#include "androidsurfacetexture_p.h"
 #include <QAbstractVideoSurface>
 #include <QVideoSurfaceFormat>
 #include <qevent.h>
diff --git a/src/plugins/android/src/common/qandroidvideooutput.h b/src/multimedia/platform/android/common/qandroidvideooutput_p.h
index 456fe8e22..dbc53ca44 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.h
+++ b/src/multimedia/platform/android/common/qandroidvideooutput_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDVIDEOOUTPUT_H
 #define QANDROIDVIDEOOUTPUT_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qobject.h>
 #include <qsize.h>
 #include <qmutex.h>
diff --git a/src/plugins/android/src/mediacapture/mediacapture.pri b/src/multimedia/platform/android/mediacapture/mediacapture.pri
index 2ec62efc4..a1f4b41a6 100644
--- a/src/plugins/android/src/mediacapture/mediacapture.pri
+++ b/src/multimedia/platform/android/mediacapture/mediacapture.pri
@@ -20,20 +20,20 @@ SOURCES += \
     $$PWD/qandroidcameravideorenderercontrol.cpp
 
 HEADERS += \
-    $$PWD/qandroidcaptureservice.h \
-    $$PWD/qandroidcameracontrol.h \
-    $$PWD/qandroidvideodeviceselectorcontrol.h \
-    $$PWD/qandroidcamerasession.h \
-    $$PWD/qandroidcameraexposurecontrol.h \
-    $$PWD/qandroidcameraimageprocessingcontrol.h \
-    $$PWD/qandroidimageencodercontrol.h \
-    $$PWD/qandroidcameraimagecapturecontrol.h \
-    $$PWD/qandroidcamerafocuscontrol.h \
-    $$PWD/qandroidcapturesession.h \
-    $$PWD/qandroidmediarecordercontrol.h \
-    $$PWD/qandroidaudioencodersettingscontrol.h \
-    $$PWD/qandroidmediacontainercontrol.h \
-    $$PWD/qandroidvideoencodersettingscontrol.h \
-    $$PWD/qandroidaudioinputselectorcontrol.h \
-    $$PWD/qandroidmediavideoprobecontrol.h \
-    $$PWD/qandroidcameravideorenderercontrol.h
+    $$PWD/qandroidcaptureservice_p.h \
+    $$PWD/qandroidcameracontrol_p.h \
+    $$PWD/qandroidvideodeviceselectorcontrol_p.h \
+    $$PWD/qandroidcamerasession_p.h \
+    $$PWD/qandroidcameraexposurecontrol_p.h \
+    $$PWD/qandroidcameraimageprocessingcontrol_p.h \
+    $$PWD/qandroidimageencodercontrol_p.h \
+    $$PWD/qandroidcameraimagecapturecontrol_p.h \
+    $$PWD/qandroidcamerafocuscontrol_p.h \
+    $$PWD/qandroidcapturesession_p.h \
+    $$PWD/qandroidmediarecordercontrol_p.h \
+    $$PWD/qandroidaudioencodersettingscontrol_p.h \
+    $$PWD/qandroidmediacontainercontrol_p.h \
+    $$PWD/qandroidvideoencodersettingscontrol_p.h \
+    $$PWD/qandroidaudioinputselectorcontrol_p.h \
+    $$PWD/qandroidmediavideoprobecontrol_p.h \
+    $$PWD/qandroidcameravideorenderercontrol_p.h
diff --git a/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidaudioencodersettingscontrol.cpp
index 4bd94425d..c32a93cee 100644
--- a/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidaudioencodersettingscontrol.cpp
@@ -39,7 +39,7 @@
 
 #include "qandroidaudioencodersettingscontrol.h"
 
-#include "qandroidcapturesession.h"
+#include "qandroidcapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.h b/src/multimedia/platform/android/mediacapture/qandroidaudioencodersettingscontrol_p.h
index e68bf6ef7..7259ff685 100644
--- a/src/plugins/android/src/mediacapture/qandroidaudioencodersettingscontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidaudioencodersettingscontrol_p.h
@@ -40,7 +40,18 @@
 #ifndef QANDROIDAUDIOENCODERSETTINGSCONTROL_H
 #define QANDROIDAUDIOENCODERSETTINGSCONTROL_H
 
-#include <qaudioencodersettingscontrol.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qaudioencodersettingscontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidaudioinputselectorcontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidaudioinputselectorcontrol.cpp
index bf2161a7e..9745d0725 100644
--- a/src/plugins/android/src/mediacapture/qandroidaudioinputselectorcontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidaudioinputselectorcontrol.cpp
@@ -39,7 +39,7 @@
 
 #include "qandroidaudioinputselectorcontrol.h"
 
-#include "qandroidcapturesession.h"
+#include "qandroidcapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidaudioinputselectorcontrol.h b/src/multimedia/platform/android/mediacapture/qandroidaudioinputselectorcontrol_p.h
index c24167fb3..ef53dbdae 100644
--- a/src/plugins/android/src/mediacapture/qandroidaudioinputselectorcontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidaudioinputselectorcontrol_p.h
@@ -40,7 +40,18 @@
 #ifndef QANDROIDAUDIOINPUTSELECTORCONTROL_H
 #define QANDROIDAUDIOINPUTSELECTORCONTROL_H
 
-#include <qaudioinputselectorcontrol.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qaudioinputselectorcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
index f9efaea8a..18f6de7c1 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameracontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qandroidcameracontrol.h"
-#include "qandroidcamerasession.h"
+#include "qandroidcameracontrol_p.h"
+#include "qandroidcamerasession_p.h"
 #include <qtimer.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidcameracontrol.h b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
index d30f507c3..23fbc2dc6 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameracontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
@@ -41,7 +41,18 @@
 #ifndef QANDROIDCAMERACONTROL_H
 #define QANDROIDCAMERACONTROL_H
 
-#include <qcameracontrol.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qcameracontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol.cpp
index 154e66f47..e2c1d09c1 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qandroidcameraexposurecontrol.h"
+#include "qandroidcameraexposurecontrol_p.h"
 
-#include "qandroidcamerasession.h"
-#include "androidcamera.h"
+#include "qandroidcamerasession_p.h"
+#include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.h b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol_p.h
index df1e26eea..133221b13 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol_p.h
@@ -40,7 +40,18 @@
 #ifndef QANDROIDCAMERAEXPOSURECONTROL_H
 #define QANDROIDCAMERAEXPOSURECONTROL_H
 
-#include <qcameraexposurecontrol.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qcameraexposurecontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol.cpp
index b6145330e..0fa9b055a 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol.cpp
@@ -37,12 +37,12 @@
 **
 ****************************************************************************/
 
-#include "qandroidcamerafocuscontrol.h"
+#include "qandroidcamerafocuscontrol_p.h"
 
-#include "qandroidcamerasession.h"
-#include "androidcamera.h"
+#include "qandroidcamerasession_p.h"
+#include "androidcamera_p.h"
 
-#include "qandroidmultimediautils.h"
+#include "qandroidmultimediautils_p.h"
 #include <qmath.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol_p.h
index 13e560beb..4cc931993 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol_p.h
@@ -40,7 +40,18 @@
 #ifndef QANDROIDCAMERAFOCUSCONTROL_H
 #define QANDROIDCAMERAFOCUSCONTROL_H
 
-#include <qcamerafocuscontrol.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qcamerafocuscontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp
index 85169af23..d230daa5c 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qandroidcameraimagecapturecontrol.h"
+#include "qandroidcameraimagecapturecontrol_p.h"
 
-#include "qandroidcamerasession.h"
+#include "qandroidcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.h b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
index c0e496c7b..071e8a314 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraimagecapturecontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
@@ -40,7 +40,18 @@
 #ifndef QANDROIDCAMERAIMAGECAPTURECONTROL_H
 #define QANDROIDCAMERAIMAGECAPTURECONTROL_H
 
-#include <qcameraimagecapturecontrol.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qcameraimagecapturecontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp
index c69f1946b..f35e6cf6e 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qandroidcameraimageprocessingcontrol.h"
+#include "qandroidcameraimageprocessingcontrol_p.h"
 
-#include "qandroidcamerasession.h"
-#include "androidcamera.h"
+#include "qandroidcamerasession_p.h"
+#include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h
index 9845c80dc..370c8dfb6 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraimageprocessingcontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h
@@ -40,7 +40,18 @@
 #ifndef QANDROIDCAMERAIMAGEPROCESSINGCONTROL_H
 #define QANDROIDCAMERAIMAGEPROCESSINGCONTROL_H
 
-#include <qcameraimageprocessingcontrol.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qcameraimageprocessingcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
index 9e3c37736..f261d86e2 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
@@ -38,14 +38,14 @@
 **
 ****************************************************************************/
 
-#include "qandroidcamerasession.h"
-
-#include "androidcamera.h"
-#include "androidmultimediautils.h"
-#include "qandroidvideooutput.h"
-#include "qandroidmediavideoprobecontrol.h"
-#include "qandroidmultimediautils.h"
-#include "qandroidcameravideorenderercontrol.h"
+#include "qandroidcamerasession_p.h"
+
+#include "androidcamera_p.h"
+#include "androidmultimediautils_p.h"
+#include "qandroidvideooutput_p.h"
+#include "qandroidmediavideoprobecontrol_p.h"
+#include "qandroidmultimediautils_p.h"
+#include "qandroidcameravideorenderercontrol_p.h"
 #include <qabstractvideosurface.h>
 #include <QtConcurrent/qtconcurrentrun.h>
 #include <qfile.h>
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.h b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
index 728dc484e..5d4c06738 100644
--- a/src/plugins/android/src/mediacapture/qandroidcamerasession.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
@@ -41,13 +41,24 @@
 #ifndef QANDROIDCAMERASESSION_H
 #define QANDROIDCAMERASESSION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcamera.h>
 #include <qmediaencodersettings.h>
 #include <QCameraImageCapture>
 #include <QSet>
 #include <QMutex>
 #include <private/qmediastoragelocation_p.h>
-#include "androidcamera.h"
+#include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp
index 2243df732..6084ed43f 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp
@@ -37,12 +37,12 @@
 **
 ****************************************************************************/
 
-#include "qandroidcameravideorenderercontrol.h"
+#include "qandroidcameravideorenderercontrol_p.h"
 
-#include "qandroidcamerasession.h"
-#include "qandroidvideooutput.h"
-#include "androidsurfaceview.h"
-#include "qandroidmultimediautils.h"
+#include "qandroidcamerasession_p.h"
+#include "qandroidvideooutput_p.h"
+#include "androidsurfaceview_p.h"
+#include "qandroidmultimediautils_p.h"
 #include <qabstractvideosurface.h>
 #include <qvideosurfaceformat.h>
 #include <qcoreapplication.h>
diff --git a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.h b/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol_p.h
index 538226239..0deaac943 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDCAMERAVIDEORENDERERCONTROL_H
 #define QANDROIDCAMERAVIDEORENDERERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideorenderercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
index 469867ca8..79808956e 100644
--- a/src/plugins/android/src/mediacapture/qandroidcaptureservice.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
@@ -38,24 +38,24 @@
 **
 ****************************************************************************/
 
-#include "qandroidcaptureservice.h"
-
-#include "qandroidmediarecordercontrol.h"
-#include "qandroidcapturesession.h"
-#include "qandroidcameracontrol.h"
-#include "qandroidvideodeviceselectorcontrol.h"
-#include "qandroidaudioinputselectorcontrol.h"
-#include "qandroidcamerasession.h"
-#include "qandroidcameravideorenderercontrol.h"
-#include "qandroidcameraexposurecontrol.h"
-#include "qandroidcamerafocuscontrol.h"
-#include "qandroidcameraimageprocessingcontrol.h"
-#include "qandroidimageencodercontrol.h"
-#include "qandroidcameraimagecapturecontrol.h"
-#include "qandroidaudioencodersettingscontrol.h"
-#include "qandroidvideoencodersettingscontrol.h"
-#include "qandroidmediacontainercontrol.h"
-#include "qandroidmediavideoprobecontrol.h"
+#include "qandroidcaptureservice_p.h"
+
+#include "qandroidmediarecordercontrol_p.h"
+#include "qandroidcapturesession_p.h"
+#include "qandroidcameracontrol_p.h"
+#include "qandroidvideodeviceselectorcontrol_p.h"
+#include "qandroidaudioinputselectorcontrol_p.h"
+#include "qandroidcamerasession_p.h"
+#include "qandroidcameravideorenderercontrol_p.h"
+#include "qandroidcameraexposurecontrol_p.h"
+#include "qandroidcamerafocuscontrol_p.h"
+#include "qandroidcameraimageprocessingcontrol_p.h"
+#include "qandroidimageencodercontrol_p.h"
+#include "qandroidcameraimagecapturecontrol_p.h"
+#include "qandroidaudioencodersettingscontrol_p.h"
+#include "qandroidvideoencodersettingscontrol_p.h"
+#include "qandroidmediacontainercontrol_p.h"
+#include "qandroidmediavideoprobecontrol_p.h"
 
 #include <qmediaserviceproviderplugin.h>
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcaptureservice.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
index 7c2e53c5f..e202c40c2 100644
--- a/src/plugins/android/src/mediacapture/qandroidcaptureservice.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
@@ -41,7 +41,17 @@
 #ifndef QANDROIDCAPTURESERVICE_H
 #define QANDROIDCAPTURESERVICE_H
 
-#include <qmediaservice.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaservice.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp
index 768bb4442..67f748994 100644
--- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 
-#include "qandroidcapturesession.h"
-
-#include "androidcamera.h"
-#include "qandroidcamerasession.h"
-#include "androidmultimediautils.h"
-#include "qandroidmultimediautils.h"
-#include "qandroidvideooutput.h"
-#include "qandroidglobal.h"
+#include "qandroidcapturesession_p.h"
+
+#include "androidcamera_p.h"
+#include "qandroidcamerasession_p.h"
+#include "androidmultimediautils_p.h"
+#include "qandroidmultimediautils_p.h"
+#include "qandroidvideooutput_p.h"
+#include "qandroidglobal_p.h"
 
 #include <algorithm>
 
diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.h b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h
index 8cfb9ad2a..7ea469334 100644
--- a/src/plugins/android/src/mediacapture/qandroidcapturesession.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h
@@ -40,13 +40,24 @@
 #ifndef QANDROIDCAPTURESESSION_H
 #define QANDROIDCAPTURESESSION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qobject.h>
 #include <qmediarecorder.h>
 #include <qurl.h>
 #include <qelapsedtimer.h>
 #include <qtimer.h>
 #include <private/qmediastoragelocation_p.h>
-#include "androidmediarecorder.h"
+#include "androidmediarecorder_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol.cpp
index 666f553e5..1f30ea95f 100644
--- a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qandroidimageencodercontrol.h"
+#include "qandroidimageencodercontrol_p.h"
 
-#include "qandroidcamerasession.h"
-#include "androidcamera.h"
+#include "qandroidcamerasession_p.h"
+#include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h b/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol_p.h
index 52f602e78..9e65660ff 100644
--- a/src/plugins/android/src/mediacapture/qandroidimageencodercontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidimageencodercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDIMAGEENCODERCONTROL_H
 #define QANDROIDIMAGEENCODERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qimageencodercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediacontainercontrol.cpp
index bda711367..45fe7092c 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediacontainercontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediacontainercontrol.h"
+#include "qandroidmediacontainercontrol_p.h"
 
-#include "qandroidcapturesession.h"
+#include "qandroidcapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.h b/src/multimedia/platform/android/mediacapture/qandroidmediacontainercontrol_p.h
index 1d90fb6cd..00f09970f 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediacontainercontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediacontainercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDMEDIACONTAINERCONTROL_H
 #define QANDROIDMEDIACONTAINERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediacontainercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp
index fa68409d3..7a1913afc 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediarecordercontrol.h"
+#include "qandroidmediarecordercontrol_p.h"
 
-#include "qandroidcapturesession.h"
+#include "qandroidcapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.h b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h
index 6da59a50d..4f6685d28 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediarecordercontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDMEDIARECORDERCONTROL_H
 #define QANDROIDMEDIARECORDERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediarecordercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediavideoprobecontrol.cpp
index 1995ebf6a..86321271a 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediavideoprobecontrol.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediavideoprobecontrol.h"
+#include "qandroidmediavideoprobecontrol_p.h"
 #include <qvideoframe.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.h b/src/multimedia/platform/android/mediacapture/qandroidmediavideoprobecontrol_p.h
index 3306ad224..324370e97 100644
--- a/src/plugins/android/src/mediacapture/qandroidmediavideoprobecontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediavideoprobecontrol_p.h
@@ -41,6 +41,17 @@
 #ifndef QANDROIDMEDIAVIDEOPROBECONTROL_H
 #define QANDROIDMEDIAVIDEOPROBECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediavideoprobecontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidvideodeviceselectorcontrol.cpp
index 0c7756693..5403647f7 100644
--- a/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidvideodeviceselectorcontrol.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qandroidvideodeviceselectorcontrol.h"
+#include "qandroidvideodeviceselectorcontrol_p.h"
 
-#include "qandroidcamerasession.h"
-#include "androidcamera.h"
+#include "qandroidcamerasession_p.h"
+#include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.h b/src/multimedia/platform/android/mediacapture/qandroidvideodeviceselectorcontrol_p.h
index cdfffcaf0..d074e7441 100644
--- a/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidvideodeviceselectorcontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDVIDEODEVICESELECTORCONTROL_H
 #define QANDROIDVIDEODEVICESELECTORCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideodeviceselectorcontrol.h>
 #include <QtCore/qstringlist.h>
 
diff --git a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidvideoencodersettingscontrol.cpp
index 3d67e8cfa..ef3559c0d 100644
--- a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidvideoencodersettingscontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qandroidvideoencodersettingscontrol.h"
+#include "qandroidvideoencodersettingscontrol_p.h"
 
-#include "qandroidcapturesession.h"
+#include "qandroidcapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h b/src/multimedia/platform/android/mediacapture/qandroidvideoencodersettingscontrol_p.h
index 146b44ac4..1488790a8 100644
--- a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidvideoencodersettingscontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDVIDEOENCODERSETTINGSCONTROL_H
 #define QANDROIDVIDEOENCODERSETTINGSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideoencodersettingscontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediaplayer/mediaplayer.pri b/src/multimedia/platform/android/mediaplayer/mediaplayer.pri
index 9f758a993..33348b38b 100644
--- a/src/plugins/android/src/mediaplayer/mediaplayer.pri
+++ b/src/multimedia/platform/android/mediaplayer/mediaplayer.pri
@@ -1,10 +1,10 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qandroidmediaplayercontrol.h \
-    $$PWD/qandroidmediaservice.h \
-    $$PWD/qandroidmetadatareadercontrol.h \
-    $$PWD/qandroidmediaplayervideorenderercontrol.h
+    $$PWD/qandroidmediaplayercontrol_p.h \
+    $$PWD/qandroidmediaservice_p.h \
+    $$PWD/qandroidmetadatareadercontrol_p.h \
+    $$PWD/qandroidmediaplayervideorenderercontrol_p.h
 
 SOURCES += \
     $$PWD/qandroidmediaplayercontrol.cpp \
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
index f667413dd..7e4f32e4a 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediaplayercontrol.h"
-#include "androidmediaplayer.h"
-#include "qandroidvideooutput.h"
+#include "qandroidmediaplayercontrol_p.h"
+#include "androidmediaplayer_p.h"
+#include "qandroidvideooutput_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
index 84fdefb15..b7246acb4 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDMEDIAPLAYERCONTROL_H
 #define QANDROIDMEDIAPLAYERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qglobal.h>
 #include <QMediaPlayerControl>
 #include <qsize.h>
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp
index 5252d60ad..aed7ba671 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediaplayervideorenderercontrol.h"
+#include "qandroidmediaplayervideorenderercontrol_p.h"
 
-#include "qandroidmediaplayercontrol.h"
-#include "qandroidvideooutput.h"
+#include "qandroidmediaplayercontrol_p.h"
+#include "qandroidvideooutput_p.h"
 #include <qabstractvideosurface.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol_p.h
index ef213cc57..91aed30fb 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayervideorenderercontrol.h
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDMEDIAPLAYERVIDEORENDERERCONTROL_H
 #define QANDROIDMEDIAPLAYERVIDEORENDERERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideorenderercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaservice.cpp
index 084df5554..7ccf1dc3a 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaservice.cpp
@@ -37,11 +37,11 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediaservice.h"
+#include "qandroidmediaservice_p.h"
 
-#include "qandroidmediaplayercontrol.h"
-#include "qandroidmetadatareadercontrol.h"
-#include "qandroidmediaplayervideorenderercontrol.h"
+#include "qandroidmediaplayercontrol_p.h"
+#include "qandroidmetadatareadercontrol_p.h"
+#include "qandroidmediaplayervideorenderercontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaservice.h b/src/multimedia/platform/android/mediaplayer/qandroidmediaservice_p.h
index 8a1da12cb..984c95ba3 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaservice.h
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaservice_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDMEDIASERVICE_H
 #define QANDROIDMEDIASERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QMediaService>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmetadatareadercontrol.cpp
index 3bfb2f61b..31263335b 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmetadatareadercontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qandroidmetadatareadercontrol.h"
+#include "qandroidmetadatareadercontrol_p.h"
 
-#include "androidmediametadataretriever.h"
+#include "androidmediametadataretriever_p.h"
 #include <QtMultimedia/qmediametadata.h>
 #include <qsize.h>
 #include <QDate>
diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h b/src/multimedia/platform/android/mediaplayer/qandroidmetadatareadercontrol_p.h
index 18aa9fda6..2ee857fa1 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmetadatareadercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDMETADATAREADERCONTROL_H
 #define QANDROIDMETADATAREADERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QMetaDataReaderControl>
 #include <QUrl.h>
 #include <QMutex>
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/multimedia/platform/android/qandroidmediaserviceplugin.cpp
index 99af8b3d4..52cedb5bd 100644
--- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp
+++ b/src/multimedia/platform/android/qandroidmediaserviceplugin.cpp
@@ -37,23 +37,23 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediaserviceplugin.h"
-
-#include "qandroidmediaservice.h"
-#include "qandroidcaptureservice.h"
-#include "qandroidaudioinputselectorcontrol.h"
-#include "qandroidcamerasession.h"
-#include "androidmediaplayer.h"
-#include "androidsurfacetexture.h"
-#include "androidcamera.h"
-#include "androidmultimediautils.h"
-#include "androidmediarecorder.h"
-#include "androidsurfaceview.h"
-#include "qandroidglobal.h"
+#include "qandroidmediaserviceplugin_p.h"
+
+#include "qandroidmediaservice_p.h"
+#include "qandroidcaptureservice_p.h"
+#include "qandroidaudioinputselectorcontrol_p.h"
+#include "qandroidcamerasession_p.h"
+#include "androidmediaplayer_p.h"
+#include "androidsurfacetexture_p.h"
+#include "androidcamera_p.h"
+#include "androidmultimediautils_p.h"
+#include "androidmediarecorder_p.h"
+#include "androidsurfaceview_p.h"
+#include "qandroidglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
-Q_LOGGING_CATEGORY(qtAndroidMediaPlugin, "qt.multimedia.plugins.android")
+Q_LOGGING_CATEGORY(qtAndroidMediaPlugin, "qt.multimedia.android")
 
 QAndroidMediaServicePlugin::QAndroidMediaServicePlugin()
 {
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.h b/src/multimedia/platform/android/qandroidmediaserviceplugin_p.h
index 7320042d2..8c024cad7 100644
--- a/src/plugins/android/src/qandroidmediaserviceplugin.h
+++ b/src/multimedia/platform/android/qandroidmediaserviceplugin_p.h
@@ -40,6 +40,17 @@
 #ifndef QANDROIDMEDIASERVICEPLUGIN_H
 #define QANDROIDMEDIASERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QMediaServiceProviderPlugin>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
index 33e819d78..60fc4ec8a 100644
--- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
@@ -38,11 +38,11 @@
 **
 ****************************************************************************/
 
-#include "androidcamera.h"
-#include "androidsurfacetexture.h"
-#include "androidsurfaceview.h"
-#include "qandroidmultimediautils.h"
-#include "qandroidglobal.h"
+#include "androidcamera_p.h"
+#include "androidsurfacetexture_p.h"
+#include "androidsurfaceview_p.h"
+#include "qandroidmultimediautils_p.h"
+#include "qandroidglobal_p.h"
 
 #include <qstringlist.h>
 #include <qdebug.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.h b/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h
index 5ae141f01..5536e5919 100644
--- a/src/plugins/android/src/wrappers/jni/androidcamera.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h
@@ -41,6 +41,17 @@
 #ifndef ANDROIDCAMERA_H
 #define ANDROIDCAMERA_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qobject.h>
 #include <QtCore/private/qjni_p.h>
 #include <qsize.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp b/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever.cpp
index ce6144167..3fa480acb 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "androidmediametadataretriever.h"
+#include "androidmediametadataretriever_p.h"
 
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtCore/private/qjni_p.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h b/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever_p.h
index 1e141813d..8a7b75480 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidmediametadataretriever_p.h
@@ -40,6 +40,17 @@
 #ifndef ANDROIDMEDIAMETADATARETRIEVER_H
 #define ANDROIDMEDIAMETADATARETRIEVER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/private/qjni_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp b/src/multimedia/platform/android/wrappers/jni/androidmediaplayer.cpp
index c94695de4..7fc15e788 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidmediaplayer.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "androidmediaplayer.h"
+#include "androidmediaplayer_p.h"
 
 #include <QString>
 #include <QtCore/private/qjni_p.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidmediaplayer.h b/src/multimedia/platform/android/wrappers/jni/androidmediaplayer_p.h
index 37c7456f7..bf7a7002b 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediaplayer.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidmediaplayer_p.h
@@ -40,6 +40,17 @@
 #ifndef ANDROIDMEDIAPLAYER_H
 #define ANDROIDMEDIAPLAYER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QObject>
 #include <QNetworkRequest>
 #include <QtCore/private/qjni_p.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp b/src/multimedia/platform/android/wrappers/jni/androidmediarecorder.cpp
index e5f8846b9..97bbd3b6a 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidmediarecorder.cpp
@@ -37,13 +37,13 @@
 **
 ****************************************************************************/
 
-#include "androidmediarecorder.h"
+#include "androidmediarecorder_p.h"
 
-#include "androidcamera.h"
-#include "androidsurfacetexture.h"
-#include "androidsurfaceview.h"
-#include "qandroidglobal.h"
-#include "qandroidmultimediautils.h"
+#include "androidcamera_p.h"
+#include "androidsurfacetexture_p.h"
+#include "androidsurfaceview_p.h"
+#include "qandroidglobal_p.h"
+#include "qandroidmultimediautils_p.h"
 #include <QtCore/private/qjni_p.h>
 #include <qmap.h>
 
diff --git a/src/plugins/android/src/wrappers/jni/androidmediarecorder.h b/src/multimedia/platform/android/wrappers/jni/androidmediarecorder_p.h
index e4b3a80ea..9cba14f75 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediarecorder.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidmediarecorder_p.h
@@ -40,6 +40,17 @@
 #ifndef ANDROIDMEDIARECORDER_H
 #define ANDROIDMEDIARECORDER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qobject.h>
 #include <QtCore/private/qjni_p.h>
 #include <qsize.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidmultimediautils.cpp b/src/multimedia/platform/android/wrappers/jni/androidmultimediautils.cpp
index 19dfbd7d2..387cb1721 100644
--- a/src/plugins/android/src/wrappers/jni/androidmultimediautils.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidmultimediautils.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "androidmultimediautils.h"
+#include "androidmultimediautils_p.h"
 
 #include <QtCore/private/qjni_p.h>
 
diff --git a/src/plugins/android/src/wrappers/jni/androidmultimediautils.h b/src/multimedia/platform/android/wrappers/jni/androidmultimediautils_p.h
index 152d849e4..cb80c5c1e 100644
--- a/src/plugins/android/src/wrappers/jni/androidmultimediautils.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidmultimediautils_p.h
@@ -40,6 +40,17 @@
 #ifndef ANDROIDMULTIMEDIAUTILS_H
 #define ANDROIDMULTIMEDIAUTILS_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qobject.h>
 #include <QtCore/private/qjni_p.h>
 
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp b/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture.cpp
index d861a355f..8f9be7c3b 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "androidsurfacetexture.h"
+#include "androidsurfacetexture_p.h"
 #include <QtCore/private/qjni_p.h>
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtCore/qmutex.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h b/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture_p.h
index 911711774..5404bb7a7 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidsurfacetexture_p.h
@@ -40,6 +40,17 @@
 #ifndef ANDROIDSURFACETEXTURE_H
 #define ANDROIDSURFACETEXTURE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qobject.h>
 #include <QtCore/private/qjni_p.h>
 
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp b/src/multimedia/platform/android/wrappers/jni/androidsurfaceview.cpp
index 65dfe84b9..cbe17a6f9 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidsurfaceview.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "androidsurfaceview.h"
+#include "androidsurfaceview_p.h"
 
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfaceview.h b/src/multimedia/platform/android/wrappers/jni/androidsurfaceview_p.h
index ef603061d..7d89df09b 100644
--- a/src/plugins/android/src/wrappers/jni/androidsurfaceview.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidsurfaceview_p.h
@@ -40,6 +40,17 @@
 #ifndef ANDROIDSURFACEVIEW_H
 #define ANDROIDSURFACEVIEW_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/private/qjni_p.h>
 #include <qrect.h>
 #include <QtCore/qrunnable.h>
diff --git a/src/plugins/android/src/wrappers/jni/jni.pri b/src/multimedia/platform/android/wrappers/jni/jni.pri
index 930d7e922..14bc78573 100644
--- a/src/plugins/android/src/wrappers/jni/jni.pri
+++ b/src/multimedia/platform/android/wrappers/jni/jni.pri
@@ -3,13 +3,13 @@ QT += core-private
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/androidmediaplayer.h \
-    $$PWD/androidsurfacetexture.h \
-    $$PWD/androidmediametadataretriever.h \
-    $$PWD/androidcamera.h \
-    $$PWD/androidmultimediautils.h \
-    $$PWD/androidmediarecorder.h \
-    $$PWD/androidsurfaceview.h
+    $$PWD/androidmediaplayer_p.h \
+    $$PWD/androidsurfacetexture_p.h \
+    $$PWD/androidmediametadataretriever_p.h \
+    $$PWD/androidcamera_p.h \
+    $$PWD/androidmultimediautils_p.h \
+    $$PWD/androidmediarecorder_p.h \
+    $$PWD/androidsurfaceview_p.h
 
 SOURCES += \
     $$PWD/androidmediaplayer.cpp \
diff --git a/src/multimedia/platform/avfoundation/avfoundation.pri b/src/multimedia/platform/avfoundation/avfoundation.pri
new file mode 100644
index 000000000..29be7ec58
--- /dev/null
+++ b/src/multimedia/platform/avfoundation/avfoundation.pri
@@ -0,0 +1,18 @@
+LIBS += -framework CoreFoundation \
+        -framework Foundation \
+        -framework AudioToolbox \
+        -framework CoreAudio \
+        -framework QuartzCore \
+        -framework CoreMedia \
+        -framework CoreVideo \
+        -framework QuartzCore \
+        -framework Metal
+osx:LIBS += -framework AppKit \
+            -framework AudioUnit
+ios:LIBS += -framework CoreGraphics \
+            -framework CoreVideo
+
+QMAKE_USE += avfoundation
+
+include(mediaplayer/mediaplayer.pri)
+!tvos:include(camera/camera.pri)
diff --git a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.mm b/src/multimedia/platform/avfoundation/camera/avfaudioencodersettingscontrol.mm
index 1aeb44ff6..b613ca32a 100644
--- a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfaudioencodersettingscontrol.mm
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "avfaudioencodersettingscontrol.h"
+#include "avfaudioencodersettingscontrol_p.h"
 
-#include "avfcameraservice.h"
-#include "avfcamerasession.h"
+#include "avfcameraservice_p.h"
+#include "avfcamerasession_p.h"
 
 #include <AVFoundation/AVFoundation.h>
 #include <CoreAudio/CoreAudioTypes.h>
diff --git a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h b/src/multimedia/platform/avfoundation/camera/avfaudioencodersettingscontrol_p.h
index 94aa6a8f0..b1851a5bf 100644
--- a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfaudioencodersettingscontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFAUDIOENCODERSETTINGSCONTROL_H
 #define AVFAUDIOENCODERSETTINGSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qaudioencodersettingscontrol.h>
 
 @class NSDictionary;
diff --git a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm b/src/multimedia/platform/avfoundation/camera/avfaudioinputselectorcontrol.mm
index de29fd970..21ff70917 100644
--- a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfaudioinputselectorcontrol.mm
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "avfcameradebug.h"
-#include "avfaudioinputselectorcontrol.h"
-#include "avfcameraservice.h"
+#include "avfcameradebug_p.h"
+#include "avfaudioinputselectorcontrol_p.h"
+#include "avfcameraservice_p.h"
 
 #import <AVFoundation/AVFoundation.h>
 
@@ -116,4 +116,4 @@ AVCaptureDevice *AVFAudioInputSelectorControl::createCaptureDevice()
     return device;
 }
 
-#include "moc_avfaudioinputselectorcontrol.cpp"
+#include "moc_avfaudioinputselectorcontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h b/src/multimedia/platform/avfoundation/camera/avfaudioinputselectorcontrol_p.h
index a902a71f9..90a9bc3fc 100644
--- a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfaudioinputselectorcontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFAUDIOINPUTSELECTORCONTROL_H
 #define AVFAUDIOINPUTSELECTORCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/qaudioinputselectorcontrol.h>
 #include <QtCore/qstringlist.h>
 
diff --git a/src/plugins/avfoundation/camera/avfcameracontrol.mm b/src/multimedia/platform/avfoundation/camera/avfcameracontrol.mm
index a6bc91995..27c28587f 100644
--- a/src/plugins/avfoundation/camera/avfcameracontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcameracontrol.mm
@@ -37,12 +37,12 @@
 **
 ****************************************************************************/
 
-#include "avfcameradebug.h"
-#include "avfcameracontrol.h"
-#include "avfcamerasession.h"
-#include "avfcameraservice.h"
-#include "avfcamerautility.h"
-#include "avfcamerarenderercontrol.h"
+#include "avfcameradebug_p.h"
+#include "avfcameracontrol_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcamerautility_p.h"
+#include "avfcamerarenderercontrol_p.h"
 #include "qabstractvideosurface.h"
 
 QT_USE_NAMESPACE
@@ -527,4 +527,4 @@ AVCaptureConnection *AVFCameraControl::videoConnection() const
     return [m_service->videoOutput()->videoDataOutput() connectionWithMediaType:AVMediaTypeVideo];
 }
 
-#include "moc_avfcameracontrol.cpp"
+#include "moc_avfcameracontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcameracontrol.h b/src/multimedia/platform/avfoundation/camera/avfcameracontrol_p.h
index 1792645f7..2cb464fe5 100644
--- a/src/plugins/avfoundation/camera/avfcameracontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcameracontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERACONTROL_H
 #define AVFCAMERACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qobject.h>
 
 #include <QtMultimedia/qcameracontrol.h>
diff --git a/src/plugins/avfoundation/camera/avfcameradebug.h b/src/multimedia/platform/avfoundation/camera/avfcameradebug_p.h
index 8838122e0..616e53d99 100644
--- a/src/plugins/avfoundation/camera/avfcameradebug.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcameradebug_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFDEBUG_H
 #define AVFDEBUG_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtmultimediaglobal.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm b/src/multimedia/platform/avfoundation/camera/avfcameradevicecontrol.mm
index cf6343754..ac5711fb1 100644
--- a/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcameradevicecontrol.mm
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "avfcameradebug.h"
-#include "avfcameradevicecontrol.h"
-#include "avfcameraservice.h"
-#include "avfcamerasession.h"
+#include "avfcameradebug_p.h"
+#include "avfcameradevicecontrol_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcamerasession_p.h"
 
 QT_USE_NAMESPACE
 
@@ -139,4 +139,4 @@ AVCaptureDevice *AVFCameraDeviceControl::createCaptureDevice()
     return device;
 }
 
-#include "moc_avfcameradevicecontrol.cpp"
+#include "moc_avfcameradevicecontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcameradevicecontrol.h b/src/multimedia/platform/avfoundation/camera/avfcameradevicecontrol_p.h
index 0b0d560e8..0fb8628b2 100644
--- a/src/plugins/avfoundation/camera/avfcameradevicecontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcameradevicecontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERADEVICECONTROL_H
 #define AVFCAMERADEVICECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/qvideodeviceselectorcontrol.h>
 #include <QtCore/qstringlist.h>
 
diff --git a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm b/src/multimedia/platform/avfoundation/camera/avfcameraexposurecontrol.mm
index 052a88dea..a0b2ae06d 100644
--- a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcameraexposurecontrol.mm
@@ -37,11 +37,11 @@
 **
 ****************************************************************************/
 
-#include "avfcameraexposurecontrol.h"
-#include "avfcamerautility.h"
-#include "avfcamerasession.h"
-#include "avfcameraservice.h"
-#include "avfcameradebug.h"
+#include "avfcameraexposurecontrol_p.h"
+#include "avfcamerautility_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcameradebug_p.h"
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qpointer.h>
@@ -828,4 +828,4 @@ bool AVFCameraExposureControl::applyFlashSettings()
 
 QT_END_NAMESPACE
 
-#include "moc_avfcameraexposurecontrol.cpp"
+#include "moc_avfcameraexposurecontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h b/src/multimedia/platform/avfoundation/camera/avfcameraexposurecontrol_p.h
index 6d97bed85..9cf60a7b8 100644
--- a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcameraexposurecontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERAEXPOSURECONTROL_H
 #define AVFCAMERAEXPOSURECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/qcameraexposurecontrol.h>
 #include <QtMultimedia/qcameraexposure.h>
 
diff --git a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.mm b/src/multimedia/platform/avfoundation/camera/avfcamerafocuscontrol.mm
index 19dfa6dd2..62a7d55e2 100644
--- a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerafocuscontrol.mm
@@ -37,11 +37,11 @@
 **
 ****************************************************************************/
 
-#include "avfcamerafocuscontrol.h"
-#include "avfcamerautility.h"
-#include "avfcameraservice.h"
-#include "avfcamerasession.h"
-#include "avfcameradebug.h"
+#include "avfcamerafocuscontrol_p.h"
+#include "avfcamerautility_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameradebug_p.h"
 
 #include <QtCore/qdebug.h>
 
@@ -419,4 +419,4 @@ void AVFCameraFocusControl::zoomToRequestedDigital()
 
 QT_END_NAMESPACE
 
-#include "moc_avfcamerafocuscontrol.cpp"
+#include "moc_avfcamerafocuscontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h b/src/multimedia/platform/avfoundation/camera/avfcamerafocuscontrol_p.h
index 56f4bc54d..3527d48b6 100644
--- a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerafocuscontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERAFOCUSCONTROL_H
 #define AVFCAMERAFOCUSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qglobal.h>
 
diff --git a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm b/src/multimedia/platform/avfoundation/camera/avfcamerametadatacontrol.mm
index 95a8a0d79..4addfd938 100644
--- a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerametadatacontrol.mm
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "avfcamerametadatacontrol.h"
-#include "avfcamerasession.h"
-#include "avfcameraservice.h"
+#include "avfcamerametadatacontrol_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameraservice_p.h"
 
 QT_USE_NAMESPACE
 
@@ -80,4 +80,4 @@ QStringList AVFCameraMetaDataControl::availableMetaData() const
     return m_tags.keys();
 }
 
-#include "moc_avfcamerametadatacontrol.cpp"
+#include "moc_avfcamerametadatacontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.h b/src/multimedia/platform/avfoundation/camera/avfcamerametadatacontrol_p.h
index fd8659dfd..2f9138986 100644
--- a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerametadatacontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERAMETADATACONTROL_H
 #define AVFCAMERAMETADATACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmetadatawritercontrol.h>
 #include <QtCore/qvariant.h>
 
diff --git a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm b/src/multimedia/platform/avfoundation/camera/avfcamerarenderercontrol.mm
index b77aa21ec..13131766c 100644
--- a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerarenderercontrol.mm
@@ -38,11 +38,11 @@
 ****************************************************************************/
 
 #include "private/qabstractvideobuffer_p.h"
-#include "avfcamerarenderercontrol.h"
-#include "avfcamerasession.h"
-#include "avfcameraservice.h"
-#include "avfcameradebug.h"
-#include "avfcameracontrol.h"
+#include "avfcamerarenderercontrol_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcameradebug_p.h"
+#include "avfcameracontrol_p.h"
 
 #ifdef Q_OS_IOS
 #include <QtGui/qopengl.h>
@@ -406,4 +406,4 @@ void AVFCameraRendererControl::handleViewfinderFrame()
 }
 
 
-#include "moc_avfcamerarenderercontrol.cpp"
+#include "moc_avfcamerarenderercontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.h b/src/multimedia/platform/avfoundation/camera/avfcamerarenderercontrol_p.h
index 3ef3d07d4..ade916ed6 100644
--- a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerarenderercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERARENDERERCONTROL_H
 #define AVFCAMERARENDERERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/qvideorenderercontrol.h>
 #include <QtMultimedia/qvideoframe.h>
 #include <QtCore/qmutex.h>
diff --git a/src/plugins/avfoundation/camera/avfcameraservice.mm b/src/multimedia/platform/avfoundation/camera/avfcameraservice.mm
index 29ac6b07f..9fcab0ead 100644
--- a/src/plugins/avfoundation/camera/avfcameraservice.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcameraservice.mm
@@ -40,32 +40,30 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 
-#include "avfcameraservice.h"
-#include "avfcameracontrol.h"
-#include "avfcamerasession.h"
-#include "avfcameradevicecontrol.h"
-#include "avfaudioinputselectorcontrol.h"
-#include "avfcamerametadatacontrol.h"
-#include "avfmediarecordercontrol.h"
-#include "avfimagecapturecontrol.h"
-#include "avfcamerarenderercontrol.h"
-#include "avfmediarecordercontrol.h"
-#include "avfimagecapturecontrol.h"
-#include "avfmediavideoprobecontrol.h"
-#include "avfcamerafocuscontrol.h"
-#include "avfcameraexposurecontrol.h"
-#include "avfimageencodercontrol.h"
-#include "avfaudioencodersettingscontrol.h"
-#include "avfvideoencodersettingscontrol.h"
-#include "avfmediacontainercontrol.h"
-#include "avfcamerawindowcontrol.h"
+#include "avfcameraservice_p.h"
+#include "avfcameracontrol_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameradevicecontrol_p.h"
+#include "avfaudioinputselectorcontrol_p.h"
+#include "avfcamerametadatacontrol_p.h"
+#include "avfmediarecordercontrol_p.h"
+#include "avfimagecapturecontrol_p.h"
+#include "avfcamerarenderercontrol_p.h"
+#include "avfmediarecordercontrol_p.h"
+#include "avfimagecapturecontrol_p.h"
+#include "avfmediavideoprobecontrol_p.h"
+#include "avfcamerafocuscontrol_p.h"
+#include "avfcameraexposurecontrol_p.h"
+#include "avfimageencodercontrol_p.h"
+#include "avfaudioencodersettingscontrol_p.h"
+#include "avfvideoencodersettingscontrol_p.h"
+#include "avfmediacontainercontrol_p.h"
+#include "avfcamerawindowcontrol_p.h"
 
 #ifdef Q_OS_IOS
-#include "avfmediarecordercontrol_ios.h"
+#include "avfmediarecordercontrol_ios_p.h"
 #endif
 
-#include <qmediaplaylist.h>
-
 QT_USE_NAMESPACE
 
 AVFCameraService::AVFCameraService(QObject *parent):
@@ -222,4 +220,4 @@ void AVFCameraService::releaseControl(QObject *control)
 }
 
 
-#include "moc_avfcameraservice.cpp"
+#include "moc_avfcameraservice_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcameraservice.h b/src/multimedia/platform/avfoundation/camera/avfcameraservice_p.h
index 2c5bfedce..9efe4e9cb 100644
--- a/src/plugins/avfoundation/camera/avfcameraservice.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcameraservice_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERASERVICE_H
 #define AVFCAMERASERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qobject.h>
 #include <QtCore/qset.h>
 #include <qmediaservice.h>
diff --git a/src/plugins/avfoundation/camera/avfcameraserviceplugin.mm b/src/multimedia/platform/avfoundation/camera/avfcameraserviceplugin.mm
index a94325e34..2fd8d3fad 100644
--- a/src/plugins/avfoundation/camera/avfcameraserviceplugin.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcameraserviceplugin.mm
@@ -40,9 +40,9 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qdebug.h>
 
-#include "avfcameraserviceplugin.h"
-#include "avfcameraservice.h"
-#include "avfcamerasession.h"
+#include "avfcameraserviceplugin_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcamerasession_p.h"
 
 #include <qmediaserviceproviderplugin.h>
 
diff --git a/src/plugins/avfoundation/camera/avfcameraserviceplugin.h b/src/multimedia/platform/avfoundation/camera/avfcameraserviceplugin_p.h
index 4d3e009da..e9028542c 100644
--- a/src/plugins/avfoundation/camera/avfcameraserviceplugin.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcameraserviceplugin_p.h
@@ -41,6 +41,17 @@
 #ifndef AVFSERVICEPLUGIN_H
 #define AVFSERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaserviceproviderplugin.h>
 #include <QtCore/qmap.h>
 
@@ -51,7 +62,6 @@ class AVFServicePlugin : public QMediaServiceProviderPlugin,
 {
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
-    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "avfcamera.json")
 
 public:
     AVFServicePlugin();
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/multimedia/platform/avfoundation/camera/avfcamerasession.mm
index 4ffa5ad69..914ae6907 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerasession.mm
@@ -37,17 +37,17 @@
 **
 ****************************************************************************/
 
-#include "avfcameradebug.h"
-#include "avfcamerasession.h"
-#include "avfcameraservice.h"
-#include "avfcameracontrol.h"
-#include "avfcamerarenderercontrol.h"
-#include "avfcameradevicecontrol.h"
-#include "avfaudioinputselectorcontrol.h"
-#include "avfmediavideoprobecontrol.h"
-#include "avfimageencodercontrol.h"
-#include "avfcamerautility.h"
-#include "avfcamerawindowcontrol.h"
+#include "avfcameradebug_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcameracontrol_p.h"
+#include "avfcamerarenderercontrol_p.h"
+#include "avfcameradevicecontrol_p.h"
+#include "avfaudioinputselectorcontrol_p.h"
+#include "avfmediavideoprobecontrol_p.h"
+#include "avfimageencodercontrol_p.h"
+#include "avfcamerautility_p.h"
+#include "avfcamerawindowcontrol_p.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
@@ -488,4 +488,4 @@ void AVFCameraSession::onCameraFrameFetched(const QVideoFrame &frame)
     m_videoProbesMutex.unlock();
 }
 
-#include "moc_avfcamerasession.cpp"
+#include "moc_avfcamerasession_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/multimedia/platform/avfoundation/camera/avfcamerasession_p.h
index a449bb806..19f7945a3 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerasession_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERASESSION_H
 #define AVFCAMERASESSION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qmutex.h>
 #include <QtMultimedia/qcamera.h>
 #include <QVideoFrame>
diff --git a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/multimedia/platform/avfoundation/camera/avfcamerautility.mm
index 25ccc4b01..fe56517df 100644
--- a/src/plugins/avfoundation/camera/avfcamerautility.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerautility.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "avfcamerautility.h"
-#include "avfcameradebug.h"
+#include "avfcamerautility_p.h"
+#include "avfcameradebug_p.h"
 
 #include <QtCore/qvector.h>
 #include <QtCore/qpair.h>
diff --git a/src/plugins/avfoundation/camera/avfcamerautility.h b/src/multimedia/platform/avfoundation/camera/avfcamerautility_p.h
index 2e8bf39b4..ffa9630a7 100644
--- a/src/plugins/avfoundation/camera/avfcamerautility.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerautility_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFCAMERAUTILITY_H
 #define AVFCAMERAUTILITY_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qglobal.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qlist.h>
diff --git a/src/plugins/avfoundation/camera/avfcamerawindowcontrol.mm b/src/multimedia/platform/avfoundation/camera/avfcamerawindowcontrol.mm
index 5154d0646..6c457318d 100644
--- a/src/plugins/avfoundation/camera/avfcamerawindowcontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerawindowcontrol.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "avfcamerawindowcontrol.h"
+#include "avfcamerawindowcontrol_p.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <QuartzCore/CATransaction.h>
@@ -259,4 +259,4 @@ void AVFCameraWindowControl::detachNativeLayer()
         [m_captureLayer removeFromSuperlayer];
 }
 
-#include "moc_avfcamerawindowcontrol.cpp"
+#include "moc_avfcamerawindowcontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfcamerawindowcontrol.h b/src/multimedia/platform/avfoundation/camera/avfcamerawindowcontrol_p.h
index d1a950e38..d1a950e38 100644
--- a/src/plugins/avfoundation/camera/avfcamerawindowcontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfcamerawindowcontrol_p.h
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm b/src/multimedia/platform/avfoundation/camera/avfimagecapturecontrol.mm
index 523dff20a..b019cf2ef 100644
--- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfimagecapturecontrol.mm
@@ -37,11 +37,11 @@
 **
 ****************************************************************************/
 
-#include "avfcameradebug.h"
-#include "avfimagecapturecontrol.h"
-#include "avfcameraservice.h"
-#include "avfcamerautility.h"
-#include "avfcameracontrol.h"
+#include "avfcameradebug_p.h"
+#include "avfimagecapturecontrol_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcamerautility_p.h"
+#include "avfcameracontrol_p.h"
 #include <private/qmemoryvideobuffer_p.h>
 
 #include <QtCore/qurl.h>
@@ -275,4 +275,4 @@ void AVFImageCaptureControl::updateCaptureConnection()
     }
 }
 
-#include "moc_avfimagecapturecontrol.cpp"
+#include "moc_avfimagecapturecontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.h b/src/multimedia/platform/avfoundation/camera/avfimagecapturecontrol_p.h
index 7f3fdbd4d..3c781a475 100644
--- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfimagecapturecontrol_p.h
@@ -40,14 +40,25 @@
 #ifndef AVFIMAGECAPTURECONTROL_H
 #define AVFIMAGECAPTURECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #import <AVFoundation/AVFoundation.h>
 
 #include <QtCore/qqueue.h>
 #include <QtCore/qsemaphore.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtMultimedia/qcameraimagecapturecontrol.h>
-#include "avfcamerasession.h"
-#include "avfstoragelocation.h"
+#include "avfcamerasession_p.h"
+#include "avfstoragelocation_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/avfoundation/camera/avfimageencodercontrol.mm b/src/multimedia/platform/avfoundation/camera/avfimageencodercontrol.mm
index 104fb3c52..113fdb62b 100644
--- a/src/plugins/avfoundation/camera/avfimageencodercontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfimageencodercontrol.mm
@@ -37,13 +37,13 @@
 **
 ****************************************************************************/
 
-#include "avfimageencodercontrol.h"
-#include "avfimagecapturecontrol.h"
-#include "avfcamerautility.h"
-#include "avfcamerasession.h"
-#include "avfcameraservice.h"
-#include "avfcameradebug.h"
-#include "avfcameracontrol.h"
+#include "avfimageencodercontrol_p.h"
+#include "avfimagecapturecontrol_p.h"
+#include "avfcamerautility_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcameradebug_p.h"
+#include "avfcameracontrol_p.h"
 
 #include <QtMultimedia/qmediaencodersettings.h>
 
@@ -236,4 +236,4 @@ bool AVFImageEncoderControl::videoCaptureDeviceIsValid() const
 
 QT_END_NAMESPACE
 
-#include "moc_avfimageencodercontrol.cpp"
+#include "moc_avfimageencodercontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfimageencodercontrol.h b/src/multimedia/platform/avfoundation/camera/avfimageencodercontrol_p.h
index 7e2e34294..8c2742d35 100644
--- a/src/plugins/avfoundation/camera/avfimageencodercontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfimageencodercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFIMAGEENCODERCONTROL_H
 #define AVFIMAGEENCODERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/qmediaencodersettings.h>
 #include <QtMultimedia/qimageencodercontrol.h>
 
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm b/src/multimedia/platform/avfoundation/camera/avfmediaassetwriter.mm
index 57c5cb8c5..57c5cb8c5 100644
--- a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfmediaassetwriter.mm
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.h b/src/multimedia/platform/avfoundation/camera/avfmediaassetwriter_p.h
index f063dab4b..61d7d46bc 100644
--- a/src/plugins/avfoundation/camera/avfmediaassetwriter.h
+++ b/src/multimedia/platform/avfoundation/camera/avfmediaassetwriter_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIAASSETWRITER_H
 #define AVFMEDIAASSETWRITER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "avfcamerautility.h"
 
 #include <QtCore/qglobal.h>
diff --git a/src/plugins/avfoundation/camera/avfmediacontainercontrol.mm b/src/multimedia/platform/avfoundation/camera/avfmediacontainercontrol.mm
index 9a36bc632..09049de0b 100644
--- a/src/plugins/avfoundation/camera/avfmediacontainercontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfmediacontainercontrol.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "avfmediacontainercontrol.h"
+#include "avfmediacontainercontrol_p.h"
 
 #include <AVFoundation/AVMediaFormat.h>
 #include <QtCore/qmap.h>
diff --git a/src/plugins/avfoundation/camera/avfmediacontainercontrol.h b/src/multimedia/platform/avfoundation/camera/avfmediacontainercontrol_p.h
index e43e70baf..9450dc16a 100644
--- a/src/plugins/avfoundation/camera/avfmediacontainercontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfmediacontainercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIACONTAINERCONTROL_H
 #define AVFMEDIACONTAINERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediacontainercontrol.h>
 
 @class NSString;
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol.mm
index 7296b7dc1..27f78fea4 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol.mm
@@ -37,15 +37,15 @@
 **
 ****************************************************************************/
 
-#include "avfcameradebug.h"
-#include "avfmediarecordercontrol.h"
-#include "avfcamerasession.h"
-#include "avfcameraservice.h"
-#include "avfcameracontrol.h"
-#include "avfaudioinputselectorcontrol.h"
-#include "avfaudioencodersettingscontrol.h"
-#include "avfvideoencodersettingscontrol.h"
-#include "avfmediacontainercontrol.h"
+#include "avfcameradebug_p.h"
+#include "avfmediarecordercontrol_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcameraservice_p.h"
+#include "avfcameracontrol_p.h"
+#include "avfaudioinputselectorcontrol_p.h"
+#include "avfaudioencodersettingscontrol_p.h"
+#include "avfvideoencodersettingscontrol_p.h"
+#include "avfmediacontainercontrol_p.h"
 
 #include <QtCore/qurl.h>
 #include <QtCore/qfileinfo.h>
@@ -427,4 +427,4 @@ void AVFMediaRecorderControl::setupSessionForCapture()
     updateStatus();
 }
 
-#include "moc_avfmediarecordercontrol.cpp"
+#include "moc_avfmediarecordercontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol_ios.mm
index 33064827d..33064827d 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol_ios.mm
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol_ios_p.h
index 9afb1068d..178c75cad 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h
+++ b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol_ios_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIARECORDERCONTROL_IOS_H
 #define AVFMEDIARECORDERCONTROL_IOS_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "avfmediaassetwriter.h"
 #include "avfstoragelocation.h"
 #include "avfcamerautility.h"
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol.h b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol_p.h
index fbba5eca4..9d8f6566b 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfmediarecordercontrol_p.h
@@ -40,12 +40,23 @@
 #ifndef AVFMEDIARECORDERCONTROL_H
 #define AVFMEDIARECORDERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qurl.h>
 #include <QtMultimedia/qmediarecordercontrol.h>
 
 #import <AVFoundation/AVFoundation.h>
-#include "avfstoragelocation.h"
-#include "avfcamerautility.h"
+#include "avfstoragelocation_p.h"
+#include "avfcamerautility_p.h"
 
 @class AVFMediaRecorderDelegate;
 
diff --git a/src/plugins/avfoundation/camera/avfmediavideoprobecontrol.mm b/src/multimedia/platform/avfoundation/camera/avfmediavideoprobecontrol.mm
index 7621661c3..c97ab1919 100644
--- a/src/plugins/avfoundation/camera/avfmediavideoprobecontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfmediavideoprobecontrol.mm
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "avfmediavideoprobecontrol.h"
+#include "avfmediavideoprobecontrol_p.h"
 #include <qvideoframe.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/avfoundation/camera/avfmediavideoprobecontrol.h b/src/multimedia/platform/avfoundation/camera/avfmediavideoprobecontrol_p.h
index 69a452a97..c18bc4181 100644
--- a/src/plugins/avfoundation/camera/avfmediavideoprobecontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfmediavideoprobecontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIAVIDEOPROBECONTROL_H
 #define AVFMEDIAVIDEOPROBECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediavideoprobecontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/avfoundation/camera/avfstoragelocation.mm b/src/multimedia/platform/avfoundation/camera/avfstoragelocation.mm
index 6a1cdca17..1855f8ec7 100644
--- a/src/plugins/avfoundation/camera/avfstoragelocation.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfstoragelocation.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "avfstoragelocation.h"
+#include "avfstoragelocation_p.h"
 #include "QtCore/qstandardpaths.h"
 
 
diff --git a/src/plugins/avfoundation/camera/avfstoragelocation.h b/src/multimedia/platform/avfoundation/camera/avfstoragelocation_p.h
index 76621983d..8794f0fae 100644
--- a/src/plugins/avfoundation/camera/avfstoragelocation.h
+++ b/src/multimedia/platform/avfoundation/camera/avfstoragelocation_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFSTORAGE_H
 #define AVFSTORAGE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtmultimediaglobal.h"
 
 #include <QtCore/qdir.h>
diff --git a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.mm b/src/multimedia/platform/avfoundation/camera/avfvideoencodersettingscontrol.mm
index 70ec38988..0800e2021 100644
--- a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.mm
+++ b/src/multimedia/platform/avfoundation/camera/avfvideoencodersettingscontrol.mm
@@ -37,12 +37,12 @@
 **
 ****************************************************************************/
 
-#include "avfvideoencodersettingscontrol.h"
+#include "avfvideoencodersettingscontrol_p.h"
 
-#include "avfcameraservice.h"
-#include "avfcamerautility.h"
-#include "avfcamerasession.h"
-#include "avfcamerarenderercontrol.h"
+#include "avfcameraservice_p.h"
+#include "avfcamerautility_p.h"
+#include "avfcamerasession_p.h"
+#include "avfcamerarenderercontrol_p.h"
 
 #include <AVFoundation/AVFoundation.h>
 
@@ -382,4 +382,4 @@ void AVFVideoEncoderSettingsControl::unapplySettings(AVCaptureConnection *connec
 
 QT_END_NAMESPACE
 
-#include "moc_avfvideoencodersettingscontrol.cpp"
+#include "moc_avfvideoencodersettingscontrol_p.cpp"
diff --git a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h b/src/multimedia/platform/avfoundation/camera/avfvideoencodersettingscontrol_p.h
index 7c9574f3d..6d44d4a33 100644
--- a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
+++ b/src/multimedia/platform/avfoundation/camera/avfvideoencodersettingscontrol_p.h
@@ -40,9 +40,20 @@
 #ifndef AVFVIDEOENCODERSETTINGSCONTROL_H
 #define AVFVIDEOENCODERSETTINGSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideoencodersettingscontrol.h>
 
-#include "avfcamerautility.h"
+#include "avfcamerautility_p.h"
 #import <AVFoundation/AVFoundation.h>
 
 @class NSDictionary;
diff --git a/src/multimedia/platform/avfoundation/camera/camera.pri b/src/multimedia/platform/avfoundation/camera/camera.pri
new file mode 100644
index 000000000..430094d14
--- /dev/null
+++ b/src/multimedia/platform/avfoundation/camera/camera.pri
@@ -0,0 +1,60 @@
+HEADERS += \
+    $$PWD/avfcameradebug_p.h \
+    $$PWD/avfcameraserviceplugin_p.h \
+    $$PWD/avfcameracontrol_p.h \
+    $$PWD/avfcamerametadatacontrol_p.h \
+    $$PWD/avfimagecapturecontrol_p.h \
+    $$PWD/avfcameraservice_p.h \
+    $$PWD/avfcamerasession_p.h \
+    $$PWD/avfstoragelocation_p.h \
+    $$PWD/avfaudioinputselectorcontrol_p.h \
+    $$PWD/avfmediavideoprobecontrol_p.h \
+    $$PWD/avfcamerarenderercontrol_p.h \
+    $$PWD/avfcameradevicecontrol_p.h \
+    $$PWD/avfcamerafocuscontrol_p.h \
+    $$PWD/avfcameraexposurecontrol_p.h \
+    $$PWD/avfcamerautility_p.h \
+    $$PWD/avfimageencodercontrol_p.h \
+    $$PWD/avfvideoencodersettingscontrol_p.h \
+    $$PWD/avfmediacontainercontrol_p.h \
+    $$PWD/avfaudioencodersettingscontrol_p.h \
+    $$PWD/avfcamerawindowcontrol_p.h \
+
+SOURCES += \
+    $$PWD/avfcameraserviceplugin.mm \
+    $$PWD/avfcameracontrol.mm \
+    $$PWD/avfcamerametadatacontrol.mm \
+    $$PWD/avfimagecapturecontrol.mm \
+    $$PWD/avfcameraservice.mm \
+    $$PWD/avfcamerasession.mm \
+    $$PWD/avfstoragelocation.mm \
+    $$PWD/avfaudioinputselectorcontrol.mm \
+    $$PWD/avfmediavideoprobecontrol.mm \
+    $$PWD/avfcameradevicecontrol.mm \
+    $$PWD/avfcamerarenderercontrol.mm \
+    $$PWD/avfcamerafocuscontrol.mm \
+    $$PWD/avfcameraexposurecontrol.mm \
+    $$PWD/avfcamerautility.mm \
+    $$PWD/avfimageencodercontrol.mm \
+    $$PWD/avfvideoencodersettingscontrol.mm \
+    $$PWD/avfmediacontainercontrol.mm \
+    $$PWD/avfaudioencodersettingscontrol.mm \
+    $$PWD/avfcamerawindowcontrol.mm \
+
+osx {
+
+HEADERS += $$PWD/avfmediarecordercontrol_p.h
+SOURCES += $$PWD/avfmediarecordercontrol.mm
+
+}
+
+ios {
+
+HEADERS += \
+           $$PWD/avfmediaassetwriter_p.h \
+           $$PWD/avfmediarecordercontrol_ios_p.h
+SOURCES += \
+           $$PWD/avfmediaassetwriter.mm \
+           $$PWD/avfmediarecordercontrol_ios.mm
+
+}
diff --git a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfdisplaylink.mm
index bae18bc0a..64b625f0e 100644
--- a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfdisplaylink.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "avfdisplaylink.h"
+#include "avfdisplaylink_p.h"
 #include <QtCore/qcoreapplication.h>
 
 #ifdef QT_DEBUG_AVF
diff --git a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.h b/src/multimedia/platform/avfoundation/mediaplayer/avfdisplaylink_p.h
index ba0803807..6b95e1e07 100644
--- a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfdisplaylink_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFDISPLAYLINK_H
 #define AVFDISPLAYLINK_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qobject.h>
 #include <QtCore/qmutex.h>
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayercontrol.mm
index bf7ebb4a0..764c1edf8 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayercontrol.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "avfmediaplayercontrol.h"
-#include "avfmediaplayersession.h"
+#include "avfmediaplayercontrol_p.h"
+#include "avfmediaplayersession_p.h"
 
 QT_USE_NAMESPACE
 
@@ -86,7 +86,7 @@ QMediaPlayer::MediaStatus AVFMediaPlayerControl::mediaStatus() const
     return m_session->mediaStatus();
 }
 
-QMediaContent AVFMediaPlayerControl::media() const
+QUrl AVFMediaPlayerControl::media() const
 {
     return m_session->media();
 }
@@ -96,9 +96,9 @@ const QIODevice *AVFMediaPlayerControl::mediaStream() const
     return m_session->mediaStream();
 }
 
-void AVFMediaPlayerControl::setMedia(const QMediaContent &content, QIODevice *stream)
+void AVFMediaPlayerControl::setMedia(const QUrl &content, QIODevice *stream)
 {
-    const QMediaContent oldContent = m_session->media();
+    const QUrl oldContent = m_session->media();
 
     m_session->setMedia(content, stream);
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.h b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayercontrol_p.h
index d9dc4a1b7..50a75427c 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIAPLAYERCONTROL_H
 #define AVFMEDIAPLAYERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/QMediaPlayerControl>
 #include <QtCore/QObject>
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
index b9ec38c0f..5a5780e52 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "avfmediaplayermetadatacontrol.h"
-#include "avfmediaplayersession.h"
+#include "avfmediaplayermetadatacontrol_p.h"
+#include "avfmediaplayersession_p.h"
 
 #include <QtMultimedia/qmediametadata.h>
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol_p.h
index f27573d60..1f8ecf26f 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayermetadatacontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIAPLAYERMETADATACONTROL_H
 #define AVFMEDIAPLAYERMETADATACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/QMetaDataReaderControl>
 #include <QtCore/qvariant.h>
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayerservice.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerservice.mm
index 6b050e7bf..b8d3d4e82 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayerservice.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerservice.mm
@@ -37,18 +37,15 @@
 **
 ****************************************************************************/
 
-#include "avfmediaplayerservice.h"
-#include "avfmediaplayersession.h"
-#include "avfmediaplayercontrol.h"
-#include "avfmediaplayermetadatacontrol.h"
-#include "avfvideooutput.h"
+#include "avfmediaplayerservice_p.h"
+#include "avfmediaplayersession_p.h"
+#include "avfmediaplayercontrol_p.h"
+#include "avfmediaplayermetadatacontrol_p.h"
+#include "avfvideooutput_p.h"
 #if QT_CONFIG(opengl)
-#include "avfvideorenderercontrol.h"
+#include "avfvideorenderercontrol_p.h"
 #endif
-#ifndef QT_NO_WIDGETS
-# include "avfvideowidgetcontrol.h"
-#endif
-#include "avfvideowindowcontrol.h"
+#include "avfvideowindowcontrol_p.h"
 
 #import <AVFoundation/AVFoundation.h>
 
@@ -95,15 +92,6 @@ QObject *AVFMediaPlayerService::requestControl(const char *name)
         return m_videoOutput;
     }
 #endif
-#ifndef QT_NO_WIDGETS
-    if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
-        if (!m_videoOutput)
-            m_videoOutput = new AVFVideoWidgetControl(this);
-
-        m_session->setVideoOutput(qobject_cast<AVFVideoOutput*>(m_videoOutput));
-        return m_videoOutput;
-    }
-#endif
     if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
         if (!m_videoOutput)
             m_videoOutput = new AVFVideoWindowControl(this);
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayerservice.h b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerservice_p.h
index 50a15409f..8d5f63da2 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayerservice.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerservice_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIAPLAYERSERVICE_H
 #define AVFMEDIAPLAYERSERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/QMediaService>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayerserviceplugin.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin.mm
index d91956e69..504909598 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayerserviceplugin.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin.mm
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "avfmediaplayerserviceplugin.h"
+#include "avfmediaplayerserviceplugin_p.h"
 #include <QtCore/QDebug>
 
-#include "avfmediaplayerservice.h"
+#include "avfmediaplayerservice_p.h"
 
 #import <AVFoundation/AVFoundation.h>
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayerserviceplugin.h b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin_p.h
index 07f30d3d6..d6e17c446 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayerserviceplugin.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayerserviceplugin_p.h
@@ -41,6 +41,17 @@
 #ifndef AVFMEDIAPLAYERSERVICEPLUGIN_H
 #define AVFMEDIAPLAYERSERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qglobal.h>
 #include <QtMultimedia/qmediaserviceproviderplugin.h>
 
@@ -52,7 +63,6 @@ class AVFMediaPlayerServicePlugin
 {
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
-    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "avfmediaplayer.json")
 
 public:
     explicit AVFMediaPlayerServicePlugin();
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayersession.mm
index 95121f58a..d6824a3dc 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayersession.mm
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "avfmediaplayersession.h"
-#include "avfmediaplayerservice.h"
-#include "avfvideooutput.h"
+#include "avfmediaplayersession_p.h"
+#include "avfmediaplayerservice_p.h"
+#include "avfvideooutput_p.h"
 
 #include <qpointer.h>
 #include <QFileInfo>
@@ -532,7 +532,7 @@ QMediaPlayer::MediaStatus AVFMediaPlayerSession::mediaStatus() const
     return m_mediaStatus;
 }
 
-QMediaContent AVFMediaPlayerSession::media() const
+QUrl AVFMediaPlayerSession::media() const
 {
     return m_resources;
 }
@@ -554,7 +554,7 @@ static void setStreamURL(void *observer, const QByteArray &url)
     setURL(observer, QByteArrayLiteral("iodevice://") + url, QFileInfo(url).suffix());
 }
 
-void AVFMediaPlayerSession::setMedia(const QMediaContent &content, QIODevice *stream)
+void AVFMediaPlayerSession::setMedia(const QUrl &content, QIODevice *stream)
 {
 #ifdef QT_DEBUG_AVF
     qDebug() << Q_FUNC_INFO << content.request().url();
@@ -574,7 +574,7 @@ void AVFMediaPlayerSession::setMedia(const QMediaContent &content, QIODevice *st
     const QMediaPlayer::MediaStatus oldMediaStatus = m_mediaStatus;
     const QMediaPlayer::State oldState = m_state;
 
-    if (!m_mediaStream && (content.isNull() || content.request().url().isEmpty())) {
+    if (!m_mediaStream && content.isEmpty()) {
         m_mediaStatus = QMediaPlayer::NoMedia;
         if (m_mediaStatus != oldMediaStatus)
             Q_EMIT mediaStatusChanged(m_mediaStatus);
@@ -594,11 +594,11 @@ void AVFMediaPlayerSession::setMedia(const QMediaContent &content, QIODevice *st
         // If there is a data, try to load it,
         // otherwise wait for readyRead.
         if (m_mediaStream->size())
-            setStreamURL(m_observer, m_resources.request().url().toEncoded());
+            setStreamURL(m_observer, m_resources.toEncoded());
     } else {
         //Load AVURLAsset
         //initialize asset using content's URL
-        setURL(m_observer, m_resources.request().url().toEncoded());
+        setURL(m_observer, m_resources.toEncoded());
     }
 
     m_state = QMediaPlayer::StoppedState;
@@ -1043,7 +1043,7 @@ void AVFMediaPlayerSession::processMediaLoadError()
 
 void AVFMediaPlayerSession::streamReady()
 {
-    setStreamURL(m_observer, m_resources.request().url().toEncoded());
+    setStreamURL(m_observer, m_resources.toEncoded());
 }
 
 void AVFMediaPlayerSession::streamDestroyed()
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayersession_p.h
index 6d01162b2..c3728c524 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfmediaplayersession_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFMEDIAPLAYERSESSION_H
 #define AVFMEDIAPLAYERSESSION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
 #include <QtCore/QSet>
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer.mm
index f57b26dff..88c83f1a8 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "avfvideoframerenderer.h"
+#include "avfvideoframerenderer_p.h"
 
 #include <QtMultimedia/qabstractvideosurface.h>
 #include <QtOpenGL/QOpenGLFramebufferObject>
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
index cbaa1aa11..cbaa1aa11 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer_ios.mm
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.h b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer_ios_p.h
index d1de1f511..b69e33ceb 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer_ios.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer_ios_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFVIDEOFRAMERENDERER_H
 #define AVFVIDEOFRAMERENDERER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/QObject>
 #include <QtGui/QImage>
 #include <QtGui/QOpenGLContext>
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.h b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer_p.h
index 2d8a7df81..465c1e563 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideoframerenderer.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideoframerenderer_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFVIDEOFRAMERENDERER_H
 #define AVFVIDEOFRAMERENDERER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/QObject>
 #include <QtGui/QImage>
 #include <QtGui/QOpenGLContext>
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideooutput.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfvideooutput.mm
index 327681f50..ef12f07c1 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideooutput.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideooutput.mm
@@ -37,6 +37,6 @@
 **
 ****************************************************************************/
 
-#include "avfvideooutput.h"
+#include "avfvideooutput_p.h"
 
 QT_USE_NAMESPACE
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideooutput.h b/src/multimedia/platform/avfoundation/mediaplayer/avfvideooutput_p.h
index d3bcfecf7..d1dd94460 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideooutput.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideooutput_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFVIDEOOUTPUT_H
 #define AVFVIDEOOUTPUT_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfvideorenderercontrol.mm
index 6e5b6a15e..4cb467296 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideorenderercontrol.mm
@@ -37,13 +37,13 @@
 **
 ****************************************************************************/
 
-#include "avfvideorenderercontrol.h"
-#include "avfdisplaylink.h"
+#include "avfvideorenderercontrol_p.h"
+#include "avfdisplaylink_p.h"
 
 #if defined(Q_OS_IOS) || defined(Q_OS_TVOS)
-#include "avfvideoframerenderer_ios.h"
+#include "avfvideoframerenderer_ios_p.h"
 #else
-#include "avfvideoframerenderer.h"
+#include "avfvideoframerenderer_p.h"
 #endif
 
 #include <QtMultimedia/qabstractvideobuffer.h>
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.h b/src/multimedia/platform/avfoundation/mediaplayer/avfvideorenderercontrol_p.h
index c1a629944..e46444745 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideorenderercontrol.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideorenderercontrol_p.h
@@ -40,11 +40,22 @@
 #ifndef AVFVIDEORENDERERCONTROL_H
 #define AVFVIDEORENDERERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/QVideoRendererControl>
 #include <QtCore/QMutex>
 #include <QtCore/QSize>
 
-#include "avfvideooutput.h"
+#include "avfvideooutput_p.h"
 
 #import <CoreVideo/CVBase.h>
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.mm b/src/multimedia/platform/avfoundation/mediaplayer/avfvideowindowcontrol.mm
index d61129ec9..85eb82dcb 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.mm
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideowindowcontrol.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "avfvideowindowcontrol.h"
+#include "avfvideowindowcontrol_p.h"
 
 #include <AVFoundation/AVFoundation.h>
 #import <QuartzCore/CATransaction.h>
@@ -252,4 +252,4 @@ void AVFVideoWindowControl::updatePlayerLayerBounds()
     }
 }
 
-#include "moc_avfvideowindowcontrol.cpp"
+#include "moc_avfvideowindowcontrol_p.cpp"
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.h b/src/multimedia/platform/avfoundation/mediaplayer/avfvideowindowcontrol_p.h
index 763656c6c..f4f2fc580 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowindowcontrol.h
+++ b/src/multimedia/platform/avfoundation/mediaplayer/avfvideowindowcontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFVIDEOWINDOWCONTROL_H
 #define AVFVIDEOWINDOWCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QVideoWindowControl>
 
 @class AVPlayerLayer;
@@ -51,7 +62,7 @@ typedef NSView NativeView;
 typedef UIView NativeView;
 #endif
 
-#include "avfvideooutput.h"
+#include "avfvideooutput_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/avfoundation/mediaplayer/mediaplayer.pri b/src/multimedia/platform/avfoundation/mediaplayer/mediaplayer.pri
new file mode 100644
index 000000000..2929ffe50
--- /dev/null
+++ b/src/multimedia/platform/avfoundation/mediaplayer/mediaplayer.pri
@@ -0,0 +1,48 @@
+QT += opengl network
+
+HEADERS += \
+    $$PWD/avfmediaplayercontrol_p.h \
+    $$PWD/avfmediaplayermetadatacontrol_p.h \
+    $$PWD/avfmediaplayerservice_p.h \
+    $$PWD/avfmediaplayersession_p.h \
+    $$PWD/avfmediaplayerserviceplugin_p.h \
+    $$PWD/avfvideooutput_p.h \
+    $$PWD/avfvideowindowcontrol_p.h
+
+SOURCES += \
+    $$PWD/avfmediaplayercontrol.mm \
+    $$PWD/avfmediaplayermetadatacontrol.mm \
+    $$PWD/avfmediaplayerservice.mm \
+    $$PWD/avfmediaplayerserviceplugin.mm \
+    $$PWD/avfmediaplayersession.mm \
+    $$PWD/avfvideooutput.mm \
+    $$PWD/avfvideowindowcontrol.mm
+
+ios|tvos {
+    qtConfig(opengl) {
+        HEADERS += \
+            $$PWD/avfvideoframerenderer_ios_p.h \
+            $$PWD/avfvideorenderercontrol_p.h \
+            $$PWD/avfdisplaylink_p.h
+
+        SOURCES += \
+            $$PWD/avfvideoframerenderer_ios.mm \
+            $$PWD/avfvideorenderercontrol.mm \
+            $$PWD/avfdisplaylink.mm
+    }
+    LIBS += -framework Foundation
+} else {
+    LIBS += -framework AppKit
+
+    qtConfig(opengl) {
+        HEADERS += \
+            $$PWD/avfvideoframerenderer_p.h \
+            $$PWD/avfvideorenderercontrol_p.h \
+            $$PWD/avfdisplaylink_p.h
+
+        SOURCES += \
+            $$PWD/avfvideoframerenderer.mm \
+            $$PWD/avfvideorenderercontrol.mm \
+            $$PWD/avfdisplaylink.mm
+    }
+}
diff --git a/src/multimedia/platform/coreaudio/coreaudio.pri b/src/multimedia/platform/coreaudio/coreaudio.pri
index 538e9b4a9..1ee6cf7c8 100644
--- a/src/multimedia/platform/coreaudio/coreaudio.pri
+++ b/src/multimedia/platform/coreaudio/coreaudio.pri
@@ -1,20 +1,20 @@
 HEADERS += \
-    platform/coreaudio/qcoreaudiodeviceinfo_p.h \
-    platform/coreaudio/qcoreaudioinput_p.h \
-    platform/coreaudio/qcoreaudiooutput_p.h \
-    platform/coreaudio/qcoreaudiointerface_p.h \
-    platform/coreaudio/qcoreaudioutils_p.h
+    $$PWD/qcoreaudiodeviceinfo_p.h \
+    $$PWD/qcoreaudioinput_p.h \
+    $$PWD/qcoreaudiooutput_p.h \
+    $$PWD/qcoreaudiointerface_p.h \
+    $$PWD/qcoreaudioutils_p.h
 
 SOURCES += \
-    platform/coreaudio/qcoreaudiodeviceinfo.mm \
-    platform/coreaudio/qcoreaudioinput.mm \
-    platform/coreaudio/qcoreaudiooutput.mm \
-    platform/coreaudio/qcoreaudiointerface.mm \
-    platform/coreaudio/qcoreaudioutils.mm
+    $$PWD/qcoreaudiodeviceinfo.mm \
+    $$PWD/qcoreaudioinput.mm \
+    $$PWD/qcoreaudiooutput.mm \
+    $$PWD/qcoreaudiointerface.mm \
+    $$PWD/qcoreaudioutils.mm
 
 ios|tvos {
-    HEADERS += platform/coreaudio/qcoreaudiosessionmanager_p.h
-    SOURCES += platform/coreaudio/qcoreaudiosessionmanager.mm
+    HEADERS += $$PWD/qcoreaudiosessionmanager_p.h
+    SOURCES += $$PWD/qcoreaudiosessionmanager.mm
     LIBS += -framework Foundation -framework AVFoundation
 } else {
     LIBS += \
diff --git a/src/multimedia/platform/gstreamer/audio/audio.pri b/src/multimedia/platform/gstreamer/audio/audio.pri
new file mode 100644
index 000000000..9cf3d9e68
--- /dev/null
+++ b/src/multimedia/platform/gstreamer/audio/audio.pri
@@ -0,0 +1,15 @@
+HEADERS += \
+    $$PWD/qaudiointerface_gstreamer_p.h \
+    $$PWD/qaudiodeviceinfo_gstreamer_p.h \
+    $$PWD/qaudiooutput_gstreamer_p.h \
+    $$PWD/qaudioinput_gstreamer_p.h \
+    $$PWD/qaudioengine_gstreamer_p.h \
+    $$PWD/qgstreameraudiodecodercontrol_p.h
+
+SOURCES += \
+    $$PWD/qaudiointerface_gstreamer.cpp \
+    $$PWD/qaudiodeviceinfo_gstreamer.cpp \
+    $$PWD/qaudiooutput_gstreamer.cpp \
+    $$PWD/qaudioinput_gstreamer.cpp \
+    $$PWD/qaudioengine_gstreamer.cpp \
+    $$PWD/qgstreameraudiodecodercontrol.cpp
diff --git a/src/multimedia/platform/gstreamer/qaudiodeviceinfo_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp
index ace067540..ace067540 100644
--- a/src/multimedia/platform/gstreamer/qaudiodeviceinfo_gstreamer.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp
diff --git a/src/multimedia/platform/gstreamer/qaudiodeviceinfo_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h
index 85c7a2c92..85c7a2c92 100644
--- a/src/multimedia/platform/gstreamer/qaudiodeviceinfo_gstreamer_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h
diff --git a/src/multimedia/platform/gstreamer/qaudioengine_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer.cpp
index 1108fa7b5..1108fa7b5 100644
--- a/src/multimedia/platform/gstreamer/qaudioengine_gstreamer.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer.cpp
diff --git a/src/multimedia/platform/gstreamer/qaudioengine_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer_p.h
index e7043c3f8..e7043c3f8 100644
--- a/src/multimedia/platform/gstreamer/qaudioengine_gstreamer_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer_p.h
diff --git a/src/multimedia/platform/gstreamer/qaudioinput_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp
index 60b2a6b83..60b2a6b83 100644
--- a/src/multimedia/platform/gstreamer/qaudioinput_gstreamer.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp
diff --git a/src/multimedia/platform/gstreamer/qaudioinput_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h
index ceff047c0..ceff047c0 100644
--- a/src/multimedia/platform/gstreamer/qaudioinput_gstreamer_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h
diff --git a/src/multimedia/platform/gstreamer/qaudiointerface_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudiointerface_gstreamer.cpp
index b449a989a..b449a989a 100644
--- a/src/multimedia/platform/gstreamer/qaudiointerface_gstreamer.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qaudiointerface_gstreamer.cpp
diff --git a/src/multimedia/platform/gstreamer/qaudiointerface_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qaudiointerface_gstreamer_p.h
index 7a79bd186..7a79bd186 100644
--- a/src/multimedia/platform/gstreamer/qaudiointerface_gstreamer_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qaudiointerface_gstreamer_p.h
diff --git a/src/multimedia/platform/gstreamer/qaudiooutput_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer.cpp
index eaa4c52f2..eaa4c52f2 100644
--- a/src/multimedia/platform/gstreamer/qaudiooutput_gstreamer.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer.cpp
diff --git a/src/multimedia/platform/gstreamer/qaudiooutput_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer_p.h
index 685685b61..685685b61 100644
--- a/src/multimedia/platform/gstreamer/qaudiooutput_gstreamer_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer_p.h
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp
index 439a6b957..73cfe02b5 100644
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 //#define DEBUG_DECODER
 
-#include "qgstreameraudiodecodercontrol.h"
+#include "qgstreameraudiodecodercontrol_p.h"
 #include <private/qgstreamerbushelper_p.h>
 
 #include <private/qgstutils_p.h>
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
index 9e94088a8..6f31ad261 100644
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERAUDIODECODERCONTROL_H
 #define QGSTREAMERAUDIODECODERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <QObject>
 #include <QtCore/qmutex.h>
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabin.pri b/src/multimedia/platform/gstreamer/camerabin/camerabin.pri
new file mode 100644
index 000000000..2cacd56b0
--- /dev/null
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabin.pri
@@ -0,0 +1,51 @@
+
+HEADERS += \
+    $$PWD/camerabinserviceplugin_p.h \
+    $$PWD/camerabinservice_p.h \
+    $$PWD/camerabinsession_p.h \
+    $$PWD/camerabincontrol_p.h \
+    $$PWD/camerabinaudioencoder_p.h \
+    $$PWD/camerabinimageencoder_p.h \
+    $$PWD/camerabinrecorder_p.h \
+    $$PWD/camerabincontainer_p.h \
+    $$PWD/camerabinimagecapture_p.h \
+    $$PWD/camerabinimageprocessing_p.h \
+    $$PWD/camerabinmetadata_p.h \
+    $$PWD/camerabinvideoencoder_p.h \
+
+SOURCES += \
+    $$PWD/camerabinserviceplugin.cpp \
+    $$PWD/camerabinservice.cpp \
+    $$PWD/camerabinsession.cpp \
+    $$PWD/camerabincontrol.cpp \
+    $$PWD/camerabinaudioencoder.cpp \
+    $$PWD/camerabincontainer.cpp \
+    $$PWD/camerabinimagecapture.cpp \
+    $$PWD/camerabinimageencoder.cpp \
+    $$PWD/camerabinimageprocessing.cpp \
+    $$PWD/camerabinmetadata.cpp \
+    $$PWD/camerabinrecorder.cpp \
+    $$PWD/camerabinvideoencoder.cpp \
+
+qtConfig(gstreamer__p.hotography) {
+    HEADERS += \
+        $$PWD/camerabinfocus_p.h \
+        $$PWD/camerabinexposure_p.h \
+
+    SOURCES += \
+        $$PWD/camerabinexposure.cpp \
+        $$PWD/camerabinfocus.cpp \
+
+    QMAKE_USE += gstreamer_photography
+    DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable _p.hotography API
+}
+
+qtConfig(gstreamer_gl): QMAKE_USE += gstreamer_gl
+
+qtConfig(linux_v4l) {
+    HEADERS += \
+        $$PWD/camerabinv4limageprocessing_p.h
+
+    SOURCES += \
+        $$PWD/camerabinv4limageprocessing.cpp
+}
diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder.cpp
index 9a26016de..9a26016de 100644
--- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder_p.h
index b8091c8ca..0c6708449 100644
--- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinaudioencoder_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINAUDIOENCODE_H
 #define CAMERABINAUDIOENCODE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qaudioencodersettingscontrol.h>
 
diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer.cpp
index b19a5524e..b19a5524e 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.h b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer_p.h
index 738e55e2a..c743adf83 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontainer.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontainer_p.h
@@ -41,6 +41,17 @@
 #ifndef CAMERABINMEDIACONTAINERCONTROL_H
 #define CAMERABINMEDIACONTAINERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qmediacontainercontrol.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
index a02e9ab72..a02e9ab72 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.h b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
index 20039bb72..3c1396c82 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontrol.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
@@ -41,6 +41,17 @@
 #ifndef CAMERABINCONTROL_H
 #define CAMERABINCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QHash>
 #include <qbasictimer.h>
 #include <qcameracontrol.h>
diff --git a/src/plugins/gstreamer/camerabin/camerabinexposure.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure.cpp
index 740532d22..740532d22 100644
--- a/src/plugins/gstreamer/camerabin/camerabinexposure.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinexposure.h b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure_p.h
index 24722a632..113187bc8 100644
--- a/src/plugins/gstreamer/camerabin/camerabinexposure.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINEXPOSURECONTROL_H
 #define CAMERABINEXPOSURECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcamera.h>
 #include <qcameraexposurecontrol.h>
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus.cpp
index f795b0f2f..f795b0f2f 100644
--- a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.h b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus_p.h
index 549b913df..4ffef7a3a 100644
--- a/src/plugins/gstreamer/camerabin/camerabinfocus.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINFOCUSCONTROL_H
 #define CAMERABINFOCUSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcamera.h>
 #include <qcamerafocuscontrol.h>
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture.cpp
index 36fb4c205..36fb4c205 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.h b/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture_p.h
index b18495a14..b91987bcd 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture_p.h
@@ -41,6 +41,17 @@
 #ifndef CAMERABINIMAGECAPTURECONTROL_H
 #define CAMERABINIMAGECAPTURECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcameraimagecapturecontrol.h>
 #include "camerabinsession.h"
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinimageencoder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinimageencoder.cpp
index 8c4eaec70..8c4eaec70 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimageencoder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimageencoder.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinimageencoder.h b/src/multimedia/platform/gstreamer/camerabin/camerabinimageencoder_p.h
index 96f7ae7aa..217eb1f22 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimageencoder.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimageencoder_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINIMAGEENCODE_H
 #define CAMERABINIMAGEENCODE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qimageencodercontrol.h>
 
 #include <QtCore/qstringlist.h>
diff --git a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing.cpp
index 3629a1336..3629a1336 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing_p.h
index 51e6f7c82..2c5c41415 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINIMAGEPROCESSINGCONTROL_H
 #define CAMERABINIMAGEPROCESSINGCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qcamera.h>
 #include <qcameraimageprocessingcontrol.h>
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinmetadata.cpp
index e2b12aab1..e2b12aab1 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinmetadata.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.h b/src/multimedia/platform/gstreamer/camerabin/camerabinmetadata_p.h
index acc184af3..b4811b9ba 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinmetadata_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINCAPTUREMETADATACONTROL_H
 #define CAMERABINCAPTUREMETADATACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmetadatawritercontrol.h>
 #include <qmap.h>
 #include <qvariant.h>
diff --git a/src/plugins/gstreamer/camerabin/camerabinrecorder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
index a83971226..a83971226 100644
--- a/src/plugins/gstreamer/camerabin/camerabinrecorder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinrecorder.h b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
index 8bd922fb8..58a5ee725 100644
--- a/src/plugins/gstreamer/camerabin/camerabinrecorder.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
@@ -41,6 +41,17 @@
 #ifndef CAMERABINRECORDERCONTROL_H
 #define CAMERABINRECORDERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qmediarecordercontrol.h>
 #include "camerabinsession.h"
diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinservice.cpp
index 671649bab..9eee847e0 100644
--- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinservice.cpp
@@ -61,9 +61,6 @@
 #include <private/qgstreameraudioinputselector_p.h>
 #include <private/qgstreamervideoinputdevicecontrol_p.h>
 
-#if defined(HAVE_WIDGETS)
-#include <private/qgstreamervideowidget_p.h>
-#endif
 #include <private/qgstreamervideowindow_p.h>
 #include <private/qgstreamervideorenderer_p.h>
 #include <private/qmediaserviceprovider_p.h>
@@ -84,9 +81,6 @@ CameraBinService::CameraBinService(GstElementFactory *sourceFactory, QObject *pa
     m_videoOutput = 0;
     m_videoRenderer = 0;
     m_videoWindow = 0;
-#if defined(HAVE_WIDGETS)
-    m_videoWidgetControl = 0;
-#endif
     m_imageCaptureControl = 0;
 
     m_captureSession = new CameraBinSession(sourceFactory, this);
@@ -108,16 +102,6 @@ CameraBinService::CameraBinService(GstElementFactory *sourceFactory, QObject *pa
         delete m_videoWindow;
         m_videoWindow = 0;
     }
-#if defined(HAVE_WIDGETS)
-    m_videoWidgetControl = new QGstreamerVideoWidgetControl(this);
-
-    // If the GStreamer video sink is not available, don't provide the video widget control since
-    // it won't work anyway. QVideoWidget will fall back to QVideoRendererControl in that case.
-    if (!m_videoWidgetControl->videoSink()) {
-        delete m_videoWidgetControl;
-        m_videoWidgetControl = 0;
-    }
-#endif
 
     m_audioInputSelector = new QGstreamerAudioInputSelector(this);
     connect(m_audioInputSelector, SIGNAL(activeInputChanged(QString)), m_captureSession, SLOT(setCaptureDevice(QString)));
@@ -145,11 +129,6 @@ QObject *CameraBinService::requestControl(const char *name)
         } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
             m_videoOutput = m_videoWindow;
         }
-#if defined(HAVE_WIDGETS)
-        else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
-            m_videoOutput = m_videoWidgetControl;
-        }
-#endif
 
         if (m_videoOutput) {
             m_captureSession->setViewfinder(m_videoOutput);
diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.h b/src/multimedia/platform/gstreamer/camerabin/camerabinservice_p.h
index 0fae02121..24d388759 100644
--- a/src/plugins/gstreamer/camerabin/camerabinservice.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinservice_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINCAPTURESERVICE_H
 #define CAMERABINCAPTURESERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaservice.h>
 
 #include <gst/gst.h>
@@ -55,7 +66,6 @@ class QGstreamerMessage;
 class QGstreamerBusHelper;
 class QGstreamerVideoRenderer;
 class QGstreamerVideoWindow;
-class QGstreamerVideoWidgetControl;
 class QGstreamerElementFactory;
 class CameraBinMetaData;
 class CameraBinImageCapture;
@@ -87,9 +97,6 @@ private:
 
     QObject *m_videoRenderer;
     QGstreamerVideoWindow *m_videoWindow;
-#if defined(HAVE_WIDGETS)
-    QGstreamerVideoWidgetControl *m_videoWidgetControl;
-#endif
     CameraBinImageCapture *m_imageCaptureControl;
 };
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinserviceplugin.cpp
index f8d9b5a37..f8d9b5a37 100644
--- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinserviceplugin.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h b/src/multimedia/platform/gstreamer/camerabin/camerabinserviceplugin_p.h
index 2c1b1a207..00de757bf 100644
--- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinserviceplugin_p.h
@@ -41,6 +41,17 @@
 #ifndef CAMERABINSERVICEPLUGIN_H
 #define CAMERABINSERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaserviceproviderplugin.h>
 #include <private/qgstreamervideoinputdevicecontrol_p.h>
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp
index 3c05156cc..3c05156cc 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/multimedia/platform/gstreamer/camerabin/camerabinsession_p.h
index ccf0cdd4e..faa440dde 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinsession_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINCAPTURESESSION_H
 #define CAMERABINCAPTURESESSION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qmediarecordercontrol.h>
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp
index 963eb8580..963eb8580 100644
--- a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.h b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h
index a38dc78da..d1ca6f0c0 100644
--- a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINV4LIMAGEPROCESSINGCONTROL_H
 #define CAMERABINV4LIMAGEPROCESSINGCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcamera.h>
 #include <qcameraimageprocessingcontrol.h>
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder.cpp
index 5bba2ddb5..5bba2ddb5 100644
--- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder.cpp
diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder_p.h
index 24013ceab..15ab1a08d 100644
--- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinvideoencoder_p.h
@@ -40,6 +40,17 @@
 #ifndef CAMERABINVIDEOENCODE_H
 #define CAMERABINVIDEOENCODE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qvideoencodersettingscontrol.h>
 
diff --git a/src/multimedia/platform/gstreamer/common/common.pri b/src/multimedia/platform/gstreamer/common/common.pri
new file mode 100644
index 000000000..ee1aeeb72
--- /dev/null
+++ b/src/multimedia/platform/gstreamer/common/common.pri
@@ -0,0 +1,41 @@
+HEADERS += \
+    $$PWD/qgstappsrc_p.h \
+    $$PWD/qgstreamerbushelper_p.h \
+    $$PWD/qgstreamermessage_p.h \
+    $$PWD/qgstutils_p.h \
+    $$PWD/qgstvideobuffer_p.h \
+    $$PWD/qgstreamerbufferprobe_p.h \
+    $$PWD/qgstreamervideorendererinterface_p.h \
+    $$PWD/qgstreameraudioinputselector_p.h \
+    $$PWD/qgstreamervideorenderer_p.h \
+    $$PWD/qgstreamervideoinputdevicecontrol_p.h \
+    $$PWD/qgstcodecsinfo_p.h \
+    $$PWD/qgstreamervideoprobecontrol_p.h \
+    $$PWD/qgstreameraudioprobecontrol_p.h \
+    $$PWD/qgstreamervideowindow_p.h \
+    $$PWD/qgstreamervideooverlay_p.h \
+    $$PWD/qgstreamerplayersession_p.h \
+    $$PWD/qgstreamerplayercontrol_p.h \
+    $$PWD/qgstvideorendererplugin_p.h \
+    $$PWD/qgstvideorenderersink_p.h
+
+SOURCES += \
+    $$PWD/qgstappsrc.cpp \
+    $$PWD/qgstreamerbushelper.cpp \
+    $$PWD/qgstreamermessage.cpp \
+    $$PWD/qgstutils.cpp \
+    $$PWD/qgstvideobuffer.cpp \
+    $$PWD/qgstreamerbufferprobe.cpp \
+    $$PWD/qgstreamervideorendererinterface.cpp \
+    $$PWD/qgstreameraudioinputselector.cpp \
+    $$PWD/qgstreamervideorenderer.cpp \
+    $$PWD/qgstreamervideoinputdevicecontrol.cpp \
+    $$PWD/qgstcodecsinfo.cpp \
+    $$PWD/qgstreamervideoprobecontrol.cpp \
+    $$PWD/qgstreameraudioprobecontrol.cpp \
+    $$PWD/qgstreamervideowindow.cpp \
+    $$PWD/qgstreamervideooverlay.cpp \
+    $$PWD/qgstreamerplayersession.cpp \
+    $$PWD/qgstreamerplayercontrol.cpp \
+    $$PWD/qgstvideorendererplugin.cpp \
+    $$PWD/qgstvideorenderersink.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstappsrc.cpp b/src/multimedia/platform/gstreamer/common/qgstappsrc.cpp
index 3c2df339c..3c2df339c 100644
--- a/src/multimedia/platform/gstreamer/qgstappsrc.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstappsrc.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstappsrc_p.h b/src/multimedia/platform/gstreamer/common/qgstappsrc_p.h
index 29603eb98..29603eb98 100644
--- a/src/multimedia/platform/gstreamer/qgstappsrc_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstappsrc_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstcodecsinfo.cpp b/src/multimedia/platform/gstreamer/common/qgstcodecsinfo.cpp
index bbf78124d..bbf78124d 100644
--- a/src/multimedia/platform/gstreamer/qgstcodecsinfo.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstcodecsinfo.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstcodecsinfo_p.h b/src/multimedia/platform/gstreamer/common/qgstcodecsinfo_p.h
index 7f4415e69..7f4415e69 100644
--- a/src/multimedia/platform/gstreamer/qgstcodecsinfo_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstcodecsinfo_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreameraudioinputselector.cpp b/src/multimedia/platform/gstreamer/common/qgstreameraudioinputselector.cpp
index e91a2af73..e91a2af73 100644
--- a/src/multimedia/platform/gstreamer/qgstreameraudioinputselector.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudioinputselector.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreameraudioinputselector_p.h b/src/multimedia/platform/gstreamer/common/qgstreameraudioinputselector_p.h
index 3b258ba3a..3b258ba3a 100644
--- a/src/multimedia/platform/gstreamer/qgstreameraudioinputselector_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudioinputselector_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreameraudioprobecontrol.cpp b/src/multimedia/platform/gstreamer/common/qgstreameraudioprobecontrol.cpp
index 8b0415bde..8b0415bde 100644
--- a/src/multimedia/platform/gstreamer/qgstreameraudioprobecontrol.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudioprobecontrol.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreameraudioprobecontrol_p.h b/src/multimedia/platform/gstreamer/common/qgstreameraudioprobecontrol_p.h
index b641929cd..b641929cd 100644
--- a/src/multimedia/platform/gstreamer/qgstreameraudioprobecontrol_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudioprobecontrol_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamerbufferprobe.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerbufferprobe.cpp
index 230807466..230807466 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerbufferprobe.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerbufferprobe.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamerbufferprobe_p.h b/src/multimedia/platform/gstreamer/common/qgstreamerbufferprobe_p.h
index 5d66f7320..5d66f7320 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerbufferprobe_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerbufferprobe_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamerbushelper.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper.cpp
index 2eb038dfa..2eb038dfa 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerbushelper.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamerbushelper_p.h b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper_p.h
index 01d3ed826..01d3ed826 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerbushelper_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerbushelper_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamermessage.cpp b/src/multimedia/platform/gstreamer/common/qgstreamermessage.cpp
index 7191565e1..7191565e1 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermessage.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamermessage.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamermessage_p.h b/src/multimedia/platform/gstreamer/common/qgstreamermessage_p.h
index d552731d2..d552731d2 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermessage_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamermessage_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamerplayercontrol.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
index be71b81c2..be71b81c2 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerplayercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamerplayercontrol_p.h b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol_p.h
index dbc6e3151..dbc6e3151 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerplayercontrol_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamerplayersession.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession.cpp
index 6cccb721e..6cccb721e 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerplayersession.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamerplayersession_p.h b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession_p.h
index f7d09ed3d..f7d09ed3d 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerplayersession_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayersession_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideoinputdevicecontrol.cpp
index 088b97101..088b97101 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideoinputdevicecontrol.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideoinputdevicecontrol.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideoinputdevicecontrol_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideoinputdevicecontrol_p.h
index 632b6dbb4..632b6dbb4 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideoinputdevicecontrol_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideoinputdevicecontrol_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideooverlay.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay.cpp
index 06e410821..06e410821 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideooverlay.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideooverlay_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h
index 883da8a4d..883da8a4d 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideooverlay_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideooverlay_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideoprobecontrol.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideoprobecontrol.cpp
index 3d587eb2c..3d587eb2c 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideoprobecontrol.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideoprobecontrol.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideoprobecontrol_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideoprobecontrol_p.h
index 0c4b734b2..0c4b734b2 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideoprobecontrol_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideoprobecontrol_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideorenderer.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer.cpp
index c6ca935a4..c6ca935a4 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideorenderer.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideorenderer_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer_p.h
index 10d2c8e2e..10d2c8e2e 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideorenderer_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideorenderer_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideorendererinterface.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface.cpp
index ae7de06f1..ae7de06f1 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideorendererinterface.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideorendererinterface_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface_p.h
index af163c1b5..af163c1b5 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideorendererinterface_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideorendererinterface_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideowindow.cpp b/src/multimedia/platform/gstreamer/common/qgstreamervideowindow.cpp
index e7e3c5044..e7e3c5044 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideowindow.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideowindow.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstreamervideowindow_p.h b/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h
index cae656347..cae656347 100644
--- a/src/multimedia/platform/gstreamer/qgstreamervideowindow_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamervideowindow_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstutils.cpp b/src/multimedia/platform/gstreamer/common/qgstutils.cpp
index 929fbb2d3..929fbb2d3 100644
--- a/src/multimedia/platform/gstreamer/qgstutils.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstutils.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstutils_p.h b/src/multimedia/platform/gstreamer/common/qgstutils_p.h
index 607e543be..607e543be 100644
--- a/src/multimedia/platform/gstreamer/qgstutils_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstutils_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstvideobuffer.cpp b/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp
index 58738ffa0..58738ffa0 100644
--- a/src/multimedia/platform/gstreamer/qgstvideobuffer.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstvideobuffer_p.h b/src/multimedia/platform/gstreamer/common/qgstvideobuffer_p.h
index 11a217f51..11a217f51 100644
--- a/src/multimedia/platform/gstreamer/qgstvideobuffer_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstvideobuffer_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstvideorendererplugin.cpp b/src/multimedia/platform/gstreamer/common/qgstvideorendererplugin.cpp
index 1b63cbfa8..1b63cbfa8 100644
--- a/src/multimedia/platform/gstreamer/qgstvideorendererplugin.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstvideorendererplugin.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstvideorendererplugin_p.h b/src/multimedia/platform/gstreamer/common/qgstvideorendererplugin_p.h
index d6f13062e..d6f13062e 100644
--- a/src/multimedia/platform/gstreamer/qgstvideorendererplugin_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstvideorendererplugin_p.h
diff --git a/src/multimedia/platform/gstreamer/qgstvideorenderersink.cpp b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp
index 0f930cf02..0f930cf02 100644
--- a/src/multimedia/platform/gstreamer/qgstvideorenderersink.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink.cpp
diff --git a/src/multimedia/platform/gstreamer/qgstvideorenderersink_p.h b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink_p.h
index 0b05bbe83..0b05bbe83 100644
--- a/src/multimedia/platform/gstreamer/qgstvideorenderersink_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstvideorenderersink_p.h
diff --git a/src/multimedia/platform/gstreamer/gstreamer.pri b/src/multimedia/platform/gstreamer/gstreamer.pri
index 324e430f5..c393c756d 100644
--- a/src/multimedia/platform/gstreamer/gstreamer.pri
+++ b/src/multimedia/platform/gstreamer/gstreamer.pri
@@ -2,66 +2,24 @@ DEFINES += GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
 
 QMAKE_USE_PRIVATE += gstreamer gstreamer_app
 
-HEADERS += \
-    platform/gstreamer/qaudiointerface_gstreamer_p.h \
-    platform/gstreamer/qaudiodeviceinfo_gstreamer_p.h \
-    platform/gstreamer/qaudiooutput_gstreamer_p.h \
-    platform/gstreamer/qaudioinput_gstreamer_p.h \
-    platform/gstreamer/qaudioengine_gstreamer_p.h \
-    platform/gstreamer/qgstappsrc_p.h \
-    platform/gstreamer/qgstreamerbushelper_p.h \
-    platform/gstreamer/qgstreamermessage_p.h \
-    platform/gstreamer/qgstutils_p.h \
-    platform/gstreamer/qgstvideobuffer_p.h \
-    platform/gstreamer/qgstreamerbufferprobe_p.h \
-    platform/gstreamer/qgstreamervideorendererinterface_p.h \
-    platform/gstreamer/qgstreameraudioinputselector_p.h \
-    platform/gstreamer/qgstreamervideorenderer_p.h \
-    platform/gstreamer/qgstreamervideoinputdevicecontrol_p.h \
-    platform/gstreamer/qgstcodecsinfo_p.h \
-    platform/gstreamer/qgstreamervideoprobecontrol_p.h \
-    platform/gstreamer/qgstreameraudioprobecontrol_p.h \
-    platform/gstreamer/qgstreamervideowindow_p.h \
-    platform/gstreamer/qgstreamervideooverlay_p.h \
-    platform/gstreamer/qgstreamerplayersession_p.h \
-    platform/gstreamer/qgstreamerplayercontrol_p.h \
-    platform/gstreamer/qgstvideorendererplugin_p.h \
-    platform/gstreamer/qgstvideorenderersink_p.h
-
-SOURCES += \
-    platform/gstreamer/qaudiointerface_gstreamer.cpp \
-    platform/gstreamer/qaudiodeviceinfo_gstreamer.cpp \
-    platform/gstreamer/qaudiooutput_gstreamer.cpp \
-    platform/gstreamer/qaudioinput_gstreamer.cpp \
-    platform/gstreamer/qaudioengine_gstreamer.cpp \
-    platform/gstreamer/qgstappsrc.cpp \
-    platform/gstreamer/qgstreamerbushelper.cpp \
-    platform/gstreamer/qgstreamermessage.cpp \
-    platform/gstreamer/qgstutils.cpp \
-    platform/gstreamer/qgstvideobuffer.cpp \
-    platform/gstreamer/qgstreamerbufferprobe.cpp \
-    platform/gstreamer/qgstreamervideorendererinterface.cpp \
-    platform/gstreamer/qgstreameraudioinputselector.cpp \
-    platform/gstreamer/qgstreamervideorenderer.cpp \
-    platform/gstreamer/qgstreamervideoinputdevicecontrol.cpp \
-    platform/gstreamer/qgstcodecsinfo.cpp \
-    platform/gstreamer/qgstreamervideoprobecontrol.cpp \
-    platform/gstreamer/qgstreameraudioprobecontrol.cpp \
-    platform/gstreamer/qgstreamervideowindow.cpp \
-    platform/gstreamer/qgstreamervideooverlay.cpp \
-    platform/gstreamer/qgstreamerplayersession.cpp \
-    platform/gstreamer/qgstreamerplayercontrol.cpp \
-    platform/gstreamer/qgstvideorendererplugin.cpp \
-    platform/gstreamer/qgstvideorenderersink.cpp
+include(audio/audio.pri)
+include(common/common.pri)
+use_camerabin {
+    include(camerabin/camerabin.pri)
+    DEFINES += GST_USE_CAMERABIN
+} else {
+    include(mediacapture/mediacapture.pri)
+}
+include(mediaplayer/mediaplayer.pri)
 
 qtConfig(gstreamer_gl): QMAKE_USE += gstreamer_gl
 
 android {
     LIBS_PRIVATE += \
         -L$$(GSTREAMER_ROOT_ANDROID)/armv7/lib \
-        -Wl,--whole-archive \
+        -Wl,--_p.hole-archive \
         -lgstapp-1.0 -lgstreamer-1.0 -lgstaudio-1.0 -lgsttag-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgstpbutils-1.0 \
         -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lffi -lintl -liconv -lorc-0.4 \
-        -Wl,--no-whole-archive
+        -Wl,--no-_p.hole-archive
 }
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/mediacapture.pri b/src/multimedia/platform/gstreamer/mediacapture/mediacapture.pri
new file mode 100644
index 000000000..f87e95200
--- /dev/null
+++ b/src/multimedia/platform/gstreamer/mediacapture/mediacapture.pri
@@ -0,0 +1,37 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += $$PWD/qgstreamercaptureservice_p.h \
+    $$PWD/qgstreamercapturesession_p.h \
+    $$PWD/qgstreameraudioencode_p.h \
+    $$PWD/qgstreamervideoencode_p.h \
+    $$PWD/qgstreamerrecordercontrol_p.h \
+    $$PWD/qgstreamermediacontainercontrol_p.h \
+    $$PWD/qgstreamercameracontrol_p.h \
+    $$PWD/qgstreamercapturemetadatacontrol_p.h \
+    $$PWD/qgstreamerimagecapturecontrol_p.h \
+    $$PWD/qgstreamerimageencode_p.h \
+    $$PWD/qgstreamercaptureserviceplugin_p.h
+
+SOURCES += $$PWD/qgstreamercaptureservice.cpp \
+    $$PWD/qgstreamercapturesession.cpp \
+    $$PWD/qgstreameraudioencode.cpp \
+    $$PWD/qgstreamervideoencode.cpp \
+    $$PWD/qgstreamerrecordercontrol.cpp \
+    $$PWD/qgstreamermediacontainercontrol.cpp \
+    $$PWD/qgstreamercameracontrol.cpp \
+    $$PWD/qgstreamercapturemetadatacontrol.cpp \
+    $$PWD/qgstreamerimagecapturecontrol.cpp \
+    $$PWD/qgstreamerimageencode.cpp \
+    $$PWD/qgstreamercaptureserviceplugin.cpp
+
+# Camera usage with gstreamer needs to have
+CONFIG += use_gstreamer_camera
+
+use_gstreamer_camera:qtConfig(linux_v4l) {
+    DEFINES += USE_GSTREAMER_CAMERA
+
+    HEADERS += \
+        $$PWD/qgstreamerv4l2input_p.h
+    SOURCES += \
+        $$PWD/qgstreamerv4l2input.cpp
+}
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreameraudioencode.cpp
index 957d8c1d4..08a3a41d0 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreameraudioencode.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qgstreameraudioencode.h"
-#include "qgstreamercapturesession.h"
-#include "qgstreamermediacontainercontrol.h"
+#include "qgstreameraudioencode_p.h"
+#include "qgstreamercapturesession_p.h"
+#include "qgstreamermediacontainercontrol_p.h"
 #include <private/qgstutils_p.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreameraudioencode_p.h
index 0cfbb4e91..f77a6fab9 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreameraudioencode_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERAUDIOENCODE_H
 #define QGSTREAMERAUDIOENCODE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qaudioencodersettingscontrol.h>
 
 #include <QtCore/qstringlist.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
index 5afbdd7cf..277880c35 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qgstreamercameracontrol.h"
-#include "qgstreamerimageencode.h"
+#include "qgstreamercameracontrol_p.h"
+#include "qgstreamerimageencode_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
index dd082c031..fb3b3312d 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
@@ -41,9 +41,20 @@
 #ifndef QGSTREAMERCAMERACONTROL_H
 #define QGSTREAMERCAMERACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QHash>
 #include <qcameracontrol.h>
-#include "qgstreamercapturesession.h"
+#include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
index 6139c57bf..cbabca6ee 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamercapturemetadatacontrol.h"
+#include "qgstreamercapturemetadatacontrol_p.h"
 
 #include <QtMultimedia/qmediametadata.h>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol_p.h
index 33782d1b6..6e2106019 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturemetadatacontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERCAPTUREMETADATACONTROL_H
 #define QGSTREAMERCAPTUREMETADATACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmetadatawritercontrol.h>
 #include <qvariant.h>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp
index b7695852b..16e5badbc 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp
@@ -37,22 +37,22 @@
 **
 ****************************************************************************/
 
-#include "qgstreamercaptureservice.h"
-#include "qgstreamercapturesession.h"
-#include "qgstreamerrecordercontrol.h"
-#include "qgstreamermediacontainercontrol.h"
-#include "qgstreameraudioencode.h"
-#include "qgstreamervideoencode.h"
-#include "qgstreamerimageencode.h"
-#include "qgstreamercameracontrol.h"
+#include "qgstreamercaptureservice_p.h"
+#include "qgstreamercapturesession_p.h"
+#include "qgstreamerrecordercontrol_p.h"
+#include "qgstreamermediacontainercontrol_p.h"
+#include "qgstreameraudioencode_p.h"
+#include "qgstreamervideoencode_p.h"
+#include "qgstreamerimageencode_p.h"
+#include "qgstreamercameracontrol_p.h"
 #include <private/qgstreamerbushelper_p.h>
-#include "qgstreamercapturemetadatacontrol.h"
+#include "qgstreamercapturemetadatacontrol_p.h"
 
 #if defined(USE_GSTREAMER_CAMERA)
-#include "qgstreamerv4l2input.h"
+#include "qgstreamerv4l2input_p.h"
 #endif
 
-#include "qgstreamerimagecapturecontrol.h"
+#include "qgstreamerimagecapturecontrol_p.h"
 #include <private/qgstreameraudioinputselector_p.h>
 #include <private/qgstreamervideoinputdevicecontrol_p.h>
 #include <private/qgstreameraudioprobecontrol_p.h>
@@ -60,10 +60,6 @@
 #include <private/qgstreamervideorenderer_p.h>
 #include <private/qgstreamervideowindow_p.h>
 
-#if defined(HAVE_WIDGETS)
-#include <private/qgstreamervideowidget_p.h>
-#endif
-
 #include <qmediaserviceproviderplugin.h>
 
 QT_BEGIN_NAMESPACE
@@ -81,9 +77,6 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
     , m_videoOutput(0)
     , m_videoRenderer(0)
     , m_videoWindow(0)
-#if defined(HAVE_WIDGETS)
-    , m_videoWidgetControl(0)
-#endif
     , m_imageCaptureControl(0)
     , m_audioProbeControl(0)
 {
@@ -115,16 +108,6 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
             m_videoWindow = 0;
         }
 
-#if defined(HAVE_WIDGETS)
-        m_videoWidgetControl = new QGstreamerVideoWidgetControl(this);
-
-        // If the GStreamer video sink is not available, don't provide the video widget control since
-        // it won't work anyway. QVideoWidget will fall back to QVideoRendererControl in that case.
-        if (!m_videoWidgetControl->videoSink()) {
-            delete m_videoWidgetControl;
-            m_videoWidgetControl = 0;
-        }
-#endif
         m_imageCaptureControl = new QGstreamerImageCaptureControl(m_captureSession);
     }
 #endif
@@ -195,11 +178,6 @@ QObject *QGstreamerCaptureService::requestControl(const char *name)
         } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
             m_videoOutput = m_videoWindow;
         }
-#if defined(HAVE_WIDGETS)
-        else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
-            m_videoOutput = m_videoWidgetControl;
-        }
-#endif
 
         if (m_videoOutput) {
             m_captureSession->setVideoPreview(m_videoOutput);
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
index a2be9c190..fbb8992b6 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERCAPTURESERVICE_H
 #define QGSTREAMERCAPTURESERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaservice.h>
 
 #include <gst/gst.h>
@@ -55,7 +66,6 @@ class QGstreamerMessage;
 class QGstreamerBusHelper;
 class QGstreamerVideoRenderer;
 class QGstreamerVideoWindow;
-class QGstreamerVideoWidgetControl;
 class QGstreamerElementFactory;
 class QGstreamerCaptureMetaDataControl;
 class QGstreamerImageCaptureControl;
@@ -89,9 +99,6 @@ private:
 
     QGstreamerVideoRenderer *m_videoRenderer;
     QGstreamerVideoWindow *m_videoWindow;
-#if defined(HAVE_WIDGETS)
-    QGstreamerVideoWidgetControl *m_videoWidgetControl;
-#endif
     QGstreamerImageCaptureControl *m_imageCaptureControl;
 
     QGstreamerAudioProbeControl *m_audioProbeControl;
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
index 31f6c871c..5adf9c701 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
@@ -42,11 +42,11 @@
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 
-#include "qgstreamercaptureserviceplugin.h"
+#include "qgstreamercaptureserviceplugin_p.h"
 
 //#define QT_SUPPORTEDMIMETYPES_DEBUG
 
-#include "qgstreamercaptureservice.h"
+#include "qgstreamercaptureservice_p.h"
 #include <private/qgstutils_p.h>
 
 QMediaService* QGstreamerCaptureServicePlugin::create(const QString &key)
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin_p.h
index 0acc01257..e0290195a 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureserviceplugin_p.h
@@ -41,6 +41,17 @@
 #ifndef QGSTREAMERCAPTURESERVICEPLUGIN_H
 #define QGSTREAMERCAPTURESERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaserviceproviderplugin.h>
 #include <QtCore/qset.h>
 #include <QtCore/QObject>
@@ -59,11 +70,6 @@ class QGstreamerCaptureServicePlugin
     Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
 #endif
     Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
-#if defined(USE_GSTREAMER_CAMERA)
-    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mediacapturecamera.json")
-#else
-    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mediacapture.json")
-#endif
 public:
     QMediaService* create(const QString &key) override;
     void release(QMediaService *service) override;
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
index 6cc282637..c19120a73 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -37,12 +37,12 @@
 **
 ****************************************************************************/
 
-#include "qgstreamercapturesession.h"
-#include "qgstreamerrecordercontrol.h"
-#include "qgstreamermediacontainercontrol.h"
-#include "qgstreameraudioencode.h"
-#include "qgstreamervideoencode.h"
-#include "qgstreamerimageencode.h"
+#include "qgstreamercapturesession_p.h"
+#include "qgstreamerrecordercontrol_p.h"
+#include "qgstreamermediacontainercontrol_p.h"
+#include "qgstreameraudioencode_p.h"
+#include "qgstreamervideoencode_p.h"
+#include "qgstreamerimageencode_p.h"
 #include <qmediarecorder.h>
 #include <private/qgstreamervideorendererinterface_p.h>
 #include <private/qgstreameraudioprobecontrol_p.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
index 4e54ecc15..3c3e0c82f 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERCAPTURESESSION_H
 #define QGSTREAMERCAPTURESESSION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediarecordercontrol.h>
 #include <qmediarecorder.h>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
index 120c19af6..f89c30110 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamerimagecapturecontrol.h"
+#include "qgstreamerimagecapturecontrol_p.h"
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h
index 75bca0b58..3bdf96f4a 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h
@@ -41,8 +41,19 @@
 #ifndef QGSTREAMERIMAGECAPTURECONTROL_H
 #define QGSTREAMERIMAGECAPTURECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcameraimagecapturecontrol.h>
-#include "qgstreamercapturesession.h"
+#include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimageencode.cpp
index f9e6ce9ef..f64fd235a 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimageencode.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qgstreamerimageencode.h"
-#include "qgstreamercapturesession.h"
+#include "qgstreamerimageencode_p.h"
+#include "qgstreamercapturesession_p.h"
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimageencode_p.h
index f3ebd3e90..eef51eee0 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimageencode_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERIMAGEENCODE_H
 #define QGSTREAMERIMAGEENCODE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qimageencodercontrol.h>
 
 #include <QtCore/qstringlist.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
index 33351476d..6375a2207 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamermediacontainercontrol.h"
+#include "qgstreamermediacontainercontrol_p.h"
 
 #include <private/qgstutils_p.h>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacontainercontrol_p.h
index 02c7346b1..279dbe931 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacontainercontrol_p.h
@@ -41,6 +41,17 @@
 #ifndef QGSTREAMERMEDIACONTAINERCONTROL_H
 #define QGSTREAMERMEDIACONTAINERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediacontainercontrol.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qset.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
index d7f4ec035..4477973f8 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qgstreamerrecordercontrol.h"
-#include "qgstreameraudioencode.h"
-#include "qgstreamervideoencode.h"
-#include "qgstreamermediacontainercontrol.h"
+#include "qgstreamerrecordercontrol_p.h"
+#include "qgstreameraudioencode_p.h"
+#include "qgstreamervideoencode_p.h"
+#include "qgstreamermediacontainercontrol_p.h"
 #include <QtCore/QDebug>
 #include <QtGui/qdesktopservices.h>
 #include <QStandardPaths>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h
index b80716f4c..dfe0299a4 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h
@@ -41,10 +41,21 @@
 #ifndef QGSTREAMERRECORDERCONTROL_H
 #define QGSTREAMERRECORDERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/QDir>
 
 #include <qmediarecordercontrol.h>
-#include "qgstreamercapturesession.h"
+#include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerv4l2input.cpp
index 405437754..473700e64 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerv4l2input.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamerv4l2input.h"
+#include "qgstreamerv4l2input_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerv4l2input_p.h
index a82c7cf4b..f2a3f075a 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerv4l2input_p.h
@@ -41,11 +41,22 @@
 #ifndef QGSTREAMERV4L2INPUT_H
 #define QGSTREAMERV4L2INPUT_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qhash.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qsize.h>
-#include "qgstreamercapturesession.h"
+#include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoencode.cpp
index fefb6edbd..ae46f2422 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoencode.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qgstreamervideoencode.h"
-#include "qgstreamercapturesession.h"
-#include "qgstreamermediacontainercontrol.h"
+#include "qgstreamervideoencode_p.h"
+#include "qgstreamercapturesession_p.h"
+#include "qgstreamermediacontainercontrol_p.h"
 #include <private/qgstutils_p.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoencode_p.h
index a35e2b456..5cc38e25d 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamervideoencode_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERVIDEOENCODE_H
 #define QGSTREAMERVIDEOENCODE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideoencodersettingscontrol.h>
 
 #include <QtCore/qstringlist.h>
diff --git a/src/multimedia/platform/gstreamer/mediaplayer/mediaplayer.pri b/src/multimedia/platform/gstreamer/mediaplayer/mediaplayer.pri
new file mode 100644
index 000000000..0e7502105
--- /dev/null
+++ b/src/multimedia/platform/gstreamer/mediaplayer/mediaplayer.pri
@@ -0,0 +1,13 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/qgstreamerplayerservice_p.h \
+    $$PWD/qgstreamerstreamscontrol_p.h \
+    $$PWD/qgstreamermetadataprovider_p.h \
+    $$PWD/qgstreamerplayerserviceplugin_p.h
+
+SOURCES += \
+    $$PWD/qgstreamerplayerservice.cpp \
+    $$PWD/qgstreamerstreamscontrol.cpp \
+    $$PWD/qgstreamermetadataprovider.cpp \
+    $$PWD/qgstreamerplayerserviceplugin.cpp
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 191878c9a..578bbb8db 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamermetadataprovider.h"
+#include "qgstreamermetadataprovider_p.h"
 #include <private/qgstreamerplayersession_p.h>
 #include <QDebug>
 #include <QtMultimedia/qmediametadata.h>
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamermetadataprovider_p.h
index 6529c3fb1..468ab060b 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamermetadataprovider_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERMETADATAPROVIDER_H
 #define QGSTREAMERMETADATAPROVIDER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmetadatareadercontrol.h>
 #include <qvariant.h>
 
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
index 3033b04e0..0c548c730 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
@@ -41,20 +41,14 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 
-#if defined(HAVE_WIDGETS)
-#include <QtWidgets/qwidget.h>
-#endif
 
-#include "qgstreamerplayerservice.h"
-#include "qgstreamermetadataprovider.h"
+#include "qgstreamerplayerservice_p.h"
+#include "qgstreamermetadataprovider_p.h"
 
-#if defined(HAVE_WIDGETS)
-#include <private/qgstreamervideowidget_p.h>
-#endif
 #include <private/qgstreamervideowindow_p.h>
 #include <private/qgstreamervideorenderer_p.h>
 
-#include "qgstreamerstreamscontrol.h"
+#include "qgstreamerstreamscontrol_p.h"
 #include <private/qgstreameraudioprobecontrol_p.h>
 #include <private/qgstreamervideoprobecontrol_p.h>
 #include <private/qgstreamerplayersession_p.h>
@@ -77,18 +71,6 @@ QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent)
         delete m_videoWindow;
         m_videoWindow = 0;
     }
-
-#if defined(HAVE_WIDGETS)
-    m_videoWidget = new QGstreamerVideoWidgetControl(this);
-
-    // If the GStreamer video sink is not available, don't provide the video widget control since
-    // it won't work anyway.
-    // QVideoWidget will fall back to QVideoRendererControl in that case.
-    if (!m_videoWidget->videoSink()) {
-        delete m_videoWidget;
-        m_videoWidget = 0;
-    }
-#endif
 }
 
 QGstreamerPlayerService::~QGstreamerPlayerService()
@@ -130,10 +112,6 @@ QObject *QGstreamerPlayerService::requestControl(const char *name)
             m_videoOutput = m_videoRenderer;
         else if (qstrcmp(name, QVideoWindowControl_iid) == 0)
             m_videoOutput = m_videoWindow;
-#if defined(HAVE_WIDGETS)
-        else if (qstrcmp(name, QVideoWidgetControl_iid) == 0)
-            m_videoOutput = m_videoWidget;
-#endif
 
         if (m_videoOutput) {
             increaseVideoRef();
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerservice_p.h
index e69eb7c04..12550be16 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerservice_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERPLAYERSERVICE_H
 #define QGSTREAMERPLAYERSERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qobject.h>
 #include <QtCore/qiodevice.h>
 
@@ -55,7 +66,6 @@ class QGstreamerMetaDataProvider;
 class QGstreamerStreamsControl;
 class QGstreamerVideoRenderer;
 class QGstreamerVideoWindow;
-class QGstreamerVideoWidgetControl;
 class QGStreamerAvailabilityControl;
 class QGstreamerAudioProbeControl;
 class QGstreamerVideoProbeControl;
@@ -82,9 +92,6 @@ private:
     QObject *m_videoOutput = nullptr;
     QObject *m_videoRenderer = nullptr;
     QGstreamerVideoWindow *m_videoWindow = nullptr;
-#if defined(HAVE_WIDGETS)
-    QGstreamerVideoWidgetControl *m_videoWidget = nullptr;
-#endif
 
     void increaseVideoRef();
     void decreaseVideoRef();
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp
index 48f23b1f7..4da251014 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp
@@ -43,11 +43,11 @@
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 
-#include "qgstreamerplayerserviceplugin.h"
+#include "qgstreamerplayerserviceplugin_p.h"
 
 //#define QT_SUPPORTEDMIMETYPES_DEBUG
 
-#include "qgstreamerplayerservice.h"
+#include "qgstreamerplayerservice_p.h"
 #include <private/qgstutils_p.h>
 
 QMediaService* QGstreamerPlayerServicePlugin::create(const QString &key)
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin_p.h
index a1f7cc293..8c4e6630c 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerplayerserviceplugin_p.h
@@ -41,6 +41,17 @@
 #ifndef QGSTREAMERPLAYERSERVICEPLUGIN_H
 #define QGSTREAMERPLAYERSERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaserviceproviderplugin.h>
 #include <QtCore/qset.h>
 #include <QtCore/QObject>
@@ -54,7 +65,6 @@ class QGstreamerPlayerServicePlugin
 {
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
-    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mediaplayer.json")
 public:
     QMediaService* create(const QString &key) override;
     void release(QMediaService *service) override;
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
index 4f5c3f0b2..a4a2f46ec 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamerstreamscontrol.h"
+#include "qgstreamerstreamscontrol_p.h"
 #include <private/qgstreamerplayersession_p.h>
 
 QGstreamerStreamsControl::QGstreamerStreamsControl(QGstreamerPlayerSession *session, QObject *parent)
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerstreamscontrol_p.h
index 41932095c..730dcba3a 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
+++ b/src/multimedia/platform/gstreamer/mediaplayer/qgstreamerstreamscontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef QGSTREAMERSTREAMSCONTROL_H
 #define QGSTREAMERSTREAMSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediastreamscontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/opensles/opensles.pri b/src/multimedia/platform/opensles/opensles.pri
index 845c2f680..c8f0eda4f 100644
--- a/src/multimedia/platform/opensles/opensles.pri
+++ b/src/multimedia/platform/opensles/opensles.pri
@@ -1,15 +1,15 @@
 LIBS += -lOpenSLES
 
 HEADERS += \
-    platform/opensles/qopenslesinterface_p.h \
-    platform/opensles/qopenslesengine_p.h \
-    platform/opensles/qopenslesdeviceinfo_p.h \
-    platform/opensles/qopenslesaudioinput_p.h \
-    platform/opensles/qopenslesaudiooutput_p.h
+    $$PWD/qopenslesinterface_p.h \
+    $$PWD/qopenslesengine_p.h \
+    $$PWD/qopenslesdeviceinfo_p.h \
+    $$PWD/qopenslesaudioinput_p.h \
+    $$PWD/qopenslesaudiooutput_p.h
 
 SOURCES += \
-    platform/opensles/qopenslesinterface.cpp \
-    platform/opensles/qopenslesengine.cpp \
-    platform/opensles/qopenslesdeviceinfo.cpp \
-    platform/opensles/qopenslesaudioinput.cpp \
-    platform/opensles/qopenslesaudiooutput.cpp
+    $$PWD/qopenslesinterface.cpp \
+    $$PWD/qopenslesengine.cpp \
+    $$PWD/qopenslesdeviceinfo.cpp \
+    $$PWD/qopenslesaudioinput.cpp \
+    $$PWD/qopenslesaudiooutput.cpp
diff --git a/src/multimedia/platform/platform.pri b/src/multimedia/platform/platform.pri
index 5d2ab45f5..b1c0d5db5 100644
--- a/src/multimedia/platform/platform.pri
+++ b/src/multimedia/platform/platform.pri
@@ -2,8 +2,17 @@ qtConfig(gstreamer):include(gstreamer/gstreamer.pri)
 qtConfig(pulseaudio): include(pulseaudio/pulseaudio.pri)
 qtConfig(alsa): include(alsa/alsa.pri)
 
-android: include(opensles/opensles.pri)
-win32: include(wasapi/wasapi.pri)
-darwin:!watchos: include(coreaudio/coreaudio.pri)
+android {
+    include(android/android.pri)
+    include(opensles/opensles.pri)
+}
+win32 {
+    include(wasapi/wasapi.pri)
+    include(wmf/wmf.pri)
+}
+darwin:!watchos {
+    include(coreaudio/coreaudio.pri)
+    include(avfoundation/avfoundation.pri)
+}
 qnx: include(qnx/qnx.pri)
 
diff --git a/src/multimedia/platform/pulseaudio/pulseaudio.pri b/src/multimedia/platform/pulseaudio/pulseaudio.pri
index c46054579..abf48caaa 100644
--- a/src/multimedia/platform/pulseaudio/pulseaudio.pri
+++ b/src/multimedia/platform/pulseaudio/pulseaudio.pri
@@ -1,15 +1,15 @@
 QMAKE_USE_PRIVATE += pulseaudio
 
-HEADERS += platform/pulseaudio/qaudiointerface_pulse_p.h \
-           platform/pulseaudio/qaudiodeviceinfo_pulse_p.h \
-           platform/pulseaudio/qaudiooutput_pulse_p.h \
-           platform/pulseaudio/qaudioinput_pulse_p.h \
-           platform/pulseaudio/qaudioengine_pulse_p.h \
-           platform/pulseaudio/qpulsehelpers_p.h
+HEADERS += $$PWD/qaudiointerface_pulse_p.h \
+           $$PWD/qaudiodeviceinfo_pulse_p.h \
+           $$PWD/qaudiooutput_pulse_p.h \
+           $$PWD/qaudioinput_pulse_p.h \
+           $$PWD/qaudioengine_pulse_p.h \
+           $$PWD/qpuls_p.helpers_p.h
 
-SOURCES += platform/pulseaudio/qaudiointerface_pulse.cpp \
-           platform/pulseaudio/qaudiodeviceinfo_pulse.cpp \
-           platform/pulseaudio/qaudiooutput_pulse.cpp \
-           platform/pulseaudio/qaudioinput_pulse.cpp \
-           platform/pulseaudio/qaudioengine_pulse.cpp \
-           platform/pulseaudio/qpulsehelpers.cpp
+SOURCES += $$PWD/qaudiointerface_pulse.cpp \
+           $$PWD/qaudiodeviceinfo_pulse.cpp \
+           $$PWD/qaudiooutput_pulse.cpp \
+           $$PWD/qaudioinput_pulse.cpp \
+           $$PWD/qaudioengine_pulse.cpp \
+           $$PWD/qpuls_p.helpers.cpp
diff --git a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraaudioencodersettingscontrol.cpp
index 96686830f..2c0529bc4 100644
--- a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraaudioencodersettingscontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameraaudioencodersettingscontrol.h"
+#include "bbcameraaudioencodersettingscontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h b/src/multimedia/platform/qnx/camera/bbcameraaudioencodersettingscontrol_p.h
index 38c01f86c..cdc384537 100644
--- a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraaudioencodersettingscontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAAUDIOENCODERSETTINGSCONTROL_H
 #define BBCAMERAAUDIOENCODERSETTINGSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qaudioencodersettingscontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameracontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
index d47b31dc9..ba298301e 100644
--- a/src/plugins/qnx/camera/bbcameracontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameracontrol.h"
+#include "bbcameracontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qnx/camera/bbcameracontrol.h b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
index 8401b5b26..7557300cd 100644
--- a/src/plugins/qnx/camera/bbcameracontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERACONTROL_H
 #define BBCAMERACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcameracontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameraexposurecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol.cpp
index c02c50119..6dbde9556 100644
--- a/src/plugins/qnx/camera/bbcameraexposurecontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameraexposurecontrol.h"
+#include "bbcameraexposurecontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 #include <QDebug>
 
diff --git a/src/plugins/qnx/camera/bbcameraexposurecontrol.h b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h
index 33fd9a7d9..56ea61b7f 100644
--- a/src/plugins/qnx/camera/bbcameraexposurecontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAEXPOSURECONTROL_H
 #define BBCAMERAEXPOSURECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcameraexposurecontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcamerafocuscontrol.cpp b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol.cpp
index 8db39a7dd..25f61190c 100644
--- a/src/plugins/qnx/camera/bbcamerafocuscontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcamerafocuscontrol.h"
+#include "bbcamerafocuscontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 #include <QDebug>
 
diff --git a/src/plugins/qnx/camera/bbcamerafocuscontrol.h b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol_p.h
index 1434b778d..e91e032c5 100644
--- a/src/plugins/qnx/camera/bbcamerafocuscontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAFOCUSCONTROL_H
 #define BBCAMERAFOCUSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcamerafocuscontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp
index a2ae3a11d..25f0468ef 100644
--- a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameraimagecapturecontrol.h"
+#include "bbcameraimagecapturecontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h
index 8ecebd4ba..f36145cf6 100644
--- a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAIMAGECAPTURECONTROL_H
 #define BBCAMERAIMAGECAPTURECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcameraimagecapturecontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol.cpp
index 250a85ca0..a5787bd18 100644
--- a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameraimageprocessingcontrol.h"
+#include "bbcameraimageprocessingcontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 #include <QDebug>
 
diff --git a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol_p.h
index 0eefdd2a1..6a174ebad 100644
--- a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAIMAGEPROCESSINGCONTROL_H
 #define BBCAMERAIMAGEPROCESSINGCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcameraimageprocessingcontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
index 3cb9ed38d..e127f5d70 100644
--- a/src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameramediarecordercontrol.h"
+#include "bbcameramediarecordercontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 #include <QDebug>
 #include <QUrl>
diff --git a/src/plugins/qnx/camera/bbcameramediarecordercontrol.h b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
index af46479a5..f1c6a0873 100644
--- a/src/plugins/qnx/camera/bbcameramediarecordercontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAMEDIARECORDERCONTROL_H
 #define BBCAMERAMEDIARECORDERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediarecordercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp b/src/multimedia/platform/qnx/camera/bbcameraorientationhandler.cpp
index d600f3db0..d600f3db0 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraorientationhandler.cpp
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.h b/src/multimedia/platform/qnx/camera/bbcameraorientationhandler_p.h
index af80bd4e1..ace5118ef 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraorientationhandler_p.h
@@ -42,6 +42,17 @@
 #include <QAbstractNativeEventFilter>
 #include <QObject>
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 QT_BEGIN_NAMESPACE
 
 class BbCameraOrientationHandler : public QObject, public QAbstractNativeEventFilter
diff --git a/src/plugins/qnx/camera/bbcameraservice.cpp b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
index cd0a6b13c..860a7f5f4 100644
--- a/src/plugins/qnx/camera/bbcameraservice.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
@@ -36,21 +36,21 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameraservice.h"
+#include "bbcameraservice_p.h"
 
-#include "bbcameraaudioencodersettingscontrol.h"
-#include "bbcameracontrol.h"
-#include "bbcameraexposurecontrol.h"
-#include "bbcamerafocuscontrol.h"
-#include "bbcameraimagecapturecontrol.h"
-#include "bbcameraimageprocessingcontrol.h"
-#include "bbcameramediarecordercontrol.h"
-#include "bbcamerasession.h"
-#include "bbcameravideoencodersettingscontrol.h"
-#include "bbcameraviewfindersettingscontrol.h"
-#include "bbimageencodercontrol.h"
-#include "bbvideodeviceselectorcontrol.h"
-#include "bbvideorenderercontrol.h"
+#include "bbcameraaudioencodersettingscontrol_p.h"
+#include "bbcameracontrol_p.h"
+#include "bbcameraexposurecontrol_p.h"
+#include "bbcamerafocuscontrol_p.h"
+#include "bbcameraimagecapturecontrol_p.h"
+#include "bbcameraimageprocessingcontrol_p.h"
+#include "bbcameramediarecordercontrol_p.h"
+#include "bbcamerasession_p.h"
+#include "bbcameravideoencodersettingscontrol_p.h"
+#include "bbcameraviewfindersettingscontrol_p.h"
+#include "bbimageencodercontrol_p.h"
+#include "bbvideodeviceselectorcontrol_p.h"
+#include "bbvideorenderercontrol_p.h"
 
 #include <QDebug>
 #include <QVariant>
diff --git a/src/plugins/qnx/camera/bbcameraservice.h b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
index 307b47668..6f172d8f5 100644
--- a/src/plugins/qnx/camera/bbcameraservice.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERASERVICE_H
 #define BBCAMERASERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QObject>
 
 #include <qmediaservice.h>
diff --git a/src/plugins/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
index 7b3974084..866a9bb09 100644
--- a/src/plugins/qnx/camera/bbcamerasession.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
@@ -36,11 +36,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
-#include "bbcameraorientationhandler.h"
-#include "bbcameraviewfindersettingscontrol.h"
-#include "windowgrabber.h"
+#include "bbcameraorientationhandler_p.h"
+#include "bbcameraviewfindersettingscontrol_p.h"
+#include "windowgrabber_p.h"
 
 #include <QAbstractVideoSurface>
 #include <QBuffer>
diff --git a/src/plugins/qnx/camera/bbcamerasession.h b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h
index 70523f1e3..e49951141 100644
--- a/src/plugins/qnx/camera/bbcamerasession.h
+++ b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h
@@ -39,7 +39,18 @@
 #ifndef BBCAMERASESSION_H
 #define BBCAMERASESSION_H
 
-#include "bbmediastoragelocation.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "bbmediastoragelocation_p.h"
 
 #include <QCamera>
 #include <QCameraImageCapture>
diff --git a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameravideoencodersettingscontrol.cpp
index 5e3a902c2..d16d7a307 100644
--- a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameravideoencodersettingscontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameravideoencodersettingscontrol.h"
+#include "bbcameravideoencodersettingscontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h b/src/multimedia/platform/qnx/camera/bbcameravideoencodersettingscontrol_p.h
index f67196be1..893b26d5d 100644
--- a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameravideoencodersettingscontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAVIDEOENCODERSETTINGSCONTROL_H
 #define BBCAMERAVIDEOENCODERSETTINGSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideoencodersettingscontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraviewfindersettingscontrol.cpp
index d800ffe13..ada52ab6b 100644
--- a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraviewfindersettingscontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbcameraviewfindersettingscontrol.h"
+#include "bbcameraviewfindersettingscontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 #include <QDebug>
 
diff --git a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h b/src/multimedia/platform/qnx/camera/bbcameraviewfindersettingscontrol_p.h
index 7a8e57a13..a41ff3001 100644
--- a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraviewfindersettingscontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBCAMERAVIEWVINDERSETTINGSCONTROL_H
 #define BBCAMERAVIEWVINDERSETTINGSCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qcameraviewfindersettingscontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbimageencodercontrol.cpp b/src/multimedia/platform/qnx/camera/bbimageencodercontrol.cpp
index cd564a1d4..960accb02 100644
--- a/src/plugins/qnx/camera/bbimageencodercontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbimageencodercontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbimageencodercontrol.h"
+#include "bbimageencodercontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qnx/camera/bbimageencodercontrol.h b/src/multimedia/platform/qnx/camera/bbimageencodercontrol_p.h
index bb246def6..2ace35b4f 100644
--- a/src/plugins/qnx/camera/bbimageencodercontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbimageencodercontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBIMAGEENCODERCONTROL_H
 #define BBIMAGEENCODERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qimageencodercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbmediastoragelocation.cpp b/src/multimedia/platform/qnx/camera/bbmediastoragelocation.cpp
index c3aaed55d..3b8eac160 100644
--- a/src/plugins/qnx/camera/bbmediastoragelocation.cpp
+++ b/src/multimedia/platform/qnx/camera/bbmediastoragelocation.cpp
@@ -36,7 +36,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbmediastoragelocation.h"
+#include "bbmediastoragelocation_p.h"
 
 #include <QStandardPaths>
 
diff --git a/src/plugins/qnx/camera/bbmediastoragelocation.h b/src/multimedia/platform/qnx/camera/bbmediastoragelocation_p.h
index 8a953c27d..3ea1bfbf0 100644
--- a/src/plugins/qnx/camera/bbmediastoragelocation.h
+++ b/src/multimedia/platform/qnx/camera/bbmediastoragelocation_p.h
@@ -39,6 +39,17 @@
 #ifndef BBMEDIASTORAGELOCATION_H
 #define BBMEDIASTORAGELOCATION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QCamera>
 #include <QDir>
 #include <QHash>
diff --git a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.cpp b/src/multimedia/platform/qnx/camera/bbvideodeviceselectorcontrol.cpp
index 791c4af54..61c6d87f8 100644
--- a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbvideodeviceselectorcontrol.cpp
@@ -36,9 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "bbvideodeviceselectorcontrol.h"
+#include "bbvideodeviceselectorcontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 #include <QDebug>
 
diff --git a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h b/src/multimedia/platform/qnx/camera/bbvideodeviceselectorcontrol_p.h
index fdaa7fc0d..36e6b2515 100644
--- a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbvideodeviceselectorcontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBVIDEODEVICESELECTORCONTROL_H
 #define BBVIDEODEVICESELECTORCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideodeviceselectorcontrol.h>
 #include <QStringList>
 
diff --git a/src/plugins/qnx/camera/bbvideorenderercontrol.cpp b/src/multimedia/platform/qnx/camera/bbvideorenderercontrol.cpp
index fd271c9de..58739a1ed 100644
--- a/src/plugins/qnx/camera/bbvideorenderercontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbvideorenderercontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "bbvideorenderercontrol.h"
+#include "bbvideorenderercontrol_p.h"
 
-#include "bbcamerasession.h"
+#include "bbcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qnx/camera/bbvideorenderercontrol.h b/src/multimedia/platform/qnx/camera/bbvideorenderercontrol_p.h
index 441ff369d..95448077b 100644
--- a/src/plugins/qnx/camera/bbvideorenderercontrol.h
+++ b/src/multimedia/platform/qnx/camera/bbvideorenderercontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef BBVIDEORENDERERCONTROL_H
 #define BBVIDEORENDERERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideorenderercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/qnx/camera/camera.pri b/src/multimedia/platform/qnx/camera/camera.pri
new file mode 100644
index 000000000..02cee13d3
--- /dev/null
+++ b/src/multimedia/platform/qnx/camera/camera.pri
@@ -0,0 +1,40 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/bbcameraaudioencodersettingscontrol_p.h \
+    $$PWD/bbcameracontrol_p.h \
+    $$PWD/bbcameraexposurecontrol_p.h \
+    $$PWD/bbcamerafocuscontrol_p.h \
+    $$PWD/bbcameraimagecapturecontrol_p.h \
+    $$PWD/bbcameraimageprocessingcontrol_p.h \
+    $$PWD/bbcameramediarecordercontrol_p.h \
+    $$PWD/bbcameraorientatio_p.handler.h \
+    $$PWD/bbcameraservice_p.h \
+    $$PWD/bbcamerasession_p.h \
+    $$PWD/bbcameravideoencodersettingscontrol_p.h \
+    $$PWD/bbcameraviewfindersettingscontrol_p.h \
+    $$PWD/bbimageencodercontrol_p.h \
+    $$PWD/bbmediastoragelocation_p.h \
+    $$PWD/bbvideodeviceselectorcontrol_p.h \
+    $$PWD/bbvideorenderercontrol_p.h
+
+SOURCES += \
+    $$PWD/bbcameraaudioencodersettingscontrol.cpp \
+    $$PWD/bbcameracontrol.cpp \
+    $$PWD/bbcameraexposurecontrol.cpp \
+    $$PWD/bbcamerafocuscontrol.cpp \
+    $$PWD/bbcameraimagecapturecontrol.cpp \
+    $$PWD/bbcameraimageprocessingcontrol.cpp \
+    $$PWD/bbcameramediarecordercontrol.cpp \
+    $$PWD/bbcameraorientatio_p.handler.cpp \
+    $$PWD/bbcameraservice.cpp \
+    $$PWD/bbcamerasession.cpp \
+    $$PWD/bbcameravideoencodersettingscontrol.cpp \
+    $$PWD/bbcameraviewfindersettingscontrol.cpp \
+    $$PWD/bbimageencodercontrol.cpp \
+    $$PWD/bbmediastoragelocation.cpp \
+    $$PWD/bbvideodeviceselectorcontrol.cpp \
+    $$PWD/bbvideorenderercontrol.cpp
+
+LIBS += -lcamapi -laudio_manager
+
diff --git a/src/plugins/qnx/common/common.pri b/src/multimedia/platform/qnx/common/common.pri
index 1a6693474..dc37a291d 100644
--- a/src/plugins/qnx/common/common.pri
+++ b/src/multimedia/platform/qnx/common/common.pri
@@ -1,7 +1,7 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/windowgrabber.h
+    $$PWD/windowgrabber_p.h
 
 SOURCES += \
     $$PWD/windowgrabber.cpp
diff --git a/src/plugins/qnx/common/windowgrabber.cpp b/src/multimedia/platform/qnx/common/windowgrabber.cpp
index 65037fcce..e4c8c926d 100644
--- a/src/plugins/qnx/common/windowgrabber.cpp
+++ b/src/multimedia/platform/qnx/common/windowgrabber.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "windowgrabber.h"
+#include "windowgrabber_p.h"
 
 #include <QAbstractEventDispatcher>
 #include <QDebug>
diff --git a/src/plugins/qnx/common/windowgrabber.h b/src/multimedia/platform/qnx/common/windowgrabber_p.h
index c4c1f6a53..79a234b2d 100644
--- a/src/plugins/qnx/common/windowgrabber.h
+++ b/src/multimedia/platform/qnx/common/windowgrabber_p.h
@@ -39,6 +39,17 @@
 #ifndef WINDOWGRABBER_H
 #define WINDOWGRABBER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #define EGL_EGLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #include <EGL/egl.h>
diff --git a/src/plugins/qnx/mediaplayer/mediaplayer.pri b/src/multimedia/platform/qnx/mediaplayer/mediaplayer.pri
index 4c4363a91..a44790b7d 100644
--- a/src/plugins/qnx/mediaplayer/mediaplayer.pri
+++ b/src/multimedia/platform/qnx/mediaplayer/mediaplayer.pri
@@ -1,15 +1,15 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/mmrenderermediaplayercontrol.h \
-    $$PWD/mmrenderermediaplayerservice.h \
-    $$PWD/mmrenderermetadata.h \
-    $$PWD/mmrenderermetadatareadercontrol.h \
-    $$PWD/mmrendererplayervideorenderercontrol.h \
-    $$PWD/mmrendererutil.h \
-    $$PWD/mmrenderervideowindowcontrol.h \
-    $$PWD/mmreventmediaplayercontrol.h \
-    $$PWD/mmreventthread.h
+    $$PWD/mmrenderermediaplayercontrol_p.h \
+    $$PWD/mmrenderermediaplayerservice_p.h \
+    $$PWD/mmrenderermetadata_p.h \
+    $$PWD/mmrenderermetadatareadercontrol_p.h \
+    $$PWD/mmrendererplayervideorenderercontrol_p.h \
+    $$PWD/mmrendererutil_p.h \
+    $$PWD/mmrenderervideowindowcontrol_p.h \
+    $$PWD/mmreventmediaplayercontrol_p.h \
+    $$PWD/mmrevent_p.hread.h
 SOURCES += \
     $$PWD/mmrenderermediaplayercontrol.cpp \
     $$PWD/mmrenderermediaplayerservice.cpp \
@@ -19,6 +19,6 @@ SOURCES += \
     $$PWD/mmrendererutil.cpp \
     $$PWD/mmrenderervideowindowcontrol.cpp \
     $$PWD/mmreventmediaplayercontrol.cpp \
-    $$PWD/mmreventthread.cpp
+    $$PWD/mmrevent_p.hread.cpp
 
 QMAKE_USE += mmrenderer
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
index d8b69a2e4..c374d97b2 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
@@ -36,13 +36,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "mmrendereraudiorolecontrol.h"
-#include "mmrenderercustomaudiorolecontrol.h"
-#include "mmrenderermediaplayercontrol.h"
-#include "mmrenderermetadatareadercontrol.h"
-#include "mmrendererplayervideorenderercontrol.h"
-#include "mmrendererutil.h"
-#include "mmrenderervideowindowcontrol.h"
+#include "mmrendereraudiorolecontrol_p.h"
+#include "mmrenderercustomaudiorolecontrol_p.h"
+#include "mmrenderermediaplayercontrol_p.h"
+#include "mmrenderermetadatareadercontrol_p.h"
+#include "mmrendererplayervideorenderercontrol_p.h"
+#include "mmrendererutil_p.h"
+#include "mmrenderervideowindowcontrol_p.h"
 #include <QtCore/qabstracteventdispatcher.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdir.h>
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
index 97f4ed254..d6a75c597 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
@@ -39,7 +39,18 @@
 #ifndef MMRENDERERMEDIAPLAYERCONTROL_H
 #define MMRENDERERMEDIAPLAYERCONTROL_H
 
-#include "mmrenderermetadata.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "mmrenderermetadata_p.h"
 #include <qmediaplayercontrol.h>
 #include <QtCore/qabstractnativeeventfilter.h>
 #include <QtCore/qpointer.h>
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
index 63b8fe916..7ff9d9ea9 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
@@ -36,15 +36,15 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "mmrenderermediaplayerservice.h"
+#include "mmrenderermediaplayerservice_p.h"
 
-#include "mmrenderermediaplayercontrol.h"
-#include "mmrenderermetadatareadercontrol.h"
-#include "mmrendererplayervideorenderercontrol.h"
-#include "mmrendererutil.h"
-#include "mmrenderervideowindowcontrol.h"
+#include "mmrenderermediaplayercontrol_p.h"
+#include "mmrenderermetadatareadercontrol_p.h"
+#include "mmrendererplayervideorenderercontrol_p.h"
+#include "mmrendererutil_p.h"
+#include "mmrenderervideowindowcontrol_p.h"
 
-#include "mmreventmediaplayercontrol.h"
+#include "mmreventmediaplayercontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h
index fea4f0a0a..07c7c000d 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h
@@ -39,6 +39,17 @@
 #ifndef MMRENDERERMEDIAPLAYERSERVICE_H
 #define MMRENDERERMEDIAPLAYERSERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaservice.h>
 #include <QtCore/qpointer.h>
 
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermetadata.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadata.cpp
index a8b92c267..d369ea560 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermetadata.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadata.cpp
@@ -36,7 +36,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "mmrenderermetadata.h"
+#include "mmrenderermetadata_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermetadata.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadata_p.h
index ad2193d29..72b10a110 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermetadata.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadata_p.h
@@ -39,6 +39,17 @@
 #ifndef MMRENDERERMETADATA_H
 #define MMRENDERERMETADATA_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qglobal.h>
 #include <QtCore/QSize>
 #include <QtCore/QString>
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp
index 5367e0c54..76ad98cb3 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp
@@ -36,7 +36,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "mmrenderermetadatareadercontrol.h"
+#include "mmrenderermetadatareadercontrol_p.h"
 #include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadatareadercontrol_p.h
index 878420460..f540f3f93 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermetadatareadercontrol_p.h
@@ -39,7 +39,18 @@
 #ifndef MMRENDERERMETADATAREADERCONTROL_H
 #define MMRENDERERMETADATAREADERCONTROL_H
 
-#include "mmrenderermetadata.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "mmrenderermetadata_p.h"
 #include <qmetadatareadercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp
index 68cb47c3c..d682c40a3 100644
--- a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mmrendererplayervideorenderercontrol.h"
+#include "mmrendererplayervideorenderercontrol_p.h"
 
 #include "windowgrabber.h"
 
diff --git a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.h b/src/multimedia/platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol_p.h
index c547ef534..98a5304f3 100644
--- a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrendererplayervideorenderercontrol_p.h
@@ -39,6 +39,17 @@
 #ifndef MMRENDERERPLAYERVIDEORENDERERCONTROL_H
 #define MMRENDERERPLAYERVIDEORENDERERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QPointer>
 #include <qabstractvideosurface.h>
 #include <qvideorenderercontrol.h>
diff --git a/src/plugins/qnx/mediaplayer/mmrendererutil.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrendererutil.cpp
index d8af4a746..af19f7368 100644
--- a/src/plugins/qnx/mediaplayer/mmrendererutil.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrendererutil.cpp
@@ -36,7 +36,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "mmrendererutil.h"
+#include "mmrendererutil_p.h"
 
 #include <QDebug>
 #include <QDir>
diff --git a/src/plugins/qnx/mediaplayer/mmrendererutil.h b/src/multimedia/platform/qnx/mediaplayer/mmrendererutil_p.h
index ac6f73a7d..9bba99487 100644
--- a/src/plugins/qnx/mediaplayer/mmrendererutil.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrendererutil_p.h
@@ -39,6 +39,17 @@
 #ifndef MMRENDERERUTIL_H
 #define MMRENDERERUTIL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qglobal.h>
 #include <QtMultimedia/qaudio.h>
 
diff --git a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
index fbd698eea..0bc73b621 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
@@ -36,8 +36,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "mmrenderervideowindowcontrol.h"
-#include "mmrendererutil.h"
+#include "mmrenderervideowindowcontrol_p.h"
+#include "mmrendererutil_p.h"
 #include <QtCore/qdebug.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qpa/qplatformnativeinterface.h>
diff --git a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderervideowindowcontrol_p.h
index 8327e259d..d318d99a1 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderervideowindowcontrol_p.h
@@ -39,7 +39,18 @@
 #ifndef MMRENDERERVIDEOWINDOWCONTROL_H
 #define MMRENDERERVIDEOWINDOWCONTROL_H
 
-#include "mmrenderermetadata.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "mmrenderermetadata_p.h"
 #include <qvideowindowcontrol.h>
 #include <screen/screen.h>
 
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp b/src/multimedia/platform/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
index b5c9804ab..f2e2b999b 100644
--- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmreventmediaplayercontrol.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "mmreventmediaplayercontrol.h"
-#include "mmreventthread.h"
-#include "mmrenderervideowindowcontrol.h"
+#include "mmreventmediaplayercontrol_p.h"
+#include "mmreventthread_p.h"
+#include "mmrenderervideowindowcontrol_p.h"
 
 #include <mm/renderer.h>
 #include <tuple>
diff --git a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h b/src/multimedia/platform/qnx/mediaplayer/mmreventmediaplayercontrol_p.h
index e6c138f89..f2cb41561 100644
--- a/src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmreventmediaplayercontrol_p.h
@@ -39,7 +39,18 @@
 #ifndef MMREVENTMEDIAPLAYERCONTROL_H
 #define MMREVENTMEDIAPLAYERCONTROL_H
 
-#include "mmrenderermediaplayercontrol.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "mmrenderermediaplayercontrol_p.h"
 
 #include <mm/renderer/events.h>
 
diff --git a/src/plugins/qnx/mediaplayer/mmreventthread.cpp b/src/multimedia/platform/qnx/mediaplayer/mmreventthread.cpp
index 25f26e216..25f26e216 100644
--- a/src/plugins/qnx/mediaplayer/mmreventthread.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmreventthread.cpp
diff --git a/src/plugins/qnx/mediaplayer/mmreventthread.h b/src/multimedia/platform/qnx/mediaplayer/mmreventthread_p.h
index f7bc5cf5e..946548686 100644
--- a/src/plugins/qnx/mediaplayer/mmreventthread.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmreventthread_p.h
@@ -40,6 +40,17 @@
 #ifndef MMREVENTTHREAD_H
 #define MMREVENTTHREAD_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/QThread>
 
 #include <sys/neutrino.h>
diff --git a/src/plugins/qnx/neutrinoserviceplugin.cpp b/src/multimedia/platform/qnx/neutrinoserviceplugin.cpp
index 25a26d28f..25a26d28f 100644
--- a/src/plugins/qnx/neutrinoserviceplugin.cpp
+++ b/src/multimedia/platform/qnx/neutrinoserviceplugin.cpp
diff --git a/src/plugins/qnx/neutrinoserviceplugin.h b/src/multimedia/platform/qnx/neutrinoserviceplugin_p.h
index 6fd9752ee..7fa4ac5fb 100644
--- a/src/plugins/qnx/neutrinoserviceplugin.h
+++ b/src/multimedia/platform/qnx/neutrinoserviceplugin_p.h
@@ -39,6 +39,17 @@
 #ifndef NEUTRINOSERVICEPLUGIN_H
 #define NEUTRINOSERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaserviceproviderplugin.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/qnx/qnx.pri b/src/multimedia/platform/qnx/qnx.pri
index fa7146940..4fe13620c 100644
--- a/src/multimedia/platform/qnx/qnx.pri
+++ b/src/multimedia/platform/qnx/qnx.pri
@@ -1,13 +1,19 @@
 LIBS += -lasound
 
-HEADERS += platform/qnx/qnxaudiointerface_p.h \
-           platform/qnx/qnxaudiodeviceinfo_p.h \
-           platform/qnx/qnxaudioinput_p.h \
-           platform/qnx/qnxaudiooutput_p.h \
-           platform/qnx/qnxaudioutils_p.h
+HEADERS += $$PWD/qnxaudiointerface_p.h \
+           $$PWD/qnxaudiodeviceinfo_p.h \
+           $$PWD/qnxaudioinput_p.h \
+           $$PWD/qnxaudiooutput_p.h \
+           $$PWD/qnxaudioutils_p.h \
+           $$PWD/neutrinoserviceplugin_p.h
 
-SOURCES += platform/qnx/qnxaudiointerface.cpp \
-           platform/qnx/qnxaudiodeviceinfo.cpp \
-           platform/qnx/qnxaudioinput.cpp \
-           platform/qnx/qnxaudiooutput.cpp \
-           platform/qnx/qnxaudioutils.cpp
+SOURCES += $$PWD/qnxaudiointerface.cpp \
+           $$PWD/qnxaudiodeviceinfo.cpp \
+           $$PWD/qnxaudioinput.cpp \
+           $$PWD/qnxaudiooutput.cpp \
+           $$PWD/qnxaudioutils.cpp \
+           $$PWD/neutrinoserviceplugin.cpp
+
+include(common/common.pri)
+include(mediaplayer/mediaplayer.pri)
+include(camera/camera.pri)
diff --git a/src/multimedia/platform/qnx/qnxaudiodeviceinfo_p.h b/src/multimedia/platform/qnx/qnxaudiodeviceinfo_p.h
index 6f09c9d10..b072af1a2 100644
--- a/src/multimedia/platform/qnx/qnxaudiodeviceinfo_p.h
+++ b/src/multimedia/platform/qnx/qnxaudiodeviceinfo_p.h
@@ -40,6 +40,17 @@
 #ifndef QNXAUDIODEVICEINFO_H
 #define QNXAUDIODEVICEINFO_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qaudiosystem_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/qnx/qnxaudioinput_p.h b/src/multimedia/platform/qnx/qnxaudioinput_p.h
index d0e3ca30b..59087e37b 100644
--- a/src/multimedia/platform/qnx/qnxaudioinput_p.h
+++ b/src/multimedia/platform/qnx/qnxaudioinput_p.h
@@ -40,6 +40,17 @@
 #ifndef QNXAUDIOINPUT_H
 #define QNXAUDIOINPUT_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qaudiosystem_p.h"
 
 #include <QSocketNotifier>
diff --git a/src/multimedia/platform/qnx/qnxaudiointerface_p.h b/src/multimedia/platform/qnx/qnxaudiointerface_p.h
index 8fc50af5f..259bf94a9 100644
--- a/src/multimedia/platform/qnx/qnxaudiointerface_p.h
+++ b/src/multimedia/platform/qnx/qnxaudiointerface_p.h
@@ -40,6 +40,17 @@
 #ifndef QNXAUDIOPLUGIN_H
 #define QNXAUDIOPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <private/qaudiosystem_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/qnx/qnxaudiooutput_p.h b/src/multimedia/platform/qnx/qnxaudiooutput_p.h
index 4fff7ad38..55b5e7be5 100644
--- a/src/multimedia/platform/qnx/qnxaudiooutput_p.h
+++ b/src/multimedia/platform/qnx/qnxaudiooutput_p.h
@@ -40,6 +40,17 @@
 #ifndef QNXAUDIOOUTPUT_H
 #define QNXAUDIOOUTPUT_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qaudiosystem_p.h"
 
 #include <QElapsedTimer>
diff --git a/src/multimedia/platform/qnx/qnxaudioutils_p.h b/src/multimedia/platform/qnx/qnxaudioutils_p.h
index b997e0c45..0696d986e 100644
--- a/src/multimedia/platform/qnx/qnxaudioutils_p.h
+++ b/src/multimedia/platform/qnx/qnxaudioutils_p.h
@@ -40,6 +40,17 @@
 #ifndef QNXAUDIOUTILS_H
 #define QNXAUDIOUTILS_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qaudiosystem_p.h"
 #include <sys/asoundlib.h>
 
diff --git a/src/multimedia/platform/wasapi/wasapi.pri b/src/multimedia/platform/wasapi/wasapi.pri
index 5b7336b1b..eb60edcbb 100644
--- a/src/multimedia/platform/wasapi/wasapi.pri
+++ b/src/multimedia/platform/wasapi/wasapi.pri
@@ -2,16 +2,16 @@
 LIBS += -lstrmiids -lole32 -loleaut32 -lwinmm
 
 HEADERS += \
-    platform/wasapi/qwindowsaudiointerface_p.h \
-    platform/wasapi/qwindowsaudiodeviceinfo_p.h \
-    platform/wasapi/qwindowsaudioinput_p.h \
-    platform/wasapi/qwindowsaudiooutput_p.h \
-    platform/wasapi/qwindowsaudioutils_p.h
+    $$PWD/qwindowsaudiointerface_p.h \
+    $$PWD/qwindowsaudiodeviceinfo_p.h \
+    $$PWD/qwindowsaudioinput_p.h \
+    $$PWD/qwindowsaudiooutput_p.h \
+    $$PWD/qwindowsaudioutils_p.h
 
 SOURCES += \
-    platform/wasapi/qwindowsaudiointerface.cpp \
-    platform/wasapi/qwindowsaudiodeviceinfo.cpp \
-    platform/wasapi/qwindowsaudioinput.cpp \
-    platform/wasapi/qwindowsaudiooutput.cpp \
-    platform/wasapi/qwindowsaudioutils.cpp
+    $$PWD/qwindowsaudiointerface.cpp \
+    $$PWD/qwindowsaudiodeviceinfo.cpp \
+    $$PWD/qwindowsaudioinput.cpp \
+    $$PWD/qwindowsaudiooutput.cpp \
+    $$PWD/qwindowsaudioutils.cpp
 
diff --git a/src/plugins/wmf/decoder/decoder.pri b/src/multimedia/platform/wmf/decoder/decoder.pri
index 7637ac848..93cc683d4 100644
--- a/src/plugins/wmf/decoder/decoder.pri
+++ b/src/multimedia/platform/wmf/decoder/decoder.pri
@@ -4,11 +4,9 @@ LIBS += -lmfreadwrite -lwmcodecdspuuid
 QMAKE_USE += wmf
 
 HEADERS += \
-    $$PWD/mfdecoderservice.h \
-    $$PWD/mfdecodersourcereader.h \
-    $$PWD/mfaudiodecodercontrol.h
+    $$PWD/mfdecodersourcereader_p.h \
+    $$PWD/mfaudiodecodercontrol_p.h
 
 SOURCES += \
-    $$PWD/mfdecoderservice.cpp \
     $$PWD/mfdecodersourcereader.cpp \
     $$PWD/mfaudiodecodercontrol.cpp
diff --git a/src/plugins/wmf/decoder/mfaudiodecodercontrol.cpp b/src/multimedia/platform/wmf/decoder/mfaudiodecodercontrol.cpp
index fcc1743bc..f41e05ed9 100644
--- a/src/plugins/wmf/decoder/mfaudiodecodercontrol.cpp
+++ b/src/multimedia/platform/wmf/decoder/mfaudiodecodercontrol.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "Wmcodecdsp.h"
-#include "mfaudiodecodercontrol.h"
+#include "mfaudiodecodercontrol_p.h"
 
 MFAudioDecoderControl::MFAudioDecoderControl(QObject *parent)
     : QAudioDecoderControl(parent)
diff --git a/src/plugins/wmf/decoder/mfaudiodecodercontrol.h b/src/multimedia/platform/wmf/decoder/mfaudiodecodercontrol_p.h
index cfb8e9091..98a3b9d02 100644
--- a/src/plugins/wmf/decoder/mfaudiodecodercontrol.h
+++ b/src/multimedia/platform/wmf/decoder/mfaudiodecodercontrol_p.h
@@ -40,9 +40,20 @@
 #ifndef MFAUDIODECODERCONTROL_H
 #define MFAUDIODECODERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qaudiodecodercontrol.h"
-#include "mfdecodersourcereader.h"
-#include "sourceresolver.h"
+#include "mfdecodersourcereader_p.h"
+#include "private/sourceresolver_p.h"
 
 QT_USE_NAMESPACE
 
diff --git a/src/plugins/wmf/decoder/mfdecodersourcereader.cpp b/src/multimedia/platform/wmf/decoder/mfdecodersourcereader.cpp
index e907cfaf0..b2b9cf60d 100644
--- a/src/plugins/wmf/decoder/mfdecodersourcereader.cpp
+++ b/src/multimedia/platform/wmf/decoder/mfdecodersourcereader.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mfdecodersourcereader.h"
+#include "mfdecodersourcereader_p.h"
 
 MFDecoderSourceReader::MFDecoderSourceReader(QObject *parent)
     : m_cRef(1)
diff --git a/src/plugins/wmf/decoder/mfdecodersourcereader.h b/src/multimedia/platform/wmf/decoder/mfdecodersourcereader_p.h
index 21c6b5eb3..7d63f5368 100644
--- a/src/plugins/wmf/decoder/mfdecodersourcereader.h
+++ b/src/multimedia/platform/wmf/decoder/mfdecodersourcereader_p.h
@@ -39,6 +39,18 @@
 
 #ifndef MFDECODERSOURCEREADER_H
 #define MFDECODERSOURCEREADER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <mfapi.h>
 #include <mfidl.h>
 #include <Mfreadwrite.h>
diff --git a/src/multimedia/platform/wmf/evr/evr.pri b/src/multimedia/platform/wmf/evr/evr.pri
new file mode 100644
index 000000000..6168063e9
--- /dev/null
+++ b/src/multimedia/platform/wmf/evr/evr.pri
@@ -0,0 +1,20 @@
+INCLUDEPATH += $$PWD
+
+qtHaveModule(widgets): QT += widgets
+QT += gui-private
+
+LIBS += -lmf -lmfplat -lmfuuid -ld3d9 -ldxva2 -lwinmm -levr
+
+HEADERS += \
+    $$PWD/evrvideowindowcontrol_p.h \
+    $$PWD/evrcustompresenter_p.h \
+    $$PWD/evrd3dpresentengine_p.h \
+    $$PWD/evrhelpers_p.h \
+    $$PWD/evrdefs_p.h
+
+SOURCES += \
+    $$PWD/evrvideowindowcontrol.cpp \
+    $$PWD/evrcustompresenter.cpp \
+    $$PWD/evrd3dpresentengine.cpp \
+    $$PWD/evrhelpers.cpp \
+    $$PWD/evrdefs.cpp
diff --git a/src/plugins/common/evr/evrcustompresenter.cpp b/src/multimedia/platform/wmf/evr/evrcustompresenter.cpp
index b2dd0426c..dd6c0021b 100644
--- a/src/plugins/common/evr/evrcustompresenter.cpp
+++ b/src/multimedia/platform/wmf/evr/evrcustompresenter.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "evrcustompresenter.h"
+#include "evrcustompresenter_p.h"
 
-#include "evrd3dpresentengine.h"
-#include "evrhelpers.h"
+#include "evrd3dpresentengine_p.h"
+#include "evrhelpers_p.h"
 
 #include <QtCore/qmutex.h>
 #include <QtCore/qvarlengtharray.h>
diff --git a/src/plugins/common/evr/evrcustompresenter.h b/src/multimedia/platform/wmf/evr/evrcustompresenter_p.h
index c1c21580e..d60bc4d4c 100644
--- a/src/plugins/common/evr/evrcustompresenter.h
+++ b/src/multimedia/platform/wmf/evr/evrcustompresenter_p.h
@@ -40,13 +40,24 @@
 #ifndef EVRCUSTOMPRESENTER_H
 #define EVRCUSTOMPRESENTER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QObject>
 #include <qmutex.h>
 #include <qqueue.h>
 #include <qevent.h>
 #include <qvideosurfaceformat.h>
 
-#include "evrdefs.h"
+#include "evrdefs_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/multimedia/platform/wmf/evr/evrd3dpresentengine.cpp
index 51f8b1a39..8cb6d2593 100644
--- a/src/plugins/common/evr/evrd3dpresentengine.cpp
+++ b/src/multimedia/platform/wmf/evr/evrd3dpresentengine.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "evrd3dpresentengine.h"
+#include "evrd3dpresentengine_p.h"
 
-#include "evrhelpers.h"
+#include "evrhelpers_p.h"
 
 #include <qabstractvideobuffer.h>
 #include <QAbstractVideoSurface>
diff --git a/src/plugins/common/evr/evrd3dpresentengine.h b/src/multimedia/platform/wmf/evr/evrd3dpresentengine_p.h
index eb2def7b2..1e70feadb 100644
--- a/src/plugins/common/evr/evrd3dpresentengine.h
+++ b/src/multimedia/platform/wmf/evr/evrd3dpresentengine_p.h
@@ -40,6 +40,17 @@
 #ifndef EVRD3DPRESENTENGINE_H
 #define EVRD3DPRESENTENGINE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QMutex>
 #include <QVideoSurfaceFormat>
 
diff --git a/src/plugins/common/evr/evrdefs.cpp b/src/multimedia/platform/wmf/evr/evrdefs.cpp
index e143ada0b..94370a14a 100644
--- a/src/plugins/common/evr/evrdefs.cpp
+++ b/src/multimedia/platform/wmf/evr/evrdefs.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "evrdefs.h"
+#include "evrdefs_p.h"
 
 const CLSID clsid_EnhancedVideoRenderer = { 0xfa10746c, 0x9b63, 0x4b6c, {0xbc, 0x49, 0xfc, 0x30, 0xe, 0xa5, 0xf2, 0x56} };
 const GUID mr_VIDEO_RENDER_SERVICE = { 0x1092a86c, 0xab1a, 0x459a, {0xa3, 0x36, 0x83, 0x1f, 0xbc, 0x4d, 0x11, 0xff} };
diff --git a/src/plugins/common/evr/evrdefs.h b/src/multimedia/platform/wmf/evr/evrdefs_p.h
index 4f3dd832a..f9df48387 100644
--- a/src/plugins/common/evr/evrdefs.h
+++ b/src/multimedia/platform/wmf/evr/evrdefs_p.h
@@ -40,6 +40,17 @@
 #ifndef EVRDEFS_H
 #define EVRDEFS_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <d3d9.h>
 #include <evr9.h>
 #include <evr.h>
diff --git a/src/plugins/common/evr/evrhelpers.cpp b/src/multimedia/platform/wmf/evr/evrhelpers.cpp
index a315f1a73..aa2311f46 100644
--- a/src/plugins/common/evr/evrhelpers.cpp
+++ b/src/multimedia/platform/wmf/evr/evrhelpers.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "evrhelpers.h"
+#include "evrhelpers_p.h"
 
 #ifndef D3DFMT_YV12
 #define D3DFMT_YV12 (D3DFORMAT)MAKEFOURCC ('Y', 'V', '1', '2')
diff --git a/src/plugins/common/evr/evrhelpers.h b/src/multimedia/platform/wmf/evr/evrhelpers_p.h
index b5bdf5ead..89bff6288 100644
--- a/src/plugins/common/evr/evrhelpers.h
+++ b/src/multimedia/platform/wmf/evr/evrhelpers_p.h
@@ -40,7 +40,18 @@
 #ifndef EVRHELPERS_H
 #define EVRHELPERS_H
 
-#include "evrdefs.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "evrdefs_p.h"
 #include <qvideoframe.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/common/evr/evrvideowindowcontrol.cpp b/src/multimedia/platform/wmf/evr/evrvideowindowcontrol.cpp
index 95f63c2e7..523dddca8 100644
--- a/src/plugins/common/evr/evrvideowindowcontrol.cpp
+++ b/src/multimedia/platform/wmf/evr/evrvideowindowcontrol.cpp
@@ -37,11 +37,7 @@
 **
 ****************************************************************************/
 
-#include "evrvideowindowcontrol.h"
-
-#ifndef QT_NO_WIDGETS
-#include <qwidget.h>
-#endif
+#include "evrvideowindowcontrol_p.h"
 
 EvrVideoWindowControl::EvrVideoWindowControl(QObject *parent)
     : QVideoWindowControl(parent)
@@ -111,14 +107,6 @@ void EvrVideoWindowControl::setWinId(WId id)
 {
     m_windowId = id;
 
-#ifndef QT_NO_WIDGETS
-    if (QWidget *widget = QWidget::find(m_windowId)) {
-        const QColor color = widget->palette().color(QPalette::Window);
-
-        m_windowColor = RGB(color.red(), color.green(), color.blue());
-    }
-#endif
-
     if (m_displayControl)
         m_displayControl->SetVideoWindow(HWND(m_windowId));
 }
diff --git a/src/plugins/common/evr/evrvideowindowcontrol.h b/src/multimedia/platform/wmf/evr/evrvideowindowcontrol_p.h
index ce3b7746f..059376f7e 100644
--- a/src/plugins/common/evr/evrvideowindowcontrol.h
+++ b/src/multimedia/platform/wmf/evr/evrvideowindowcontrol_p.h
@@ -40,9 +40,20 @@
 #ifndef EVRVIDEOWINDOWCONTROL_H
 #define EVRVIDEOWINDOWCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qvideowindowcontrol.h"
 
-#include "evrdefs.h"
+#include "evrdefs_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/wmf/mfstream.cpp b/src/multimedia/platform/wmf/mfstream.cpp
index a98b5a704..b01dbb7b1 100644
--- a/src/plugins/wmf/mfstream.cpp
+++ b/src/multimedia/platform/wmf/mfstream.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mfstream.h"
+#include "mfstream_p.h"
 #include <QtCore/qcoreapplication.h>
 
 //MFStream is added for supporting QIODevice type of media source.
diff --git a/src/plugins/wmf/mfstream.h b/src/multimedia/platform/wmf/mfstream_p.h
index f98ab42a9..975d02c9d 100644
--- a/src/plugins/wmf/mfstream.h
+++ b/src/multimedia/platform/wmf/mfstream_p.h
@@ -40,6 +40,17 @@
 #ifndef MFSTREAM_H
 #define MFSTREAM_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <mfapi.h>
 #include <mfidl.h>
 #include <QtCore/qmutex.h>
diff --git a/src/plugins/wmf/player/mfactivate.cpp b/src/multimedia/platform/wmf/player/mfactivate.cpp
index e06906584..05d9321be 100644
--- a/src/plugins/wmf/player/mfactivate.cpp
+++ b/src/multimedia/platform/wmf/player/mfactivate.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mfactivate.h"
+#include "mfactivate_p.h"
 
 #include <mfapi.h>
 
diff --git a/src/plugins/wmf/player/mfactivate.h b/src/multimedia/platform/wmf/player/mfactivate_p.h
index 3243296e8..86ef1c438 100644
--- a/src/plugins/wmf/player/mfactivate.h
+++ b/src/multimedia/platform/wmf/player/mfactivate_p.h
@@ -40,6 +40,17 @@
 #ifndef MFACTIVATE_H
 #define MFACTIVATE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <mfidl.h>
 
 class MFAbstractActivate : public IMFActivate
diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp b/src/multimedia/platform/wmf/player/mfaudioendpointcontrol.cpp
index 3b86c52b7..5e1f130cf 100644
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
+++ b/src/multimedia/platform/wmf/player/mfaudioendpointcontrol.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "QtCore/qdebug.h"
-#include "mfaudioendpointcontrol.h"
+#include "mfaudioendpointcontrol_p.h"
 
 #include <mmdeviceapi.h>
 
diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.h b/src/multimedia/platform/wmf/player/mfaudioendpointcontrol_p.h
index a439c31a5..21d404104 100644
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.h
+++ b/src/multimedia/platform/wmf/player/mfaudioendpointcontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef MFAUDIOENDPOINTCONTROL_H
 #define MFAUDIOENDPOINTCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <mfapi.h>
 #include <mfidl.h>
 
diff --git a/src/plugins/wmf/player/mfaudioprobecontrol.cpp b/src/multimedia/platform/wmf/player/mfaudioprobecontrol.cpp
index c703922c8..a371629da 100644
--- a/src/plugins/wmf/player/mfaudioprobecontrol.cpp
+++ b/src/multimedia/platform/wmf/player/mfaudioprobecontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mfaudioprobecontrol.h"
+#include "mfaudioprobecontrol_p.h"
 
 MFAudioProbeControl::MFAudioProbeControl(QObject *parent):
     QMediaAudioProbeControl(parent)
diff --git a/src/plugins/wmf/player/mfaudioprobecontrol.h b/src/multimedia/platform/wmf/player/mfaudioprobecontrol_p.h
index c8a06148f..0ccf151ad 100644
--- a/src/plugins/wmf/player/mfaudioprobecontrol.h
+++ b/src/multimedia/platform/wmf/player/mfaudioprobecontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef MFAUDIOPROBECONTROL_H
 #define MFAUDIOPROBECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediaaudioprobecontrol.h>
 #include <QtCore/qmutex.h>
 #include <qaudiobuffer.h>
diff --git a/src/plugins/wmf/player/mfevrvideowindowcontrol.cpp b/src/multimedia/platform/wmf/player/mfevrvideowindowcontrol.cpp
index 4b3e0f303..24c176c24 100644
--- a/src/plugins/wmf/player/mfevrvideowindowcontrol.cpp
+++ b/src/multimedia/platform/wmf/player/mfevrvideowindowcontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mfevrvideowindowcontrol.h"
+#include "mfevrvideowindowcontrol_p.h"
 
 #include <qdebug.h>
 
diff --git a/src/plugins/wmf/player/mfevrvideowindowcontrol.h b/src/multimedia/platform/wmf/player/mfevrvideowindowcontrol_p.h
index 96634e6d8..c74148431 100644
--- a/src/plugins/wmf/player/mfevrvideowindowcontrol.h
+++ b/src/multimedia/platform/wmf/player/mfevrvideowindowcontrol_p.h
@@ -40,7 +40,18 @@
 #ifndef MFEVRVIDEOWINDOWCONTROL_H
 #define MFEVRVIDEOWINDOWCONTROL_H
 
-#include "evrvideowindowcontrol.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "private/evrvideowindowcontrol_p.h"
 
 QT_USE_NAMESPACE
 
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/multimedia/platform/wmf/player/mfmetadatacontrol.cpp
index 74063f7d1..b7cf771e8 100644
--- a/src/plugins/wmf/player/mfmetadatacontrol.cpp
+++ b/src/multimedia/platform/wmf/player/mfmetadatacontrol.cpp
@@ -41,8 +41,8 @@
 #include <qdatetime.h>
 #include <qimage.h>
 
-#include "mfmetadatacontrol.h"
-#include "mfplayerservice.h"
+#include "mfmetadatacontrol_p.h"
+#include "mfplayerservice_p.h"
 #include "Propkey.h"
 
 //#define DEBUG_MEDIAFOUNDATION
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.h b/src/multimedia/platform/wmf/player/mfmetadatacontrol_p.h
index 7ae06cedb..dcce5bb1d 100644
--- a/src/plugins/wmf/player/mfmetadatacontrol.h
+++ b/src/multimedia/platform/wmf/player/mfmetadatacontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef MFMETADATACONTROL_H
 #define MFMETADATACONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmetadatareadercontrol.h>
 #include "Mfidl.h"
 
diff --git a/src/plugins/wmf/player/mfplayercontrol.cpp b/src/multimedia/platform/wmf/player/mfplayercontrol.cpp
index 818d5c0f7..3bb963417 100644
--- a/src/plugins/wmf/player/mfplayercontrol.cpp
+++ b/src/multimedia/platform/wmf/player/mfplayercontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mfplayercontrol.h"
+#include "mfplayercontrol_p.h"
 #include <qtcore/qdebug.h>
 
 //#define DEBUG_MEDIAFOUNDATION
diff --git a/src/plugins/wmf/player/mfplayercontrol.h b/src/multimedia/platform/wmf/player/mfplayercontrol_p.h
index f74f414da..35695e0db 100644
--- a/src/plugins/wmf/player/mfplayercontrol.h
+++ b/src/multimedia/platform/wmf/player/mfplayercontrol_p.h
@@ -40,12 +40,23 @@
 #ifndef MFPLAYERCONTROL_H
 #define MFPLAYERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "QUrl.h"
 #include "qmediaplayercontrol.h"
 
 #include <QtCore/qcoreevent.h>
 
-#include "mfplayersession.h"
+#include "mfplayersession_p.h"
 
 QT_USE_NAMESPACE
 
diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/multimedia/platform/wmf/player/mfplayerservice.cpp
index fdb124f8e..1fce4f6c3 100644
--- a/src/plugins/wmf/player/mfplayerservice.cpp
+++ b/src/multimedia/platform/wmf/player/mfplayerservice.cpp
@@ -41,15 +41,15 @@
 
 #include <QtCore/qdebug.h>
 
-#include "mfplayercontrol.h"
-#include "mfevrvideowindowcontrol.h"
-#include "mfvideorenderercontrol.h"
-#include "mfaudioendpointcontrol.h"
-#include "mfaudioprobecontrol.h"
-#include "mfvideoprobecontrol.h"
-#include "mfplayerservice.h"
-#include "mfplayersession.h"
-#include "mfmetadatacontrol.h"
+#include "mfplayercontrol_p.h"
+#include "mfevrvideowindowcontrol_p.h"
+#include "mfvideorenderercontrol_p.h"
+#include "mfaudioendpointcontrol_p.h"
+#include "mfaudioprobecontrol_p.h"
+#include "mfvideoprobecontrol_p.h"
+#include "mfplayerservice_p.h"
+#include "mfplayersession_p.h"
+#include "mfmetadatacontrol_p.h"
 
 MFPlayerService::MFPlayerService(QObject *parent)
     : QMediaService(parent)
diff --git a/src/plugins/wmf/player/mfplayerservice.h b/src/multimedia/platform/wmf/player/mfplayerservice_p.h
index 4bcccaf89..50362c381 100644
--- a/src/plugins/wmf/player/mfplayerservice.h
+++ b/src/multimedia/platform/wmf/player/mfplayerservice_p.h
@@ -40,6 +40,17 @@
 #ifndef MFPLAYERSERVICE_H
 #define MFPLAYERSERVICE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <mfapi.h>
 #include <mfidl.h>
 
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/multimedia/platform/wmf/player/mfplayersession.cpp
index 2dec144f3..0d1213c84 100644
--- a/src/plugins/wmf/player/mfplayersession.cpp
+++ b/src/multimedia/platform/wmf/player/mfplayersession.cpp
@@ -37,7 +37,6 @@
 **
 ****************************************************************************/
 
-#include "QUrl.h"
 #include "qmediaplayercontrol.h"
 
 #include <QtCore/qcoreapplication.h>
@@ -48,19 +47,19 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qbuffer.h>
 
-#include "mfplayercontrol.h"
-#include "mfevrvideowindowcontrol.h"
-#include "mfvideorenderercontrol.h"
-#include "mfaudioendpointcontrol.h"
+#include "mfplayercontrol_p.h"
+#include "mfevrvideowindowcontrol_p.h"
+#include "mfvideorenderercontrol_p.h"
+#include "mfaudioendpointcontrol_p.h"
 
-#include "mfplayersession.h"
-#include "mfplayerservice.h"
-#include "mfmetadatacontrol.h"
+#include "mfplayersession_p.h"
+#include "mfplayerservice_p.h"
+#include "mfmetadatacontrol_p.h"
 #include <mferror.h>
 #include <nserror.h>
-#include "sourceresolver.h"
-#include "samplegrabber.h"
-#include "mftvideo.h"
+#include "private/sourceresolver_p.h"
+#include "samplegrabber_p.h"
+#include "mftvideo_p.h"
 #include <wmcodecdsp.h>
 
 //#define DEBUG_MEDIAFOUNDATION
@@ -191,13 +190,12 @@ MFPlayerSession::~MFPlayerSession()
 }
 
 
-void MFPlayerSession::load(const QUrl &media, QIODevice *stream)
+void MFPlayerSession::load(const QUrl &url, QIODevice *stream)
 {
 #ifdef DEBUG_MEDIAFOUNDATION
     qDebug() << "load";
 #endif
     clear();
-    QUrl url = media.request().url();
 
     if (m_status == QMediaPlayer::LoadingMedia && m_sourceResolver)
         m_sourceResolver->cancel();
diff --git a/src/plugins/wmf/player/mfplayersession.h b/src/multimedia/platform/wmf/player/mfplayersession_p.h
index 946207130..92f645017 100644
--- a/src/plugins/wmf/player/mfplayersession.h
+++ b/src/multimedia/platform/wmf/player/mfplayersession_p.h
@@ -40,6 +40,17 @@
 #ifndef MFPLAYERSESSION_H
 #define MFPLAYERSESSION_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <mfapi.h>
 #include <mfidl.h>
 
diff --git a/src/plugins/wmf/player/mftvideo.cpp b/src/multimedia/platform/wmf/player/mftvideo.cpp
index 9dce654f2..b2ff27f80 100644
--- a/src/plugins/wmf/player/mftvideo.cpp
+++ b/src/multimedia/platform/wmf/player/mftvideo.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "mftvideo.h"
-#include "mfvideoprobecontrol.h"
+#include "mftvideo_p.h"
+#include "mfvideoprobecontrol_p.h"
 #include <private/qmemoryvideobuffer_p.h>
 #include <mferror.h>
 #include <strmif.h>
diff --git a/src/plugins/wmf/player/mftvideo.h b/src/multimedia/platform/wmf/player/mftvideo_p.h
index ffcb80b32..e08f0977f 100644
--- a/src/plugins/wmf/player/mftvideo.h
+++ b/src/multimedia/platform/wmf/player/mftvideo_p.h
@@ -40,6 +40,17 @@
 #ifndef MFTRANSFORM_H
 #define MFTRANSFORM_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <mfapi.h>
 #include <mfidl.h>
 #include <QtCore/qlist.h>
diff --git a/src/plugins/wmf/player/mfvideoprobecontrol.cpp b/src/multimedia/platform/wmf/player/mfvideoprobecontrol.cpp
index 13d9a1bfe..e4d1a8b23 100644
--- a/src/plugins/wmf/player/mfvideoprobecontrol.cpp
+++ b/src/multimedia/platform/wmf/player/mfvideoprobecontrol.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "mfvideoprobecontrol.h"
+#include "mfvideoprobecontrol_p.h"
 
 MFVideoProbeControl::MFVideoProbeControl(QObject *parent)
     : QMediaVideoProbeControl(parent)
diff --git a/src/plugins/wmf/player/mfvideoprobecontrol.h b/src/multimedia/platform/wmf/player/mfvideoprobecontrol_p.h
index 2b238725a..a7f79ef92 100644
--- a/src/plugins/wmf/player/mfvideoprobecontrol.h
+++ b/src/multimedia/platform/wmf/player/mfvideoprobecontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef MFVIDEOPROBECONTROL_H
 #define MFVIDEOPROBECONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qmediavideoprobecontrol.h>
 #include <QtCore/qmutex.h>
 #include <qvideoframe.h>
diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.cpp b/src/multimedia/platform/wmf/player/mfvideorenderercontrol.cpp
index 212533009..2acde7e4c 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.cpp
+++ b/src/multimedia/platform/wmf/player/mfvideorenderercontrol.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "mfvideorenderercontrol.h"
-#include "mfactivate.h"
+#include "mfvideorenderercontrol_p.h"
+#include "mfactivate_p.h"
 
-#include "evrcustompresenter.h"
+#include "evrcustompresenter_p.h"
 
 #include <qabstractvideosurface.h>
 #include <qvideosurfaceformat.h>
@@ -2420,5 +2420,5 @@ void EVRCustomPresenterActivate::setSurface(QAbstractVideoSurface *surface)
         m_presenter->setSurface(surface);
 }
 
-#include "moc_mfvideorenderercontrol.cpp"
+#include "moc_mfvideorenderercontrol_p.cpp"
 #include "mfvideorenderercontrol.moc"
diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.h b/src/multimedia/platform/wmf/player/mfvideorenderercontrol_p.h
index da9e97ba9..dd8a6a278 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.h
+++ b/src/multimedia/platform/wmf/player/mfvideorenderercontrol_p.h
@@ -40,6 +40,17 @@
 #ifndef MFVIDEORENDERERCONTROL_H
 #define MFVIDEORENDERERCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qvideorenderercontrol.h"
 #include <mfapi.h>
 #include <mfidl.h>
diff --git a/src/plugins/wmf/player/player.pri b/src/multimedia/platform/wmf/player/player.pri
index af2f7458b..3263b84ba 100644
--- a/src/plugins/wmf/player/player.pri
+++ b/src/multimedia/platform/wmf/player/player.pri
@@ -4,18 +4,18 @@ LIBS += -lgdi32 -luser32
 QMAKE_USE += wmf
 
 HEADERS += \
-    $$PWD/mfplayerservice.h \
-    $$PWD/mfplayersession.h \
-    $$PWD/mfplayercontrol.h \
-    $$PWD/mfvideorenderercontrol.h \
-    $$PWD/mfaudioendpointcontrol.h \
-    $$PWD/mfmetadatacontrol.h \
-    $$PWD/mfaudioprobecontrol.h \
-    $$PWD/mfvideoprobecontrol.h \
-    $$PWD/mfevrvideowindowcontrol.h \
-    $$PWD/samplegrabber.h \
-    $$PWD/mftvideo.h \
-    $$PWD/mfactivate.h
+    $$PWD/mfplayerservice_p.h \
+    $$PWD/mfplayersession_p.h \
+    $$PWD/mfplayercontrol_p.h \
+    $$PWD/mfvideorenderercontrol_p.h \
+    $$PWD/mfaudioendpointcontrol_p.h \
+    $$PWD/mfmetadatacontrol_p.h \
+    $$PWD/mfaudioprobecontrol_p.h \
+    $$PWD/mfvideoprobecontrol_p.h \
+    $$PWD/mfevrvideowindowcontrol_p.h \
+    $$PWD/samplegrabber_p.h \
+    $$PWD/mftvideo_p.h \
+    $$PWD/mfactivate_p.h
 
 SOURCES += \
     $$PWD/mfplayerservice.cpp \
@@ -30,5 +30,3 @@ SOURCES += \
     $$PWD/samplegrabber.cpp \
     $$PWD/mftvideo.cpp \
     $$PWD/mfactivate.cpp
-
-include($$PWD/../../common/evr.pri)
diff --git a/src/plugins/wmf/player/samplegrabber.cpp b/src/multimedia/platform/wmf/player/samplegrabber.cpp
index d137335f3..6c14dc152 100644
--- a/src/plugins/wmf/player/samplegrabber.cpp
+++ b/src/multimedia/platform/wmf/player/samplegrabber.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "samplegrabber.h"
-#include "mfaudioprobecontrol.h"
+#include "samplegrabber_p.h"
+#include "mfaudioprobecontrol_p.h"
 
 STDMETHODIMP SampleGrabberCallback::QueryInterface(REFIID riid, void** ppv)
 {
diff --git a/src/plugins/wmf/player/samplegrabber.h b/src/multimedia/platform/wmf/player/samplegrabber_p.h
index 9ca673a1b..74eb62065 100644
--- a/src/plugins/wmf/player/samplegrabber.h
+++ b/src/multimedia/platform/wmf/player/samplegrabber_p.h
@@ -40,6 +40,17 @@
 #ifndef SAMPLEGRABBER_H
 #define SAMPLEGRABBER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qmutex.h>
 #include <QtCore/qlist.h>
 #include <QtMultimedia/qaudioformat.h>
diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/multimedia/platform/wmf/sourceresolver.cpp
index 15ef6f0ab..93af15a74 100644
--- a/src/plugins/wmf/sourceresolver.cpp
+++ b/src/multimedia/platform/wmf/sourceresolver.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "mfstream.h"
-#include "sourceresolver.h"
+#include "mfstream_p.h"
+#include "sourceresolver_p.h"
 #include <mferror.h>
 #include <nserror.h>
 #include <QtCore/qfile.h>
diff --git a/src/plugins/wmf/sourceresolver.h b/src/multimedia/platform/wmf/sourceresolver_p.h
index 007552cb0..07da1d8bd 100644
--- a/src/plugins/wmf/sourceresolver.h
+++ b/src/multimedia/platform/wmf/sourceresolver_p.h
@@ -40,7 +40,18 @@
 #ifndef SOURCERESOLVER_H
 #define SOURCERESOLVER_H
 
-#include "mfstream.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "mfstream_p.h"
 #include <QUrl>
 
 class SourceResolver: public QObject, public IMFAsyncCallback
diff --git a/src/multimedia/platform/wmf/wmf.pri b/src/multimedia/platform/wmf/wmf.pri
new file mode 100644
index 000000000..81d63c3bf
--- /dev/null
+++ b/src/multimedia/platform/wmf/wmf.pri
@@ -0,0 +1,21 @@
+QT += network
+
+win32:!qtHaveModule(opengl) {
+    LIBS_PRIVATE += -lgdi32 -luser32
+}
+
+INCLUDEPATH += .
+
+HEADERS += \
+    $$PWD/wmfserviceplugin_p.h \
+    $$PWD/mfstream_p.h \
+    $$PWD/sourceresolver_p.h
+
+SOURCES += \
+    $$PWD/wmfserviceplugin.cpp \
+    $$PWD/mfstream.cpp \
+    $$PWD/sourceresolver.cpp
+
+include (evr/evr.pri)
+include (player/player.pri)
+include (decoder/decoder.pri)
diff --git a/src/plugins/wmf/wmfserviceplugin.cpp b/src/multimedia/platform/wmf/wmfserviceplugin.cpp
index 09cade82f..0eb20e482 100644
--- a/src/plugins/wmf/wmfserviceplugin.cpp
+++ b/src/multimedia/platform/wmf/wmfserviceplugin.cpp
@@ -41,9 +41,8 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/QFile>
 
-#include "wmfserviceplugin.h"
-#include "mfplayerservice.h"
-#include "mfdecoderservice.h"
+#include "wmfserviceplugin_p.h"
+#include "mfplayerservice_p.h"
 
 #include <mfapi.h>
 
@@ -77,10 +76,6 @@ QMediaService* WMFServicePlugin::create(QString const& key)
         return new MFPlayerService;
     }
 
-    if (key == QLatin1String(Q_MEDIASERVICE_AUDIODECODER)) {
-        addRefCount();
-        return new MFAudioDecoderService;
-    }
     //qDebug() << "unsupported key:" << key;
     return 0;
 }
diff --git a/src/plugins/wmf/wmfserviceplugin.h b/src/multimedia/platform/wmf/wmfserviceplugin_p.h
index a9a722043..ef769b22a 100644
--- a/src/plugins/wmf/wmfserviceplugin.h
+++ b/src/multimedia/platform/wmf/wmfserviceplugin_p.h
@@ -40,6 +40,17 @@
 #ifndef WMFSERVICEPLUGIN_H
 #define WMFSERVICEPLUGIN_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include "qmediaserviceproviderplugin.h"
 
@@ -57,8 +68,6 @@ public:
     QMediaService* create(QString const& key);
     void release(QMediaService *service);
 
-    QMediaServiceFeaturesInterface::Features supportedFeatures(const QByteArray &service) const;
-
     QByteArray defaultDevice(const QByteArray &service) const;
     QList<QByteArray> devices(const QByteArray &service) const;
     QString deviceDescription(const QByteArray &service, const QByteArray &device);
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index f729e3876..72690da50 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include <qtmultimediaglobal_p.h>
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qmap.h>
 
@@ -47,15 +49,58 @@
 #include "qmediaplayer.h"
 #include "qvideodeviceselectorcontrol.h"
 
+#if QT_CONFIG(gstreamer)
+#include <private/qgstreamerplayerserviceplugin_p.h>
+#include <private/qgstreamercaptureserviceplugin_p.h>
+#elif defined(Q_OS_WIN)
+#include <private/mfplayerservice_p.h>
+#elif defined(Q_OS_DARWIN)
+#include <private/avfcameraserviceplugin_p.h>
+#include <private/avfmediaplayerserviceplugin_p.h>
+#elif defined(Q_OS_ANDROID)
+#include <private/qandroidmediaserviceplugin_p.h>
+#elif defined(Q_OS_QNX)
+#include <private/neutrinoserviceplugin_p.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QMediaServiceProviderFactoryInterface::~QMediaServiceProviderFactoryInterface()
 {
 }
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, loader,
-        (QMediaServiceProviderFactoryInterface_iid, QLatin1String("mediaservice"), Qt::CaseInsensitive))
+class Loader
+{
+#define GET_PLUGIN(Key, Class) \
+    if (key.toUtf8() == Key) { \
+        static QObject *instance = nullptr; \
+        if (!instance) \
+            instance = new Class; \
+        return instance; \
+    }
+
+public:
+    QObject *instance(const QString &key) {
+#if QT_CONFIG(gstreamer)
+        GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, QGstreamerPlayerServicePlugin)
+        GET_PLUGIN(Q_MEDIASERVICE_CAMERA, QGstreamerCaptureServicePlugin)
+        GET_PLUGIN(Q_MEDIASERVICE_AUDIOSOURCE, QGstreamerCaptureServicePlugin)
+#elif defined(Q_OS_WIN)
+        GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, MFPlayerService)
+#elif defined(Q_OS_DARWIN)
+        GET_PLUGIN(Q_MEDIASERVICE_CAMERA, AVFServicePlugin)
+        GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, AVFMediaPlayerServicePlugin)
+#elif defined(Q_OS_ANDROID)
+        GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, QAndroidMediaServicePlugin)
+        GET_PLUGIN(Q_MEDIASERVICE_CAMERA, QAndroidMediaServicePlugin)
+#elif defined(Q_OS_QNX)
+        GET_PLUGIN(Q_MEDIASERVICE_MEDIAPLAYER, NeutrinoServicePlugin)
+#endif
+        return nullptr;
+    }
+};
 
+Q_GLOBAL_STATIC(Loader, loader);
 
 class QPluginServiceProvider : public QMediaServiceProvider
 {
diff --git a/src/multimediawidgets/.prev_CMakeLists.txt b/src/multimediawidgets/.prev_CMakeLists.txt
new file mode 100644
index 000000000..167e80ef8
--- /dev/null
+++ b/src/multimediawidgets/.prev_CMakeLists.txt
@@ -0,0 +1,51 @@
+# Generated from multimediawidgets.pro.
+
+#####################################################################
+## MultimediaWidgets Module:
+#####################################################################
+
+qt_add_module(MultimediaWidgets
+    SOURCES
+        qpaintervideosurface.cpp qpaintervideosurface_p.h
+        qtmultimediawidgetdefs.h
+        qvideowidget.cpp qvideowidget.h qvideowidget_p.h
+        qvideowidgetcontrol.cpp qvideowidgetcontrol.h
+    LIBRARIES
+        Qt::MultimediaPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Multimedia
+        Qt::Widgets
+    PRIVATE_MODULE_INTERFACE
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(MultimediaWidgets CONDITION TARGET Qt::OpenGL
+    LIBRARIES
+        Qt::OpenGL
+    PUBLIC_LIBRARIES
+        Qt::OpenGLWidgets
+)
+
+qt_extend_target(MultimediaWidgets CONDITION QT_FEATURE_graphicsview
+    SOURCES
+        qgraphicsvideoitem.cpp qgraphicsvideoitem.h
+)
+
+qt_extend_target(MultimediaWidgets CONDITION QT_FEATURE_gstreamer
+    SOURCES
+        platform/gstreamer/qgstreamervideowidget.cpp platform/gstreamer/qgstreamervideowidget_p.h
+    LIBRARIES
+        gstreamer
+)
+
+qt_extend_target(MultimediaWidgets CONDITION QT_FEATURE_avfoundation
+    SOURCES
+        platform/avfoundation/avfvideowidget.mm platform/avfoundation/avfvideowidget_p.h
+        platform/avfoundation/avfvideowidgetcontrol.mm platform/avfoundation/avfvideowidgetcontrol_p.h
+)
diff --git a/src/multimediawidgets/CMakeLists.txt b/src/multimediawidgets/CMakeLists.txt
index 7b159d659..d4aab4219 100644
--- a/src/multimediawidgets/CMakeLists.txt
+++ b/src/multimediawidgets/CMakeLists.txt
@@ -35,7 +35,7 @@ qt_extend_target(MultimediaWidgets CONDITION TARGET Qt::OpenGL
 
 qt_extend_target(MultimediaWidgets CONDITION QT_FEATURE_graphicsview
     SOURCES
-        qgraphicsvideoitem.cpp qgraphicsvideoitem.h # special case
+        qgraphicsvideoitem.cpp qgraphicsvideoitem.h
 )
 
 qt_extend_target(MultimediaWidgets CONDITION QT_FEATURE_gstreamer
@@ -43,10 +43,8 @@ qt_extend_target(MultimediaWidgets CONDITION QT_FEATURE_gstreamer
         gstreamer/qgstreamervideowidget.cpp gstreamer/qgstreamervideowidget_p.h
 )
 
-#### Keys ignored in scope 3:.:.:multimediawidgets.pro:QT_FEATURE_graphicsview:
-# PUBLIC_HEADERS = "qgraphicsvideoitem.h"
-
-qt_extend_target(MultimediaWidgets CONDITION MSVC AND (QMAKE_MSC_VER LESS 1900)
-    COMPILE_OPTIONS
-        -Zm200
+qt_extend_target(MultimediaWidgets CONDITION QT_FEATURE_avfoundation
+    SOURCES
+        platform/avfoundation/avfvideowidget.mm platform/avfoundation/avfvideowidget_p.h
+        platform/avfoundation/avfvideowidgetcontrol.mm platform/avfoundation/avfvideowidgetcontrol_p.h
 )
diff --git a/src/multimediawidgets/gstreamer/gstreamer.pri b/src/multimediawidgets/gstreamer/gstreamer.pri
deleted file mode 100644
index dc332c249..000000000
--- a/src/multimediawidgets/gstreamer/gstreamer.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-QMAKE_USE_PRIVATE += gstreamer
-
-SOURCES += gstreamer/qgstreamervideowidget.cpp
-HEADERS += gstreamer/qgstreamervideowidget_p.h
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index b8204ef07..59b1f22ce 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -7,11 +7,9 @@ qtHaveModule(opengl) {
     QT_PRIVATE += opengl
 }
 
-PRIVATE_HEADERS += \
+HEADERS += \
     qvideowidget_p.h \
     qpaintervideosurface_p.h \
-
-PUBLIC_HEADERS += \
     qtmultimediawidgetdefs.h \
     qvideowidgetcontrol.h \
     qvideowidget.h
@@ -22,14 +20,10 @@ SOURCES += \
     qvideowidget.cpp
 
 qtConfig(graphicsview) {
-    SOURCES        += qgraphicsvideoitem.cpp
-    PUBLIC_HEADERS += qgraphicsvideoitem.h
+    SOURCES += qgraphicsvideoitem.cpp
+    HEADERS += qgraphicsvideoitem.h
 }
 
-qtConfig(gstreamer):include(gstreamer/gstreamer.pri)
-
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
-
-msvc:lessThan(QMAKE_MSC_VER, 1900): QMAKE_CXXFLAGS += -Zm200
+include(platform/platform.pri)
 
 load(qt_module)
diff --git a/src/multimediawidgets/platform/avfoundation/avfoundation.pri b/src/multimediawidgets/platform/avfoundation/avfoundation.pri
new file mode 100644
index 000000000..21bbe36c2
--- /dev/null
+++ b/src/multimediawidgets/platform/avfoundation/avfoundation.pri
@@ -0,0 +1,15 @@
+HEADERS += \
+    $$PWD/avfvideowidgetcontrol_p.h \
+    $$PWD/avfvideowidget_p.h
+
+SOURCES += \
+    $$PWD/avfvideowidgetcontrol.mm \
+    $$PWD/avfvideowidget.mm
+
+LIBS += -framework CoreFoundation \
+        -framework Foundation \
+        -framework QuartzCore \
+        -framework CoreVideo \
+        -framework Metal
+
+QMAKE_USE += avfoundation
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm b/src/multimediawidgets/platform/avfoundation/avfvideowidget.mm
index 0987342b4..874751ec1 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
+++ b/src/multimediawidgets/platform/avfoundation/avfvideowidget.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "avfvideowidget.h"
+#include "avfvideowidget_p.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <QuartzCore/CATransaction.h>
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidget.h b/src/multimediawidgets/platform/avfoundation/avfvideowidget_p.h
index faf71f1a4..dbbe343ec 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidget.h
+++ b/src/multimediawidgets/platform/avfoundation/avfvideowidget_p.h
@@ -40,6 +40,17 @@
 #ifndef AVFVIDEOWIDGET_H
 #define AVFVIDEOWIDGET_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtWidgets/QWidget>
 
 @class AVPlayerLayer;
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm b/src/multimediawidgets/platform/avfoundation/avfvideowidgetcontrol.mm
index 91ece817e..ec1c04a09 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm
+++ b/src/multimediawidgets/platform/avfoundation/avfvideowidgetcontrol.mm
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "avfvideowidgetcontrol.h"
-#include "avfvideowidget.h"
+#include "avfvideowidgetcontrol_p.h"
+#include "avfvideowidget_p.h"
 
 #ifdef QT_DEBUG_AVF
 #include <QtCore/QDebug>
@@ -142,4 +142,4 @@ void AVFVideoWidgetControl::setSaturation(int saturation)
     m_saturation = saturation;
 }
 
-#include "moc_avfvideowidgetcontrol.cpp"
+#include "moc_avfvideowidgetcontrol_p.cpp"
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.h b/src/multimediawidgets/platform/avfoundation/avfvideowidgetcontrol_p.h
index 22379d273..60c94e72d 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.h
+++ b/src/multimediawidgets/platform/avfoundation/avfvideowidgetcontrol_p.h
@@ -40,10 +40,21 @@
 #ifndef AVFVIDEOWIDGETCONTROL_H
 #define AVFVIDEOWIDGETCONTROL_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qvideowidgetcontrol.h>
-#include "avfvideooutput.h"
+#include "private/avfvideooutput_p.h"
 
-@class AVPlayerLayer;
+Q_FORWARD_DECLARE_OBJC_CLASS(AVPlayerLayer);
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimediawidgets/platform/gstreamer/gstreamer.pri b/src/multimediawidgets/platform/gstreamer/gstreamer.pri
new file mode 100644
index 000000000..c45f116ae
--- /dev/null
+++ b/src/multimediawidgets/platform/gstreamer/gstreamer.pri
@@ -0,0 +1,4 @@
+QMAKE_USE_PRIVATE += gstreamer
+
+SOURCES += $$PWD/qgstreamervideowidget.cpp
+HEADERS += $$PWD/qgstreamervideowidget_p.h
diff --git a/src/multimediawidgets/gstreamer/qgstreamervideowidget.cpp b/src/multimediawidgets/platform/gstreamer/qgstreamervideowidget.cpp
index e1c8fe47c..e1c8fe47c 100644
--- a/src/multimediawidgets/gstreamer/qgstreamervideowidget.cpp
+++ b/src/multimediawidgets/platform/gstreamer/qgstreamervideowidget.cpp
diff --git a/src/multimediawidgets/gstreamer/qgstreamervideowidget_p.h b/src/multimediawidgets/platform/gstreamer/qgstreamervideowidget_p.h
index 38985ebd0..38985ebd0 100644
--- a/src/multimediawidgets/gstreamer/qgstreamervideowidget_p.h
+++ b/src/multimediawidgets/platform/gstreamer/qgstreamervideowidget_p.h
diff --git a/src/multimediawidgets/platform/platform.pri b/src/multimediawidgets/platform/platform.pri
new file mode 100644
index 000000000..a2b2f9742
--- /dev/null
+++ b/src/multimediawidgets/platform/platform.pri
@@ -0,0 +1,2 @@
+qtConfig(gstreamer):include(gstreamer/gstreamer.pri)
+qtConfig(avfoundation):include(avfoundation/avfoundation.pri)
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index 742dff6d3..2edbd6af6 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include <private/qtmultimediaglobal_p.h>
 #include "qvideowidget_p.h"
 #include "qpaintervideosurface_p.h"
 
@@ -57,6 +58,11 @@
 #include <qwindow.h>
 #include <private/qhighdpiscaling_p.h>
 
+#if QT_CONFIG(gstreamer)
+#include <private/qgstreamervideowidget_p.h>
+#elif QT_CONFIG(avfoundation)
+#include <private/avfvideowidgetcontrol_p.h>
+#endif
 #ifdef Q_OS_WIN
 #include <QtCore/qt_windows.h>
 #endif
@@ -491,17 +497,24 @@ void QVideoWidgetPrivate::clearService()
 
 bool QVideoWidgetPrivate::createWidgetBackend()
 {
-    if (QObject *control = service->requestControl(QVideoWidgetControl_iid)) {
-        if (QVideoWidgetControl *widgetControl = qobject_cast<QVideoWidgetControl *>(control)) {
-            widgetBackend = new QVideoWidgetControlBackend(service, widgetControl, q_func());
-
-            setCurrentControl(widgetBackend);
+    QVideoWidgetControl *widgetControl = nullptr;
+#if QT_CONFIG(gstreamer)
+//    widgetControl = new QGstreamerVideoWidgetControl(q_ptr);
+    // If the GStreamer video sink is not available, don't provide the video widget control since
+    // it won't work anyway. QVideoWidget will fall back to QVideoRendererControl in that case.
+//    if (!widgetControl->videoSink()) {
+//        delete widgetControl;
+//        widgetControl = nullptr;
+//    }
+    // ### need to set the widget as the video output on the service currently
+#elif QT_CONFIG(avfoundation)
+//    widgetControl = new AVFVideoWidgetControl(q_ptr);
+    // #####m_session->setVideoOutput(qobject_cast<AVFVideoOutput*>(m_videoOutput));
+#endif
+    if (widgetControl)
+        setCurrentControl(widgetBackend);
 
-            return true;
-        }
-        service->releaseControl(control);
-    }
-    return false;
+    return widgetControl != nullptr;
 }
 
 bool QVideoWidgetPrivate::createWindowBackend()
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index bdefc1bb3..73bcbf963 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -3,21 +3,3 @@
 if(TARGET Qt::Quick)
     add_subdirectory(videonode)
 endif()
-if(ANDROID)
-    add_subdirectory(android)
-endif()
-if(QNX OR WIN32 OR (APPLE AND NOT WATCHOS) OR (UNIX AND NOT ANDROID AND NOT APPLE AND NOT QT_FEATURE_gstreamer))
-    add_subdirectory(audiocapture)
-endif()
-if(QNX AND QT_FEATURE_mmrenderer)
-    add_subdirectory(qnx)
-endif()
-if(QT_FEATURE_wmf AND WIN32)
-    add_subdirectory(wmf)
-endif()
-if(QT_FEATURE_gstreamer)
-    add_subdirectory(gstreamer)
-endif()
-if(APPLE AND QT_FEATURE_avfoundation AND NOT WATCHOS)
-    add_subdirectory(avfoundation)
-endif()
diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt
deleted file mode 100644
index 2fefad369..000000000
--- a/src/plugins/android/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Generated from android.pro.
-
-add_subdirectory(src)
-if(ANDROID)
-    add_subdirectory(jar)
-endif()
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
deleted file mode 100644
index 37d11c86b..000000000
--- a/src/plugins/android/android.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += src
-android: SUBDIRS += jar
diff --git a/src/plugins/android/src/CMakeLists.txt b/src/plugins/android/src/CMakeLists.txt
deleted file mode 100644
index 938bd7ae2..000000000
--- a/src/plugins/android/src/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-# Generated from src.pro.
-
-#####################################################################
-## QAndroidMediaServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QAndroidMediaServicePlugin
-    OUTPUT_NAME qtmedia_android
-    TYPE mediaservice
-    SOURCES
-        common/qandroidglobal.h
-        common/qandroidmultimediautils.cpp common/qandroidmultimediautils.h
-        common/qandroidvideooutput.cpp common/qandroidvideooutput.h
-        mediacapture/qandroidaudioencodersettingscontrol.cpp mediacapture/qandroidaudioencodersettingscontrol.h
-        mediacapture/qandroidaudioinputselectorcontrol.cpp mediacapture/qandroidaudioinputselectorcontrol.h
-        mediacapture/qandroidcameracontrol.cpp mediacapture/qandroidcameracontrol.h
-        mediacapture/qandroidcameraexposurecontrol.cpp mediacapture/qandroidcameraexposurecontrol.h
-        mediacapture/qandroidcamerafocuscontrol.cpp mediacapture/qandroidcamerafocuscontrol.h
-        mediacapture/qandroidcameraimagecapturecontrol.cpp mediacapture/qandroidcameraimagecapturecontrol.h
-        mediacapture/qandroidcameraimageprocessingcontrol.cpp mediacapture/qandroidcameraimageprocessingcontrol.h
-        mediacapture/qandroidcamerasession.cpp mediacapture/qandroidcamerasession.h
-        mediacapture/qandroidcameravideorenderercontrol.cpp mediacapture/qandroidcameravideorenderercontrol.h
-        mediacapture/qandroidcaptureservice.cpp mediacapture/qandroidcaptureservice.h
-        mediacapture/qandroidcapturesession.cpp mediacapture/qandroidcapturesession.h
-        mediacapture/qandroidimageencodercontrol.cpp mediacapture/qandroidimageencodercontrol.h
-        mediacapture/qandroidmediacontainercontrol.cpp mediacapture/qandroidmediacontainercontrol.h
-        mediacapture/qandroidmediarecordercontrol.cpp mediacapture/qandroidmediarecordercontrol.h
-        mediacapture/qandroidmediavideoprobecontrol.cpp mediacapture/qandroidmediavideoprobecontrol.h
-        mediacapture/qandroidvideodeviceselectorcontrol.cpp mediacapture/qandroidvideodeviceselectorcontrol.h
-        mediacapture/qandroidvideoencodersettingscontrol.cpp mediacapture/qandroidvideoencodersettingscontrol.h
-        mediaplayer/qandroidmediaplayercontrol.cpp mediaplayer/qandroidmediaplayercontrol.h
-        mediaplayer/qandroidmediaplayervideorenderercontrol.cpp mediaplayer/qandroidmediaplayervideorenderercontrol.h
-        mediaplayer/qandroidmediaservice.cpp mediaplayer/qandroidmediaservice.h
-        mediaplayer/qandroidmetadatareadercontrol.cpp mediaplayer/qandroidmetadatareadercontrol.h
-        qandroidmediaserviceplugin.cpp qandroidmediaserviceplugin.h
-        wrappers/jni/androidcamera.cpp wrappers/jni/androidcamera.h
-        wrappers/jni/androidmediametadataretriever.cpp wrappers/jni/androidmediametadataretriever.h
-        wrappers/jni/androidmediaplayer.cpp wrappers/jni/androidmediaplayer.h
-        wrappers/jni/androidmediarecorder.cpp wrappers/jni/androidmediarecorder.h
-        wrappers/jni/androidmultimediautils.cpp wrappers/jni/androidmultimediautils.h
-        wrappers/jni/androidsurfacetexture.cpp wrappers/jni/androidsurfacetexture.h
-        wrappers/jni/androidsurfaceview.cpp wrappers/jni/androidsurfaceview.h
-    INCLUDE_DIRECTORIES
-        common
-        mediacapture
-        mediaplayer
-        wrappers/jni
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-        Qt::OpenGL
-)
-
-#### Keys ignored in scope 1:.:.:src.pro:<TRUE>:
-# OTHER_FILES = "android_mediaservice.json"
diff --git a/src/plugins/android/src/android_mediaservice.json b/src/plugins/android/src/android_mediaservice.json
deleted file mode 100644
index df4bccb2b..000000000
--- a/src/plugins/android/src/android_mediaservice.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["androidmultimedia"],
-    "Services": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource"]
-}
diff --git a/src/plugins/android/src/src.pro b/src/plugins/android/src/src.pro
deleted file mode 100644
index 5e47a7d09..000000000
--- a/src/plugins/android/src/src.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET = qtmedia_android
-
-QT += opengl multimedia-private core-private network
-
-HEADERS += \
-    qandroidmediaserviceplugin.h
-
-SOURCES += \
-    qandroidmediaserviceplugin.cpp
-
-include (wrappers/jni/jni.pri)
-include (common/common.pri)
-include (mediaplayer/mediaplayer.pri)
-include (mediacapture/mediacapture.pri)
-
-OTHER_FILES += android_mediaservice.json
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin
-load(qt_plugin)
diff --git a/src/plugins/avfoundation/CMakeLists.txt b/src/plugins/avfoundation/CMakeLists.txt
deleted file mode 100644
index 859f05a6a..000000000
--- a/src/plugins/avfoundation/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Generated from avfoundation.pro.
-
-add_subdirectory(mediaplayer)
-if(NOT TVOS)
-    add_subdirectory(camera)
-endif()
diff --git a/src/plugins/avfoundation/avfoundation.pro b/src/plugins/avfoundation/avfoundation.pro
deleted file mode 100644
index 1110e196b..000000000
--- a/src/plugins/avfoundation/avfoundation.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += mediaplayer
-!tvos: SUBDIRS += camera
diff --git a/src/plugins/avfoundation/camera/CMakeLists.txt b/src/plugins/avfoundation/camera/CMakeLists.txt
deleted file mode 100644
index 1a0eabdb7..000000000
--- a/src/plugins/avfoundation/camera/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-# Generated from camera.pro.
-
-#####################################################################
-## AVFServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(AVFServicePlugin
-    OUTPUT_NAME qavfcamera
-    TYPE mediaservice
-    SOURCES
-        avfaudioencodersettingscontrol.h avfaudioencodersettingscontrol.mm
-        avfaudioinputselectorcontrol.h avfaudioinputselectorcontrol.mm
-        avfcameracontrol.h avfcameracontrol.mm
-        avfcameradebug.h
-        avfcameradevicecontrol.h avfcameradevicecontrol.mm
-        avfcameraexposurecontrol.h avfcameraexposurecontrol.mm
-        avfcamerafocuscontrol.h avfcamerafocuscontrol.mm
-        avfcamerametadatacontrol.h avfcamerametadatacontrol.mm
-        avfcamerarenderercontrol.h avfcamerarenderercontrol.mm
-        avfcameraservice.h avfcameraservice.mm
-        avfcameraserviceplugin.h avfcameraserviceplugin.mm
-        avfcamerasession.h avfcamerasession.mm
-        avfcamerautility.h avfcamerautility.mm
-        avfcamerawindowcontrol.h avfcamerawindowcontrol.mm
-        avfcapturedestinationcontrol.h avfcapturedestinationcontrol.mm
-        avfimagecapturecontrol.h avfimagecapturecontrol.mm
-        avfimageencodercontrol.h avfimageencodercontrol.mm
-        avfmediacontainercontrol.h avfmediacontainercontrol.mm
-        avfmediavideoprobecontrol.h avfmediavideoprobecontrol.mm
-        avfstoragelocation.h avfstoragelocation.mm
-        avfvideoencodersettingscontrol.h avfvideoencodersettingscontrol.mm
-    PUBLIC_LIBRARIES
-        ${FWAudioToolbox}
-        ${FWCoreAudio}
-        ${FWCoreFoundation}
-        ${FWCoreMedia}
-        ${FWFoundation}
-        ${FWQuartzCore}
-        Qt::Core
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-        avfoundation
-)
-
-#### Keys ignored in scope 1:.:.:camera.pro:<TRUE>:
-# OTHER_FILES = "avfcamera.json"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(AVFServicePlugin CONDITION MACOS
-    SOURCES
-        avfmediarecordercontrol.h avfmediarecordercontrol.mm
-    PUBLIC_LIBRARIES
-        ${FWAppKit}
-        ${FWAudioUnit}
-)
-
-qt_internal_extend_target(AVFServicePlugin CONDITION IOS
-    SOURCES
-        avfmediaassetwriter.h avfmediaassetwriter.mm
-        avfmediarecordercontrol_ios.h avfmediarecordercontrol_ios.mm
-    PUBLIC_LIBRARIES
-        ${FWCoreGraphics}
-        ${FWCoreVideo}
-)
diff --git a/src/plugins/avfoundation/camera/avfcamera.json b/src/plugins/avfoundation/camera/avfcamera.json
deleted file mode 100644
index e4310b62c..000000000
--- a/src/plugins/avfoundation/camera/avfcamera.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["avfoundationcamera"],
-    "Services": ["org.qt-project.qt.camera"]
-}
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro
deleted file mode 100644
index 841e5a592..000000000
--- a/src/plugins/avfoundation/camera/camera.pro
+++ /dev/null
@@ -1,85 +0,0 @@
-TARGET = qavfcamera
-
-# Avoid clash with a variable named `slots' in a Quartz header
-CONFIG += no_keywords
-
-QT += multimedia-private network
-
-LIBS += -framework CoreFoundation \
-        -framework Foundation \
-        -framework AudioToolbox \
-        -framework CoreAudio \
-        -framework QuartzCore \
-        -framework CoreMedia
-osx:LIBS += -framework AppKit \
-            -framework AudioUnit
-ios:LIBS += -framework CoreGraphics \
-            -framework CoreVideo
-
-QMAKE_USE += avfoundation
-
-OTHER_FILES += avfcamera.json
-
-HEADERS += \
-    avfcameradebug.h \
-    avfcameraserviceplugin.h \
-    avfcameracontrol.h \
-    avfcamerametadatacontrol.h \
-    avfimagecapturecontrol.h \
-    avfcameraservice.h \
-    avfcamerasession.h \
-    avfstoragelocation.h \
-    avfaudioinputselectorcontrol.h \
-    avfmediavideoprobecontrol.h \
-    avfcamerarenderercontrol.h \
-    avfcameradevicecontrol.h \
-    avfcamerafocuscontrol.h \
-    avfcameraexposurecontrol.h \
-    avfcamerautility.h \
-    avfimageencodercontrol.h \
-    avfvideoencodersettingscontrol.h \
-    avfmediacontainercontrol.h \
-    avfaudioencodersettingscontrol.h \
-    avfcamerawindowcontrol.h \
-
-OBJECTIVE_SOURCES += \
-    avfcameraserviceplugin.mm \
-    avfcameracontrol.mm \
-    avfcamerametadatacontrol.mm \
-    avfimagecapturecontrol.mm \
-    avfcameraservice.mm \
-    avfcamerasession.mm \
-    avfstoragelocation.mm \
-    avfaudioinputselectorcontrol.mm \
-    avfmediavideoprobecontrol.mm \
-    avfcameradevicecontrol.mm \
-    avfcamerarenderercontrol.mm \
-    avfcamerafocuscontrol.mm \
-    avfcameraexposurecontrol.mm \
-    avfcamerautility.mm \
-    avfimageencodercontrol.mm \
-    avfvideoencodersettingscontrol.mm \
-    avfmediacontainercontrol.mm \
-    avfaudioencodersettingscontrol.mm \
-    avfcamerawindowcontrol.mm \
-
-osx {
-
-HEADERS += avfmediarecordercontrol.h
-OBJECTIVE_SOURCES += avfmediarecordercontrol.mm
-
-}
-
-ios {
-
-HEADERS += \
-           avfmediaassetwriter.h \
-           avfmediarecordercontrol_ios.h
-OBJECTIVE_SOURCES += avfmediaassetwriter.mm \
-                     avfmediarecordercontrol_ios.mm
-
-}
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = AVFServicePlugin
-load(qt_plugin)
diff --git a/src/plugins/avfoundation/mediaplayer/CMakeLists.txt b/src/plugins/avfoundation/mediaplayer/CMakeLists.txt
deleted file mode 100644
index 4510fdbfc..000000000
--- a/src/plugins/avfoundation/mediaplayer/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-# Generated from mediaplayer.pro.
-
-#####################################################################
-## AVFMediaPlayerServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(AVFMediaPlayerServicePlugin
-    OUTPUT_NAME qavfmediaplayer
-    TYPE mediaservice
-    SOURCES
-        avfmediaplayercontrol.h avfmediaplayercontrol.mm
-        avfmediaplayermetadatacontrol.h avfmediaplayermetadatacontrol.mm
-        avfmediaplayerservice.h avfmediaplayerservice.mm
-        avfmediaplayerserviceplugin.h avfmediaplayerserviceplugin.mm
-        avfmediaplayersession.h avfmediaplayersession.mm
-        avfvideooutput.h avfvideooutput.mm
-        avfvideowindowcontrol.h avfvideowindowcontrol.mm
-    PUBLIC_LIBRARIES
-        ${FWCoreMedia}
-        ${FWCoreVideo}
-        ${FWMetal}
-        ${FWQuartzCore}
-        Qt::Core
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-        Qt::OpenGL
-        avfoundation
-)
-
-#### Keys ignored in scope 1:.:.:mediaplayer.pro:<TRUE>:
-# OTHER_FILES = "avfmediaplayer.json"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(AVFMediaPlayerServicePlugin CONDITION TARGET Qt::Widgets
-    SOURCES
-        avfvideowidget.h avfvideowidget.mm
-        avfvideowidgetcontrol.h avfvideowidgetcontrol.mm
-    PUBLIC_LIBRARIES
-        Qt::MultimediaWidgetsPrivate
-)
-
-qt_internal_extend_target(AVFMediaPlayerServicePlugin CONDITION IOS OR TVOS
-    PUBLIC_LIBRARIES
-        ${FWFoundation}
-)
-
-qt_internal_extend_target(AVFMediaPlayerServicePlugin CONDITION QT_FEATURE_opengl AND (IOS OR TVOS)
-    SOURCES
-        avfdisplaylink.h avfdisplaylink.mm
-        avfvideoframerenderer_ios.h avfvideoframerenderer_ios.mm
-        avfvideorenderercontrol.h avfvideorenderercontrol.mm
-)
-
-qt_internal_extend_target(AVFMediaPlayerServicePlugin CONDITION NOT IOS AND NOT TVOS
-    PUBLIC_LIBRARIES
-        ${FWAppKit}
-)
-
-qt_internal_extend_target(AVFMediaPlayerServicePlugin CONDITION QT_FEATURE_opengl AND NOT IOS AND NOT TVOS
-    SOURCES
-        avfdisplaylink.h avfdisplaylink.mm
-        avfvideoframerenderer.h avfvideoframerenderer.mm
-        avfvideorenderercontrol.h avfvideorenderercontrol.mm
-)
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayer.json b/src/plugins/avfoundation/mediaplayer/avfmediaplayer.json
deleted file mode 100644
index 5626edec0..000000000
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["avfoundationmediaplayer"],
-    "Services": ["org.qt-project.qt.mediaplayer"]
-}
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
deleted file mode 100644
index 604866058..000000000
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ /dev/null
@@ -1,76 +0,0 @@
-TARGET = qavfmediaplayer
-
-#DEFINES += QT_DEBUG_AVF
-# Avoid clash with a variable named `slots' in a Quartz header
-CONFIG += no_keywords
-
-QT += opengl multimedia-private network
-
-LIBS += -framework CoreMedia -framework CoreVideo -framework QuartzCore -framework Metal
-
-QMAKE_USE += avfoundation
-
-HEADERS += \
-    avfmediaplayercontrol.h \
-    avfmediaplayermetadatacontrol.h \
-    avfmediaplayerservice.h \
-    avfmediaplayersession.h \
-    avfmediaplayerserviceplugin.h \
-    avfvideooutput.h \
-    avfvideowindowcontrol.h
-
-OBJECTIVE_SOURCES += \
-    avfmediaplayercontrol.mm \
-    avfmediaplayermetadatacontrol.mm \
-    avfmediaplayerservice.mm \
-    avfmediaplayerserviceplugin.mm \
-    avfmediaplayersession.mm \
-    avfvideooutput.mm \
-    avfvideowindowcontrol.mm
-
-    qtHaveModule(widgets) {
-        QT += multimediawidgets-private
-        HEADERS += \
-            avfvideowidgetcontrol.h \
-            avfvideowidget.h
-
-        OBJECTIVE_SOURCES += \
-            avfvideowidgetcontrol.mm \
-            avfvideowidget.mm
-    }
-
-ios|tvos {
-    qtConfig(opengl) {
-        HEADERS += \
-            avfvideoframerenderer_ios.h \
-            avfvideorenderercontrol.h \
-            avfdisplaylink.h
-
-        OBJECTIVE_SOURCES += \
-            avfvideoframerenderer_ios.mm \
-            avfvideorenderercontrol.mm \
-            avfdisplaylink.mm
-    }
-    LIBS += -framework Foundation
-} else {
-    LIBS += -framework AppKit
-
-    qtConfig(opengl) {
-        HEADERS += \
-            avfvideoframerenderer.h \
-            avfvideorenderercontrol.h \
-            avfdisplaylink.h
-
-        OBJECTIVE_SOURCES += \
-            avfvideoframerenderer.mm \
-            avfvideorenderercontrol.mm \
-            avfdisplaylink.mm
-    }
-}
-
-OTHER_FILES += \
-    avfmediaplayer.json
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin
-load(qt_plugin)
diff --git a/src/plugins/common/evr.pri b/src/plugins/common/evr.pri
deleted file mode 100644
index 2a1b383df..000000000
--- a/src/plugins/common/evr.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-INCLUDEPATH += $$PWD/evr
-
-qtHaveModule(widgets): QT += widgets
-QT += gui-private
-
-LIBS += -lmf -lmfplat -lmfuuid -ld3d9 -ldxva2 -lwinmm -levr
-
-HEADERS += \
-    $$PWD/evr/evrvideowindowcontrol.h \
-    $$PWD/evr/evrcustompresenter.h \
-    $$PWD/evr/evrd3dpresentengine.h \
-    $$PWD/evr/evrhelpers.h \
-    $$PWD/evr/evrdefs.h
-
-SOURCES += \
-    $$PWD/evr/evrvideowindowcontrol.cpp \
-    $$PWD/evr/evrcustompresenter.cpp \
-    $$PWD/evr/evrd3dpresentengine.cpp \
-    $$PWD/evr/evrhelpers.cpp \
-    $$PWD/evr/evrdefs.cpp
diff --git a/src/plugins/gstreamer/CMakeLists.txt b/src/plugins/gstreamer/CMakeLists.txt
deleted file mode 100644
index 6684057b7..000000000
--- a/src/plugins/gstreamer/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Generated from gstreamer.pro.
-
-add_subdirectory(audiodecoder)
-add_subdirectory(camerabin)
-add_subdirectory(mediaplayer)
-#add_subdirectory(mediacapture)
diff --git a/src/plugins/gstreamer/audiodecoder/CMakeLists.txt b/src/plugins/gstreamer/audiodecoder/CMakeLists.txt
deleted file mode 100644
index 019cd5a48..000000000
--- a/src/plugins/gstreamer/audiodecoder/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated from audiodecoder.pro.
-
-#####################################################################
-## QGstreamerAudioDecoderServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QGstreamerAudioDecoderServicePlugin
-    OUTPUT_NAME gstaudiodecoder
-    TYPE mediaservice
-    SOURCES
-        qgstreameraudiodecodercontrol.cpp qgstreameraudiodecodercontrol.h
-        qgstreameraudiodecoderservice.cpp qgstreameraudiodecoderservice.h
-        qgstreameraudiodecoderserviceplugin.cpp qgstreameraudiodecoderserviceplugin.h
-    INCLUDE_DIRECTORIES
-        ${CMAKE_CURRENT_SOURCE_DIR}
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-        gstreamer
-        Qt::MultimediaPrivate
-)
-
-#### Keys ignored in scope 1:.:.:audiodecoder.pro:<TRUE>:
-# OTHER_FILES = "audiodecoder.json"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(QGstreamerAudioDecoderServicePlugin CONDITION TARGET Qt::Widgets
-    DEFINES
-        HAVE_WIDGETS
-    PUBLIC_LIBRARIES
-        Qt::MultimediaWidgetsPrivate
-        Qt::Widgets
-)
-
-qt_internal_extend_target(QGstreamerAudioDecoderServicePlugin CONDITION QT_FEATURE_gstreamer_app
-    PUBLIC_LIBRARIES
-        gstreamer_app
-)
diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.json b/src/plugins/gstreamer/audiodecoder/audiodecoder.json
deleted file mode 100644
index 4314f2efa..000000000
--- a/src/plugins/gstreamer/audiodecoder/audiodecoder.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["gstreameraudiodecode"],
-    "Services": ["org.qt-project.qt.audiodecode"]
-}
diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
deleted file mode 100644
index 7e61beccc..000000000
--- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-TARGET = gstaudiodecoder
-
-include(../common.pri)
-
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/qgstreameraudiodecoderservice.h \
-    $$PWD/qgstreameraudiodecodercontrol.h \
-    $$PWD/qgstreameraudiodecoderserviceplugin.h
-
-SOURCES += \
-    $$PWD/qgstreameraudiodecoderservice.cpp \
-    $$PWD/qgstreameraudiodecodercontrol.cpp \
-    $$PWD/qgstreameraudiodecoderserviceplugin.cpp
-
-OTHER_FILES += \
-    audiodecoder.json
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin
-load(qt_plugin)
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.cpp b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.cpp
deleted file mode 100644
index 125ba4d1c..000000000
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/qvariant.h>
-#include <QtCore/qdebug.h>
-
-#include "qgstreameraudiodecoderservice.h"
-#include "qgstreameraudiodecodercontrol.h"
-
-QT_BEGIN_NAMESPACE
-
-QGstreamerAudioDecoderService::QGstreamerAudioDecoderService(QObject *parent)
-    : QMediaService(parent)
-{
-    m_control = new QGstreamerAudioDecoderControl(this);
-}
-
-QGstreamerAudioDecoderService::~QGstreamerAudioDecoderService()
-{
-}
-
-QObject *QGstreamerAudioDecoderService::requestControl(const char *name)
-{
-    if (qstrcmp(name, QAudioDecoderControl_iid) == 0)
-        return m_control;
-
-    return 0;
-}
-
-void QGstreamerAudioDecoderService::releaseControl(QObject *control)
-{
-    Q_UNUSED(control);
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.h
deleted file mode 100644
index defa5345c..000000000
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGSTREAMERAUDIODECODERSERVICE_H
-#define QGSTREAMERAUDIODECODERSERVICE_H
-
-#include <QtCore/qobject.h>
-#include <QtCore/qiodevice.h>
-
-#include <qmediaservice.h>
-
-QT_BEGIN_NAMESPACE
-class QGstreamerAudioDecoderControl;
-class QGstreamerAudioDecoderControl;
-
-class QGstreamerAudioDecoderService : public QMediaService
-{
-    Q_OBJECT
-public:
-    QGstreamerAudioDecoderService(QObject *parent = 0);
-    ~QGstreamerAudioDecoderService();
-
-    QObject *requestControl(const char *name) override;
-    void releaseControl(QObject *control) override;
-
-private:
-    QGstreamerAudioDecoderControl *m_control;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp
deleted file mode 100644
index d9e6a2a38..000000000
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qgstreameraudiodecoderserviceplugin.h"
-
-#include "qgstreameraudiodecoderservice.h"
-#include <private/qgstutils_p.h>
-
-#include <QtCore/qstring.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-
-// #define QT_SUPPORTEDMIMETYPES_DEBUG
-
-QMediaService* QGstreamerAudioDecoderServicePlugin::create(const QString &key)
-{
-    QGstUtils::initializeGst();
-
-    if (key == QLatin1String(Q_MEDIASERVICE_AUDIODECODER))
-        return new QGstreamerAudioDecoderService;
-
-    qWarning() << "Gstreamer audio decoder service plugin: unsupported key:" << key;
-    return 0;
-}
-
-void QGstreamerAudioDecoderServicePlugin::release(QMediaService *service)
-{
-    delete service;
-}
-
-QMultimedia::SupportEstimate QGstreamerAudioDecoderServicePlugin::hasSupport(const QString &mimeType,
-                                                                     const QStringList &codecs) const
-{
-    if (m_supportedMimeTypeSet.isEmpty())
-        updateSupportedMimeTypes();
-
-    return QGstUtils::hasSupport(mimeType, codecs, m_supportedMimeTypeSet);
-}
-
-static bool isDecoderOrDemuxer(GstElementFactory *factory)
-{
-    return gst_element_factory_list_is_type(factory, GST_ELEMENT_FACTORY_TYPE_DEMUXER)
-            || gst_element_factory_list_is_type(factory, GST_ELEMENT_FACTORY_TYPE_DECODER
-                                                       | GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO);
-}
-
-void QGstreamerAudioDecoderServicePlugin::updateSupportedMimeTypes() const
-{
-    m_supportedMimeTypeSet = QGstUtils::supportedMimeTypes(isDecoderOrDemuxer);
-}
-
-QStringList QGstreamerAudioDecoderServicePlugin::supportedMimeTypes() const
-{
-    return QStringList();
-}
-
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h
deleted file mode 100644
index d1b96043b..000000000
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGSTREAMERAUDIODECODERSERVICEPLUGIN_H
-#define QGSTREAMERAUDIODECODERSERVICEPLUGIN_H
-
-#include <qmediaserviceproviderplugin.h>
-#include <QtCore/qset.h>
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-
-class QGstreamerAudioDecoderServicePlugin
-        : public QMediaServiceProviderPlugin
-        , public QMediaServiceSupportedFormatsInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
-    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "audiodecoder.json")
-
-public:
-    QMediaService* create(const QString &key) override;
-    void release(QMediaService *service) override;
-
-    QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList &codecs) const override;
-    QStringList supportedMimeTypes() const override;
-
-private:
-    void updateSupportedMimeTypes() const;
-
-    mutable QSet<QString> m_supportedMimeTypeSet;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGSTREAMERAUDIODECODERSERVICEPLUGIN_H
diff --git a/src/plugins/gstreamer/camerabin/CMakeLists.txt b/src/plugins/gstreamer/camerabin/CMakeLists.txt
deleted file mode 100644
index 2ef2f7572..000000000
--- a/src/plugins/gstreamer/camerabin/CMakeLists.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-# Generated from camerabin.pro.
-
-#####################################################################
-## CameraBinServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(CameraBinServicePlugin
-    OUTPUT_NAME gstcamerabin
-    TYPE mediaservice
-    SOURCES
-        camerabinaudioencoder.cpp camerabinaudioencoder.h
-        camerabincapturebufferformat.cpp camerabincapturebufferformat.h
-        camerabincapturedestination.cpp camerabincapturedestination.h
-        camerabincontainer.cpp camerabincontainer.h
-        camerabincontrol.cpp camerabincontrol.h
-        camerabinimagecapture.cpp camerabinimagecapture.h
-        camerabinimageencoder.cpp camerabinimageencoder.h
-        camerabinimageprocessing.cpp camerabinimageprocessing.h
-        camerabinmetadata.cpp camerabinmetadata.h
-        camerabinrecorder.cpp camerabinrecorder.h
-        camerabinservice.cpp camerabinservice.h
-        camerabinserviceplugin.cpp camerabinserviceplugin.h
-        camerabinsession.cpp camerabinsession.h
-        camerabinvideoencoder.cpp camerabinvideoencoder.h
-        camerabinzoom.cpp camerabinzoom.h
-    INCLUDE_DIRECTORIES
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        /src/multimedia
-        camerabin
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-        gstreamer
-        Qt::MultimediaPrivate
-)
-
-#### Keys ignored in scope 1:.:.:camerabin.pro:<TRUE>:
-# OTHER_FILES = "camerabin.json"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(CameraBinServicePlugin CONDITION QT_FEATURE_gstreamer_photography
-    SOURCES
-        camerabinexposure.cpp camerabinexposure.h
-        camerabinfocus.cpp camerabinfocus.h
-        camerabinlocks.cpp camerabinlocks.h
-    DEFINES
-        GST_USE_UNSTABLE_API
-    PUBLIC_LIBRARIES
-        gstreamer_photography
-)
-
-qt_internal_extend_target(CameraBinServicePlugin CONDITION QT_FEATURE_linux_v4l
-    SOURCES
-        camerabinv4limageprocessing.cpp camerabinv4limageprocessing.h
-)
-
-qt_internal_extend_target(CameraBinServicePlugin CONDITION TARGET Qt::Widgets
-    DEFINES
-        HAVE_WIDGETS
-    PUBLIC_LIBRARIES
-        Qt::MultimediaWidgetsPrivate
-        Qt::Widgets
-)
-
-qt_internal_extend_target(CameraBinServicePlugin CONDITION QT_FEATURE_gstreamer_app
-    PUBLIC_LIBRARIES
-        gstreamer_app
-)
diff --git a/src/plugins/gstreamer/camerabin/camerabin.json b/src/plugins/gstreamer/camerabin/camerabin.json
deleted file mode 100644
index 3246b4683..000000000
--- a/src/plugins/gstreamer/camerabin/camerabin.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["gstreamercamerabin"],
-    "Services": ["org.qt-project.qt.camera"]
-}
diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro
deleted file mode 100644
index 0623dbc2b..000000000
--- a/src/plugins/gstreamer/camerabin/camerabin.pro
+++ /dev/null
@@ -1,69 +0,0 @@
-TARGET = gstcamerabin
-
-QT += multimedia-private
-
-include(../common.pri)
-
-INCLUDEPATH += $$PWD \
-    $${SOURCE_DIR}/src/multimedia
-
-INCLUDEPATH += camerabin
-
-
-HEADERS += \
-    $$PWD/camerabinserviceplugin.h \
-    $$PWD/camerabinservice.h \
-    $$PWD/camerabinsession.h \
-    $$PWD/camerabincontrol.h \
-    $$PWD/camerabinaudioencoder.h \
-    $$PWD/camerabinimageencoder.h \
-    $$PWD/camerabinrecorder.h \
-    $$PWD/camerabincontainer.h \
-    $$PWD/camerabinimagecapture.h \
-    $$PWD/camerabinimageprocessing.h \
-    $$PWD/camerabinmetadata.h \
-    $$PWD/camerabinvideoencoder.h \
-
-SOURCES += \
-    $$PWD/camerabinserviceplugin.cpp \
-    $$PWD/camerabinservice.cpp \
-    $$PWD/camerabinsession.cpp \
-    $$PWD/camerabincontrol.cpp \
-    $$PWD/camerabinaudioencoder.cpp \
-    $$PWD/camerabincontainer.cpp \
-    $$PWD/camerabinimagecapture.cpp \
-    $$PWD/camerabinimageencoder.cpp \
-    $$PWD/camerabinimageprocessing.cpp \
-    $$PWD/camerabinmetadata.cpp \
-    $$PWD/camerabinrecorder.cpp \
-    $$PWD/camerabinvideoencoder.cpp \
-
-qtConfig(gstreamer_photography) {
-    HEADERS += \
-        $$PWD/camerabinfocus.h \
-        $$PWD/camerabinexposure.h \
-
-    SOURCES += \
-        $$PWD/camerabinexposure.cpp \
-        $$PWD/camerabinfocus.cpp \
-
-    QMAKE_USE += gstreamer_photography
-    DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
-}
-
-qtConfig(gstreamer_gl): QMAKE_USE += gstreamer_gl
-
-qtConfig(linux_v4l) {
-    HEADERS += \
-        $$PWD/camerabinv4limageprocessing.h
-
-    SOURCES += \
-        $$PWD/camerabinv4limageprocessing.cpp
-}
-
-OTHER_FILES += \
-    camerabin.json
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = CameraBinServicePlugin
-load(qt_plugin)
diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri
deleted file mode 100644
index 8e5c381ae..000000000
--- a/src/plugins/gstreamer/common.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-QT += core-private multimedia-private network
-
-qtHaveModule(widgets) {
-    QT += widgets multimediawidgets-private
-    DEFINES += HAVE_WIDGETS
-}
-
-QMAKE_USE += gstreamer
-
-qtConfig(gstreamer_app): \
-    QMAKE_USE += gstreamer_app
-
diff --git a/src/plugins/gstreamer/gstreamer.json b/src/plugins/gstreamer/gstreamer.json
deleted file mode 100644
index 0656cce4f..000000000
--- a/src/plugins/gstreamer/gstreamer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["gstreamer"],
-    "Services": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource", "org.qt-project.qt.camera", "org.qt-project.qt.audiodecode"]
-}
diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro
deleted file mode 100644
index 5fb8f83c6..000000000
--- a/src/plugins/gstreamer/gstreamer.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    audiodecoder \
-    camerabin \
-    mediaplayer \
-    mediacapture
-
-OTHER_FILES += \
-    gstreamer.json
diff --git a/src/plugins/gstreamer/mediacapture/CMakeLists.txt b/src/plugins/gstreamer/mediacapture/CMakeLists.txt
deleted file mode 100644
index 763d9a3c9..000000000
--- a/src/plugins/gstreamer/mediacapture/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-# Generated from mediacapture.pro.
-
-#####################################################################
-## QGstreamerCaptureServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QGstreamerCaptureServicePlugin
-    OUTPUT_NAME gstmediacapture
-    TYPE mediaservice
-    SOURCES
-        qgstreameraudioencode.cpp qgstreameraudioencode.h
-        qgstreamercameracontrol.cpp qgstreamercameracontrol.h
-        qgstreamercapturemetadatacontrol.cpp qgstreamercapturemetadatacontrol.h
-        qgstreamercaptureservice.cpp qgstreamercaptureservice.h
-        qgstreamercaptureserviceplugin.cpp qgstreamercaptureserviceplugin.h
-        qgstreamercapturesession.cpp qgstreamercapturesession.h
-        qgstreamerimagecapturecontrol.cpp qgstreamerimagecapturecontrol.h
-        qgstreamerimageencode.cpp qgstreamerimageencode.h
-        qgstreamermediacontainercontrol.cpp qgstreamermediacontainercontrol.h
-        qgstreamerrecordercontrol.cpp qgstreamerrecordercontrol.h
-        qgstreamervideoencode.cpp qgstreamervideoencode.h
-    INCLUDE_DIRECTORIES
-        ${CMAKE_CURRENT_SOURCE_DIR}
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-        gstreamer
-        Qt::MultimediaPrivate
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(QGstreamerCaptureServicePlugin CONDITION QT_FEATURE_linux_v4l AND use_gstreamer_camera
-    SOURCES
-        qgstreamerv4l2input.cpp qgstreamerv4l2input.h
-    DEFINES
-        USE_GSTREAMER_CAMERA
-)
-
-#### Keys ignored in scope 2:.:.:mediacapture.pro:use_gstreamer_camera AND QT_FEATURE_linux_v4l:
-# OTHER_FILES = "mediacapturecamera.json"
-
-#### Keys ignored in scope 3:.:.:mediacapture.pro:else:
-# OTHER_FILES = "mediacapture.json"
-
-qt_internal_extend_target(QGstreamerCaptureServicePlugin CONDITION TARGET Qt::Widgets
-    DEFINES
-        HAVE_WIDGETS
-    PUBLIC_LIBRARIES
-        Qt::MultimediaWidgetsPrivate
-        Qt::Widgets
-)
-
-qt_internal_extend_target(QGstreamerCaptureServicePlugin CONDITION QT_FEATURE_gstreamer_app
-    PUBLIC_LIBRARIES
-        gstreamer_app
-)
diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.json b/src/plugins/gstreamer/mediacapture/mediacapture.json
deleted file mode 100644
index 68ca3f55b..000000000
--- a/src/plugins/gstreamer/mediacapture/mediacapture.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["gstreamermediacapture"],
-    "Services": ["org.qt-project.qt.audiosource"]
-}
diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro
deleted file mode 100644
index c2982b199..000000000
--- a/src/plugins/gstreamer/mediacapture/mediacapture.pro
+++ /dev/null
@@ -1,52 +0,0 @@
-TARGET = gstmediacapture
-
-include(../common.pri)
-
-INCLUDEPATH += $$PWD
-
-HEADERS += $$PWD/qgstreamercaptureservice.h \
-    $$PWD/qgstreamercapturesession.h \
-    $$PWD/qgstreameraudioencode.h \
-    $$PWD/qgstreamervideoencode.h \
-    $$PWD/qgstreamerrecordercontrol.h \
-    $$PWD/qgstreamermediacontainercontrol.h \
-    $$PWD/qgstreamercameracontrol.h \
-    $$PWD/qgstreamercapturemetadatacontrol.h \
-    $$PWD/qgstreamerimagecapturecontrol.h \
-    $$PWD/qgstreamerimageencode.h \
-    $$PWD/qgstreamercaptureserviceplugin.h
-
-SOURCES += $$PWD/qgstreamercaptureservice.cpp \
-    $$PWD/qgstreamercapturesession.cpp \
-    $$PWD/qgstreameraudioencode.cpp \
-    $$PWD/qgstreamervideoencode.cpp \
-    $$PWD/qgstreamerrecordercontrol.cpp \
-    $$PWD/qgstreamermediacontainercontrol.cpp \
-    $$PWD/qgstreamercameracontrol.cpp \
-    $$PWD/qgstreamercapturemetadatacontrol.cpp \
-    $$PWD/qgstreamerimagecapturecontrol.cpp \
-    $$PWD/qgstreamerimageencode.cpp \
-    $$PWD/qgstreamercaptureserviceplugin.cpp
-
-# Camera usage with gstreamer needs to have
-CONFIG += use_gstreamer_camera
-
-use_gstreamer_camera:qtConfig(linux_v4l) {
-    DEFINES += USE_GSTREAMER_CAMERA
-
-    OTHER_FILES += \
-        mediacapturecamera.json
-
-    HEADERS += \
-        $$PWD/qgstreamerv4l2input.h
-    SOURCES += \
-        $$PWD/qgstreamerv4l2input.cpp
-
-} else {
-    OTHER_FILES += \
-        mediacapture.json
-}
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin
-load(qt_plugin)
diff --git a/src/plugins/gstreamer/mediacapture/mediacapturecamera.json b/src/plugins/gstreamer/mediacapture/mediacapturecamera.json
deleted file mode 100644
index f5fba17e6..000000000
--- a/src/plugins/gstreamer/mediacapture/mediacapturecamera.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["gstreamermediacapture"],
-    "Services": ["org.qt-project.qt.audiosource", "org.qt-project.qt.camera"]
-}
diff --git a/src/plugins/gstreamer/mediaplayer/CMakeLists.txt b/src/plugins/gstreamer/mediaplayer/CMakeLists.txt
deleted file mode 100644
index 5bbb26bb9..000000000
--- a/src/plugins/gstreamer/mediaplayer/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# Generated from mediaplayer.pro.
-
-#####################################################################
-## QGstreamerPlayerServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(QGstreamerPlayerServicePlugin
-    OUTPUT_NAME gstmediaplayer
-    TYPE mediaservice
-    SOURCES
-        qgstreamermetadataprovider.cpp qgstreamermetadataprovider.h
-        qgstreamerplayerservice.cpp qgstreamerplayerservice.h
-        qgstreamerplayerserviceplugin.cpp qgstreamerplayerserviceplugin.h
-        qgstreamerstreamscontrol.cpp qgstreamerstreamscontrol.h
-    INCLUDE_DIRECTORIES
-        ${CMAKE_CURRENT_SOURCE_DIR}
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::Network
-        gstreamer
-        Qt::MultimediaPrivate
-)
-
-#### Keys ignored in scope 1:.:.:mediaplayer.pro:<TRUE>:
-# OTHER_FILES = "mediaplayer.json"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(QGstreamerPlayerServicePlugin CONDITION TARGET Qt::Widgets
-    DEFINES
-        HAVE_WIDGETS
-    PUBLIC_LIBRARIES
-        Qt::MultimediaWidgetsPrivate
-        Qt::Widgets
-)
-
-qt_internal_extend_target(QGstreamerPlayerServicePlugin CONDITION QT_FEATURE_gstreamer_app
-    PUBLIC_LIBRARIES
-        gstreamer_app
-)
diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.json b/src/plugins/gstreamer/mediaplayer/mediaplayer.json
deleted file mode 100644
index bd1a7e64d..000000000
--- a/src/plugins/gstreamer/mediaplayer/mediaplayer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["gstreamermediaplayer"],
-    "Services": ["org.qt-project.qt.mediaplayer"]
-}
diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
deleted file mode 100644
index c9dadd979..000000000
--- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-TARGET = gstmediaplayer
-
-include(../common.pri)
-
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/qgstreamerplayerservice.h \
-    $$PWD/qgstreamerstreamscontrol.h \
-    $$PWD/qgstreamermetadataprovider.h \
-    $$PWD/qgstreamerplayerserviceplugin.h
-
-SOURCES += \
-    $$PWD/qgstreamerplayerservice.cpp \
-    $$PWD/qgstreamerstreamscontrol.cpp \
-    $$PWD/qgstreamermetadataprovider.cpp \
-    $$PWD/qgstreamerplayerserviceplugin.cpp
-
-OTHER_FILES += \
-    mediaplayer.json
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin
-load(qt_plugin)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 64e0edeb0..cff104ed7 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -11,22 +11,3 @@ qtHaveModule(quick) {
    SUBDIRS += videonode
 }
 
-android {
-   SUBDIRS += android
-}
-
-qnx {
-    qtConfig(mmrenderer): SUBDIRS += qnx
-}
-
-win32: {
-    qtConfig(wmf): SUBDIRS += wmf
-}
-
-qtConfig(gstreamer): SUBDIRS += gstreamer
-
-darwin:!watchos {
-    qtConfig(avfoundation): SUBDIRS += avfoundation
-}
-
-
diff --git a/src/plugins/qnx/CMakeLists.txt b/src/plugins/qnx/CMakeLists.txt
deleted file mode 100644
index a663693b0..000000000
--- a/src/plugins/qnx/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated from qnx.pro.
-
-#####################################################################
-## NeutrinoServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(NeutrinoServicePlugin
-    OUTPUT_NAME qtmedia_qnx
-    TYPE mediaservice
-    SOURCES
-        common/windowgrabber.cpp common/windowgrabber.h
-        mediaplayer/mmrenderermediaplayercontrol.cpp mediaplayer/mmrenderermediaplayercontrol.h
-        mediaplayer/mmrenderermediaplayerservice.cpp mediaplayer/mmrenderermediaplayerservice.h
-        mediaplayer/mmrenderermetadata.cpp mediaplayer/mmrenderermetadata.h
-        mediaplayer/mmrenderermetadatareadercontrol.cpp mediaplayer/mmrenderermetadatareadercontrol.h
-        mediaplayer/mmrendererplayervideorenderercontrol.cpp mediaplayer/mmrendererplayervideorenderercontrol.h
-        mediaplayer/mmrendererutil.cpp mediaplayer/mmrendererutil.h
-        mediaplayer/mmrenderervideowindowcontrol.cpp mediaplayer/mmrenderervideowindowcontrol.h
-        mediaplayer/mmreventmediaplayercontrol.cpp mediaplayer/mmreventmediaplayercontrol.h
-        mediaplayer/mmreventthread.cpp mediaplayer/mmreventthread.h
-        neutrinoserviceplugin.cpp neutrinoserviceplugin.h
-    INCLUDE_DIRECTORIES
-        common
-        mediaplayer
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::MultimediaPrivate
-        mmrenderer
-        screen
-)
-
-#### Keys ignored in scope 1:.:.:qnx.pro:<TRUE>:
-# OTHER_FILES = "neutrino_mediaservice.json"
diff --git a/src/plugins/qnx/camera/camera.pri b/src/plugins/qnx/camera/camera.pri
deleted file mode 100644
index a3fde711a..000000000
--- a/src/plugins/qnx/camera/camera.pri
+++ /dev/null
@@ -1,40 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/bbcameraaudioencodersettingscontrol.h \
-    $$PWD/bbcameracontrol.h \
-    $$PWD/bbcameraexposurecontrol.h \
-    $$PWD/bbcamerafocuscontrol.h \
-    $$PWD/bbcameraimagecapturecontrol.h \
-    $$PWD/bbcameraimageprocessingcontrol.h \
-    $$PWD/bbcameramediarecordercontrol.h \
-    $$PWD/bbcameraorientationhandler.h \
-    $$PWD/bbcameraservice.h \
-    $$PWD/bbcamerasession.h \
-    $$PWD/bbcameravideoencodersettingscontrol.h \
-    $$PWD/bbcameraviewfindersettingscontrol.h \
-    $$PWD/bbimageencodercontrol.h \
-    $$PWD/bbmediastoragelocation.h \
-    $$PWD/bbvideodeviceselectorcontrol.h \
-    $$PWD/bbvideorenderercontrol.h
-
-SOURCES += \
-    $$PWD/bbcameraaudioencodersettingscontrol.cpp \
-    $$PWD/bbcameracontrol.cpp \
-    $$PWD/bbcameraexposurecontrol.cpp \
-    $$PWD/bbcamerafocuscontrol.cpp \
-    $$PWD/bbcameraimagecapturecontrol.cpp \
-    $$PWD/bbcameraimageprocessingcontrol.cpp \
-    $$PWD/bbcameramediarecordercontrol.cpp \
-    $$PWD/bbcameraorientationhandler.cpp \
-    $$PWD/bbcameraservice.cpp \
-    $$PWD/bbcamerasession.cpp \
-    $$PWD/bbcameravideoencodersettingscontrol.cpp \
-    $$PWD/bbcameraviewfindersettingscontrol.cpp \
-    $$PWD/bbimageencodercontrol.cpp \
-    $$PWD/bbmediastoragelocation.cpp \
-    $$PWD/bbvideodeviceselectorcontrol.cpp \
-    $$PWD/bbvideorenderercontrol.cpp
-
-LIBS += -lcamapi -laudio_manager
-
diff --git a/src/plugins/qnx/neutrino_mediaservice.json b/src/plugins/qnx/neutrino_mediaservice.json
deleted file mode 100644
index 919368d73..000000000
--- a/src/plugins/qnx/neutrino_mediaservice.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["neutrinomultimedia"],
-    "Services": ["org.qt-project.qt.mediaplayer"]
-}
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
deleted file mode 100644
index 960c614e0..000000000
--- a/src/plugins/qnx/qnx.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TARGET = qtmedia_qnx
-QT += multimedia-private gui-private core-private
-
-LIBS += -lscreen
-
-include(common/common.pri)
-include(mediaplayer/mediaplayer.pri)
-
-HEADERS += neutrinoserviceplugin.h
-SOURCES += neutrinoserviceplugin.cpp
-OTHER_FILES += neutrino_mediaservice.json
-PLUGIN_CLASS_NAME = NeutrinoServicePlugin
-
-PLUGIN_TYPE = mediaservice
-load(qt_plugin)
diff --git a/src/plugins/wmf/CMakeLists.txt b/src/plugins/wmf/CMakeLists.txt
deleted file mode 100644
index 60875df9a..000000000
--- a/src/plugins/wmf/CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-# Generated from wmf.pro.
-
-#####################################################################
-## WMFServicePlugin Plugin:
-#####################################################################
-
-qt_internal_add_plugin(WMFServicePlugin
-    OUTPUT_NAME wmfengine
-    TYPE mediaservice
-    SOURCES
-        ../common/evr/evrcustompresenter.cpp ../common/evr/evrcustompresenter.h
-        ../common/evr/evrd3dpresentengine.cpp ../common/evr/evrd3dpresentengine.h
-        ../common/evr/evrdefs.cpp ../common/evr/evrdefs.h
-        ../common/evr/evrhelpers.cpp ../common/evr/evrhelpers.h
-        ../common/evr/evrvideowindowcontrol.cpp ../common/evr/evrvideowindowcontrol.h
-        decoder/mfaudiodecodercontrol.cpp decoder/mfaudiodecodercontrol.h
-        decoder/mfdecoderservice.cpp decoder/mfdecoderservice.h
-        decoder/mfdecodersourcereader.cpp decoder/mfdecodersourcereader.h
-        mfstream.cpp mfstream.h
-        player/mfactivate.cpp player/mfactivate.h
-        player/mfaudioendpointcontrol.cpp player/mfaudioendpointcontrol.h
-        player/mfaudioprobecontrol.cpp player/mfaudioprobecontrol.h
-        player/mfevrvideowindowcontrol.cpp player/mfevrvideowindowcontrol.h
-        player/mfmetadatacontrol.cpp player/mfmetadatacontrol.h
-        player/mfplayercontrol.cpp player/mfplayercontrol.h
-        player/mfplayerservice.cpp player/mfplayerservice.h
-        player/mfplayersession.cpp player/mfplayersession.h
-        player/mftvideo.cpp player/mftvideo.h
-        player/mfvideoprobecontrol.cpp player/mfvideoprobecontrol.h
-        player/mfvideorenderercontrol.cpp player/mfvideorenderercontrol.h
-        player/samplegrabber.cpp player/samplegrabber.h
-        sourceresolver.cpp sourceresolver.h
-        wmfserviceplugin.cpp wmfserviceplugin.h
-    INCLUDE_DIRECTORIES
-        .
-        ../common/evr
-        decoder
-        player
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::GuiPrivate
-        Qt::MultimediaPrivate
-        Qt::Network
-        d3d9
-        dxva2
-        evr
-        gdi32
-        mf
-        mfplat
-        mfreadwrite
-        mfuuid
-        user32
-        winmm
-        wmcodecdspuuid
-        wmf
-)
-
-#### Keys ignored in scope 1:.:.:wmf.pro:<TRUE>:
-# OTHER_FILES = "wmf.json"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(WMFServicePlugin CONDITION WIN32 AND NOT TARGET Qt::OpenGL
-    LIBRARIES
-        gdi32
-        user32
-)
-
-qt_internal_extend_target(WMFServicePlugin CONDITION TARGET Qt::Widgets
-    PUBLIC_LIBRARIES
-        Qt::Widgets
-)
diff --git a/src/plugins/wmf/decoder/mfdecoderservice.cpp b/src/plugins/wmf/decoder/mfdecoderservice.cpp
deleted file mode 100644
index eb2069a23..000000000
--- a/src/plugins/wmf/decoder/mfdecoderservice.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mfdecoderservice.h"
-#include "mfaudiodecodercontrol.h"
-
-MFAudioDecoderService::MFAudioDecoderService(QObject *parent)
-    : QMediaService(parent)
-{
-}
-
-MFAudioDecoderService::~MFAudioDecoderService()
-{
-}
-
-QObject *MFAudioDecoderService::requestControl(const char *name)
-{
-    if (qstrcmp(name, QAudioDecoderControl_iid) == 0) {
-        return new MFAudioDecoderControl(this);
-    }
-    return 0;
-}
-
-void MFAudioDecoderService::releaseControl(QObject *control)
-{
-    if (control && control->inherits("MFAudioDecoderControl")) {
-        delete control;
-    }
-}
diff --git a/src/plugins/wmf/decoder/mfdecoderservice.h b/src/plugins/wmf/decoder/mfdecoderservice.h
deleted file mode 100644
index 3749bc8df..000000000
--- a/src/plugins/wmf/decoder/mfdecoderservice.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MFDECODERSERVICE_H
-#define MFDECODERSERVICE_H
-
-#include "qmediaservice.h"
-
-class MFAudioDecoderService : public QMediaService
-{
-    Q_OBJECT
-public:
-    MFAudioDecoderService(QObject *parent = 0);
-    ~MFAudioDecoderService();
-
-    QObject *requestControl(const char *name);
-    void releaseControl(QObject *control);
-};
-
-#endif//MFDECODERSERVICE_H
diff --git a/src/plugins/wmf/wmf.json b/src/plugins/wmf/wmf.json
deleted file mode 100644
index e70736480..000000000
--- a/src/plugins/wmf/wmf.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "Keys": ["windowsmediafoundation"],
-    "Services": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiodecode"]
-}
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
deleted file mode 100644
index 7c712233d..000000000
--- a/src/plugins/wmf/wmf.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-TARGET = wmfengine
-QT += multimedia-private network
-
-win32:!qtHaveModule(opengl) {
-    LIBS_PRIVATE += -lgdi32 -luser32
-}
-
-INCLUDEPATH += .
-
-HEADERS += \
-    wmfserviceplugin.h \
-    mfstream.h \
-    sourceresolver.h
-
-SOURCES += \
-    wmfserviceplugin.cpp \
-    mfstream.cpp \
-    sourceresolver.cpp
-
-include (player/player.pri)
-include (decoder/decoder.pri)
-
-OTHER_FILES += \
-    wmf.json
-
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = WMFServicePlugin
-load(qt_plugin)
diff --git a/src/src.pro b/src/src.pro
index c1ed05164..110c18c42 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -12,6 +12,7 @@ src_qtmmwidgets.depends = multimedia
 src_plugins.subdir = plugins
 src_plugins.depends = multimedia
 
+android:SUBDIRS += android
 
 qtHaveModule(quick) {
     src_qtmultimediaquicktools.subdir = qtmultimediaquicktools