Restructure the source code a little.

Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

123 files changed, 195 insertions, 166 deletions

diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri
index 86c379d65..8c8daa5d1 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
@@ -1,17 +1,24 @@
 INCLUDEPATH += audio
 
-PUBLIC_HEADERS += audio/qaudio.h \
+PUBLIC_HEADERS += \
+           audio/qaudio.h \
            audio/qaudioformat.h \
            audio/qaudioinput.h \
            audio/qaudiooutput.h \
            audio/qaudiodeviceinfo.h \
            audio/qaudiosystemplugin.h \
-           audio/qaudiosystem.h 
+           audio/qaudiosystem.h  \
+           audio/qsoundeffect.h \
+           audio/qsound.h
 
-PRIVATE_HEADERS += audio/qaudiodevicefactory_p.h audio/qaudiopluginloader_p.h
+PRIVATE_HEADERS += \
+           audio/qaudiodevicefactory_p.h \
+           audio/qaudiopluginloader_p.h \
+           audio/qwavedecoder_p.h \
+           audio/qsamplecache_p.h
 
-
-SOURCES += audio/qaudio.cpp \
+SOURCES += \
+           audio/qaudio.cpp \
            audio/qaudioformat.cpp  \
            audio/qaudiodeviceinfo.cpp \
            audio/qaudiooutput.cpp \
@@ -19,7 +26,11 @@ SOURCES += audio/qaudio.cpp \
            audio/qaudiosystemplugin.cpp \
            audio/qaudiosystem.cpp \
            audio/qaudiodevicefactory.cpp \
-           audio/qaudiopluginloader.cpp
+           audio/qaudiopluginloader.cpp \
+           audio/qsoundeffect.cpp \
+           audio/qwavedecoder_p.cpp \
+           audio/qsamplecache_p.cpp \
+           audio/qsound.cpp
 
 mac {
     PRIVATE_HEADERS +=  audio/qaudioinput_mac_p.h \
@@ -46,15 +57,29 @@ win32 {
 unix:!mac {
     contains(config_test_pulseaudio, yes) {
         DEFINES += QT_NO_AUDIO_BACKEND
-    }
-    else:contains(config_test_alsa, yes) {
-        linux-*|freebsd-*|openbsd-* {
+        CONFIG += link_pkgconfig
+        PKGCONFIG += libpulse
+
+        DEFINES += QT_MULTIMEDIA_PULSEAUDIO
+        PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h
+        SOURCES += audio/qsoundeffect_pulse_p.cpp
+        !maemo*:DEFINES += QTM_PULSEAUDIO_DEFAULTBUFFER
+    } else {
+        DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
+        PRIVATE_HEADERS += audio/qsoundeffect_qmedia_p.h
+        SOURCES += audio/qsoundeffect_qmedia_p.cpp
+
+        contains(config_test_alsa, yes):linux-*|freebsd-*|openbsd-* {
             DEFINES += HAS_ALSA
             PRIVATE_HEADERS += audio/qaudiooutput_alsa_p.h audio/qaudioinput_alsa_p.h audio/qaudiodeviceinfo_alsa_p.h
             SOURCES += audio/qaudiodeviceinfo_alsa_p.cpp \
-                   audio/qaudiooutput_alsa_p.cpp \
-                   audio/qaudioinput_alsa_p.cpp
+                audio/qaudiooutput_alsa_p.cpp \
+                audio/qaudioinput_alsa_p.cpp
             LIBS_PRIVATE += -lasound
         }
     }
+} else {
+    DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
+    PRIVATE_HEADERS += audio/qsoundeffect_qmedia_p.h
+    SOURCES += audio/qsoundeffect_qmedia_p.cpp
 }
diff --git a/src/multimedia/effects/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp
index 1a06cd17e..1a06cd17e 100644
--- a/src/multimedia/effects/qsamplecache_p.cpp
+++ b/src/multimedia/audio/qsamplecache_p.cpp
diff --git a/src/multimedia/effects/qsamplecache_p.h b/src/multimedia/audio/qsamplecache_p.h
index 91ca457e6..91ca457e6 100644
--- a/src/multimedia/effects/qsamplecache_p.h
+++ b/src/multimedia/audio/qsamplecache_p.h
diff --git a/src/multimedia/effects/qsound.cpp b/src/multimedia/audio/qsound.cpp
index 3749764ca..3749764ca 100644
--- a/src/multimedia/effects/qsound.cpp
+++ b/src/multimedia/audio/qsound.cpp
diff --git a/src/multimedia/effects/qsound.h b/src/multimedia/audio/qsound.h
index c45ddb10f..c45ddb10f 100644
--- a/src/multimedia/effects/qsound.h
+++ b/src/multimedia/audio/qsound.h
diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index b1c359ef0..b1c359ef0 100644
--- a/src/multimedia/effects/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
diff --git a/src/multimedia/effects/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h
index f5df8328e..f5df8328e 100644
--- a/src/multimedia/effects/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
index 373586ef5..373586ef5 100644
--- a/src/multimedia/effects/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.h b/src/multimedia/audio/qsoundeffect_pulse_p.h
index 35b586e8d..35b586e8d 100644
--- a/src/multimedia/effects/qsoundeffect_pulse_p.h
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.h
diff --git a/src/multimedia/effects/qsoundeffect_qmedia_p.cpp b/src/multimedia/audio/qsoundeffect_qmedia_p.cpp
index 511aa06b5..511aa06b5 100644
--- a/src/multimedia/effects/qsoundeffect_qmedia_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_qmedia_p.cpp
diff --git a/src/multimedia/effects/qsoundeffect_qmedia_p.h b/src/multimedia/audio/qsoundeffect_qmedia_p.h
index bb91e50b0..bb91e50b0 100644
--- a/src/multimedia/effects/qsoundeffect_qmedia_p.h
+++ b/src/multimedia/audio/qsoundeffect_qmedia_p.h
diff --git a/src/multimedia/effects/qwavedecoder_p.cpp b/src/multimedia/audio/qwavedecoder_p.cpp
index eb65a3aca..eb65a3aca 100644
--- a/src/multimedia/effects/qwavedecoder_p.cpp
+++ b/src/multimedia/audio/qwavedecoder_p.cpp
diff --git a/src/multimedia/effects/qwavedecoder_p.h b/src/multimedia/audio/qwavedecoder_p.h
index 1a7bef945..1a7bef945 100644
--- a/src/multimedia/effects/qwavedecoder_p.h
+++ b/src/multimedia/audio/qwavedecoder_p.h
diff --git a/src/multimedia/camera/camera.pri b/src/multimedia/camera/camera.pri
new file mode 100644
index 000000000..be7868cd4
--- /dev/null
+++ b/src/multimedia/camera/camera.pri
@@ -0,0 +1,16 @@
+INCLUDEPATH += camera
+
+PUBLIC_HEADERS += \
+    camera/qcamera.h \
+    camera/qcameraimagecapture.h \
+    camera/qcameraexposure.h \
+    camera/qcamerafocus.h \
+    camera/qcameraimageprocessing.h
+
+SOURCES += \
+    camera/qcamera.cpp \
+    camera/qcameraexposure.cpp \
+    camera/qcamerafocus.cpp \
+    camera/qcameraimageprocessing.cpp \
+    camera/qcameraimagecapture.cpp
+
diff --git a/src/multimedia/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 8ba3aa6ee..8ba3aa6ee 100644
--- a/src/multimedia/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
diff --git a/src/multimedia/qcamera.h b/src/multimedia/camera/qcamera.h
index da009e161..da009e161 100644
--- a/src/multimedia/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
diff --git a/src/multimedia/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 5c75ad9e2..5c75ad9e2 100644
--- a/src/multimedia/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
diff --git a/src/multimedia/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index 088e7c036..088e7c036 100644
--- a/src/multimedia/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
diff --git a/src/multimedia/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 9b9caed9e..9b9caed9e 100644
--- a/src/multimedia/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
diff --git a/src/multimedia/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 064af7aa1..064af7aa1 100644
--- a/src/multimedia/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
diff --git a/src/multimedia/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index f49531e20..f49531e20 100644
--- a/src/multimedia/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
diff --git a/src/multimedia/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index bc4162287..bc4162287 100644
--- a/src/multimedia/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
diff --git a/src/multimedia/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 850606792..850606792 100644
--- a/src/multimedia/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
diff --git a/src/multimedia/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index 42a7eb589..42a7eb589 100644
--- a/src/multimedia/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
new file mode 100644
index 000000000..98137dc0f
--- /dev/null
+++ b/src/multimedia/controls/controls.pri
@@ -0,0 +1,60 @@
+
+INCLUDEPATH += controls
+
+PUBLIC_HEADERS += \
+    controls/qaudioencodercontrol.h \
+    controls/qcameracapturebufferformatcontrol.h \
+    controls/qcameracapturedestinationcontrol.h \
+    controls/qcameracontrol.h \
+    controls/qcameraexposurecontrol.h \
+    controls/qcameraflashcontrol.h \
+    controls/qcamerafocuscontrol.h \
+    controls/qcameraimagecapturecontrol.h \
+    controls/qcameraimageprocessingcontrol.h \
+    controls/qcameralockscontrol.h \
+    controls/qimageencodercontrol.h \
+    controls/qmediabackgroundplaybackcontrol.h \
+    controls/qmediacontainercontrol.h \
+    controls/qmediagaplessplaybackcontrol.h \
+    controls/qmedianetworkaccesscontrol.h \
+    controls/qmediaplayercontrol.h \
+    controls/qmediaplaylistcontrol.h \
+    controls/qmediaplaylistsourcecontrol.h \
+    controls/qmediarecordercontrol.h \
+    controls/qmediastreamscontrol.h \
+    controls/qmetadatareadercontrol.h \
+    controls/qmetadatawritercontrol.h \
+    controls/qradiodatacontrol.h \
+    controls/qradiotunercontrol.h \
+    controls/qvideodevicecontrol.h \
+    controls/qvideoencodercontrol.h \
+    controls/qvideorenderercontrol.h
+
+SOURCES += \
+    controls/qaudioencodercontrol.cpp \
+    controls/qcameracapturebufferformatcontrol.cpp \
+    controls/qcameracapturedestinationcontrol.cpp \
+    controls/qcameracontrol.cpp \
+    controls/qcameraexposurecontrol.cpp \
+    controls/qcameraflashcontrol.cpp \
+    controls/qcamerafocuscontrol.cpp \
+    controls/qcameraimagecapturecontrol.cpp \
+    controls/qcameraimageprocessingcontrol.cpp \
+    controls/qcameralockscontrol.cpp \
+    controls/qimageencodercontrol.cpp \
+    controls/qmediabackgroundplaybackcontrol.cpp \
+    controls/qmediacontainercontrol.cpp \
+    controls/qmediagaplessplaybackcontrol.cpp \
+    controls/qmedianetworkaccesscontrol.cpp \
+    controls/qmediaplayercontrol.cpp \
+    controls/qmediaplaylistcontrol.cpp \
+    controls/qmediaplaylistsourcecontrol.cpp \
+    controls/qmediarecordercontrol.cpp \
+    controls/qmediastreamscontrol.cpp \
+    controls/qmetadatareadercontrol.cpp \
+    controls/qmetadatawritercontrol.cpp \
+    controls/qradiodatacontrol.cpp \
+    controls/qradiotunercontrol.cpp \
+    controls/qvideodevicecontrol.cpp \
+    controls/qvideoencodercontrol.cpp \
+    controls/qvideorenderercontrol.cpp
diff --git a/src/multimedia/qaudioencodercontrol.cpp b/src/multimedia/controls/qaudioencodercontrol.cpp
index 62fa89371..62fa89371 100644
--- a/src/multimedia/qaudioencodercontrol.cpp
+++ b/src/multimedia/controls/qaudioencodercontrol.cpp
diff --git a/src/multimedia/qaudioencodercontrol.h b/src/multimedia/controls/qaudioencodercontrol.h
index 2e3a4bf87..2e3a4bf87 100644
--- a/src/multimedia/qaudioencodercontrol.h
+++ b/src/multimedia/controls/qaudioencodercontrol.h
diff --git a/src/multimedia/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
index 536c8b329..536c8b329 100644
--- a/src/multimedia/qcameracapturebufferformatcontrol.cpp
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
diff --git a/src/multimedia/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
index 81079a77d..81079a77d 100644
--- a/src/multimedia/qcameracapturebufferformatcontrol.h
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
diff --git a/src/multimedia/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
index 5072ae774..5072ae774 100644
--- a/src/multimedia/qcameracapturedestinationcontrol.cpp
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
diff --git a/src/multimedia/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h
index cdd769a4d..cdd769a4d 100644
--- a/src/multimedia/qcameracapturedestinationcontrol.h
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h
diff --git a/src/multimedia/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp
index df5c44cc1..df5c44cc1 100644
--- a/src/multimedia/qcameracontrol.cpp
+++ b/src/multimedia/controls/qcameracontrol.cpp
diff --git a/src/multimedia/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h
index dfc2b3743..dfc2b3743 100644
--- a/src/multimedia/qcameracontrol.h
+++ b/src/multimedia/controls/qcameracontrol.h
diff --git a/src/multimedia/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp
index 4a6f655f8..4a6f655f8 100644
--- a/src/multimedia/qcameraexposurecontrol.cpp
+++ b/src/multimedia/controls/qcameraexposurecontrol.cpp
diff --git a/src/multimedia/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h
index ff60784bf..ff60784bf 100644
--- a/src/multimedia/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
diff --git a/src/multimedia/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp
index 34dcbdeb5..34dcbdeb5 100644
--- a/src/multimedia/qcameraflashcontrol.cpp
+++ b/src/multimedia/controls/qcameraflashcontrol.cpp
diff --git a/src/multimedia/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h
index 89b3b9d06..89b3b9d06 100644
--- a/src/multimedia/qcameraflashcontrol.h
+++ b/src/multimedia/controls/qcameraflashcontrol.h
diff --git a/src/multimedia/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp
index 93c466814..93c466814 100644
--- a/src/multimedia/qcamerafocuscontrol.cpp
+++ b/src/multimedia/controls/qcamerafocuscontrol.cpp
diff --git a/src/multimedia/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h
index 20ffe6af1..20ffe6af1 100644
--- a/src/multimedia/qcamerafocuscontrol.h
+++ b/src/multimedia/controls/qcamerafocuscontrol.h
diff --git a/src/multimedia/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
index ad4c55edb..ad4c55edb 100644
--- a/src/multimedia/qcameraimagecapturecontrol.cpp
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
diff --git a/src/multimedia/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h
index 0459c1417..0459c1417 100644
--- a/src/multimedia/qcameraimagecapturecontrol.h
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.h
diff --git a/src/multimedia/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
index fb72a16fb..fb72a16fb 100644
--- a/src/multimedia/qcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
diff --git a/src/multimedia/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h
index 8c739287c..8c739287c 100644
--- a/src/multimedia/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h
diff --git a/src/multimedia/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp
index 289a07bf5..289a07bf5 100644
--- a/src/multimedia/qcameralockscontrol.cpp
+++ b/src/multimedia/controls/qcameralockscontrol.cpp
diff --git a/src/multimedia/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h
index 93120ee1a..93120ee1a 100644
--- a/src/multimedia/qcameralockscontrol.h
+++ b/src/multimedia/controls/qcameralockscontrol.h
diff --git a/src/multimedia/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp
index ee62a502d..ee62a502d 100644
--- a/src/multimedia/qimageencodercontrol.cpp
+++ b/src/multimedia/controls/qimageencodercontrol.cpp
diff --git a/src/multimedia/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h
index c8a8261a4..c8a8261a4 100644
--- a/src/multimedia/qimageencodercontrol.h
+++ b/src/multimedia/controls/qimageencodercontrol.h
diff --git a/src/multimedia/qmediabackgroundplaybackcontrol.cpp b/src/multimedia/controls/qmediabackgroundplaybackcontrol.cpp
index d7cbd380a..d7cbd380a 100644
--- a/src/multimedia/qmediabackgroundplaybackcontrol.cpp
+++ b/src/multimedia/controls/qmediabackgroundplaybackcontrol.cpp
diff --git a/src/multimedia/qmediabackgroundplaybackcontrol.h b/src/multimedia/controls/qmediabackgroundplaybackcontrol.h
index 2cf8d1935..2cf8d1935 100644
--- a/src/multimedia/qmediabackgroundplaybackcontrol.h
+++ b/src/multimedia/controls/qmediabackgroundplaybackcontrol.h
diff --git a/src/multimedia/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp
index 5a4e618f2..5a4e618f2 100644
--- a/src/multimedia/qmediacontainercontrol.cpp
+++ b/src/multimedia/controls/qmediacontainercontrol.cpp
diff --git a/src/multimedia/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h
index af48605d0..af48605d0 100644
--- a/src/multimedia/qmediacontainercontrol.h
+++ b/src/multimedia/controls/qmediacontainercontrol.h
diff --git a/src/multimedia/qmediagaplessplaybackcontrol.cpp b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp
index 84363e00c..84363e00c 100644
--- a/src/multimedia/qmediagaplessplaybackcontrol.cpp
+++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp
diff --git a/src/multimedia/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
index 1ee548d6a..1ee548d6a 100644
--- a/src/multimedia/qmediagaplessplaybackcontrol.h
+++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
diff --git a/src/multimedia/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
index a976859ed..a976859ed 100644
--- a/src/multimedia/qmedianetworkaccesscontrol.cpp
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
diff --git a/src/multimedia/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h
index 22ee95711..22ee95711 100644
--- a/src/multimedia/qmedianetworkaccesscontrol.h
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h
diff --git a/src/multimedia/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp
index 2585b044c..2585b044c 100644
--- a/src/multimedia/qmediaplayercontrol.cpp
+++ b/src/multimedia/controls/qmediaplayercontrol.cpp
diff --git a/src/multimedia/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h
index a6e02ee9a..a6e02ee9a 100644
--- a/src/multimedia/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
diff --git a/src/multimedia/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp
index dc2348956..dc2348956 100644
--- a/src/multimedia/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp
diff --git a/src/multimedia/qmediaplaylistcontrol.h b/src/multimedia/controls/qmediaplaylistcontrol.h
index 2cce448fa..2cce448fa 100644
--- a/src/multimedia/qmediaplaylistcontrol.h
+++ b/src/multimedia/controls/qmediaplaylistcontrol.h
diff --git a/src/multimedia/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
index 2ab8aee2c..2ab8aee2c 100644
--- a/src/multimedia/qmediaplaylistsourcecontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
diff --git a/src/multimedia/qmediaplaylistsourcecontrol.h b/src/multimedia/controls/qmediaplaylistsourcecontrol.h
index 040bb6431..040bb6431 100644
--- a/src/multimedia/qmediaplaylistsourcecontrol.h
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.h
diff --git a/src/multimedia/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp
index ffc51021b..ffc51021b 100644
--- a/src/multimedia/qmediarecordercontrol.cpp
+++ b/src/multimedia/controls/qmediarecordercontrol.cpp
diff --git a/src/multimedia/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h
index 26f244c08..26f244c08 100644
--- a/src/multimedia/qmediarecordercontrol.h
+++ b/src/multimedia/controls/qmediarecordercontrol.h
diff --git a/src/multimedia/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp
index fb624c67d..fb624c67d 100644
--- a/src/multimedia/qmediastreamscontrol.cpp
+++ b/src/multimedia/controls/qmediastreamscontrol.cpp
diff --git a/src/multimedia/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h
index bbd8a2a43..bbd8a2a43 100644
--- a/src/multimedia/qmediastreamscontrol.h
+++ b/src/multimedia/controls/qmediastreamscontrol.h
diff --git a/src/multimedia/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp
index 63dd375b0..63dd375b0 100644
--- a/src/multimedia/qmetadatareadercontrol.cpp
+++ b/src/multimedia/controls/qmetadatareadercontrol.cpp
diff --git a/src/multimedia/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h
index 0d370b5c4..0d370b5c4 100644
--- a/src/multimedia/qmetadatareadercontrol.h
+++ b/src/multimedia/controls/qmetadatareadercontrol.h
diff --git a/src/multimedia/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp
index 9d01662d7..9d01662d7 100644
--- a/src/multimedia/qmetadatawritercontrol.cpp
+++ b/src/multimedia/controls/qmetadatawritercontrol.cpp
diff --git a/src/multimedia/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h
index 3f8b8c3f4..3f8b8c3f4 100644
--- a/src/multimedia/qmetadatawritercontrol.h
+++ b/src/multimedia/controls/qmetadatawritercontrol.h
diff --git a/src/multimedia/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp
index 28b9a9973..28b9a9973 100644
--- a/src/multimedia/qradiodatacontrol.cpp
+++ b/src/multimedia/controls/qradiodatacontrol.cpp
diff --git a/src/multimedia/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h
index 487236c4a..487236c4a 100644
--- a/src/multimedia/qradiodatacontrol.h
+++ b/src/multimedia/controls/qradiodatacontrol.h
diff --git a/src/multimedia/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp
index 6e2b488a3..6e2b488a3 100644
--- a/src/multimedia/qradiotunercontrol.cpp
+++ b/src/multimedia/controls/qradiotunercontrol.cpp
diff --git a/src/multimedia/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h
index b0ea54250..b0ea54250 100644
--- a/src/multimedia/qradiotunercontrol.h
+++ b/src/multimedia/controls/qradiotunercontrol.h
diff --git a/src/multimedia/qvideodevicecontrol.cpp b/src/multimedia/controls/qvideodevicecontrol.cpp
index a864fd580..a864fd580 100644
--- a/src/multimedia/qvideodevicecontrol.cpp
+++ b/src/multimedia/controls/qvideodevicecontrol.cpp
diff --git a/src/multimedia/qvideodevicecontrol.h b/src/multimedia/controls/qvideodevicecontrol.h
index 6f44c4671..6f44c4671 100644
--- a/src/multimedia/qvideodevicecontrol.h
+++ b/src/multimedia/controls/qvideodevicecontrol.h
diff --git a/src/multimedia/qvideoencodercontrol.cpp b/src/multimedia/controls/qvideoencodercontrol.cpp
index 1551f2cf7..1551f2cf7 100644
--- a/src/multimedia/qvideoencodercontrol.cpp
+++ b/src/multimedia/controls/qvideoencodercontrol.cpp
diff --git a/src/multimedia/qvideoencodercontrol.h b/src/multimedia/controls/qvideoencodercontrol.h
index 343af8039..343af8039 100644
--- a/src/multimedia/qvideoencodercontrol.h
+++ b/src/multimedia/controls/qvideoencodercontrol.h
diff --git a/src/multimedia/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp
index 99142261a..99142261a 100644
--- a/src/multimedia/qvideorenderercontrol.cpp
+++ b/src/multimedia/controls/qvideorenderercontrol.cpp
diff --git a/src/multimedia/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h
index b3a70837c..b3a70837c 100644
--- a/src/multimedia/qvideorenderercontrol.h
+++ b/src/multimedia/controls/qvideorenderercontrol.h
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/effects/effects.pri
deleted file mode 100644
index 531a9b352..000000000
--- a/src/multimedia/effects/effects.pri
+++ /dev/null
@@ -1,37 +0,0 @@
-INCLUDEPATH += effects
-
-unix:!mac {
-   contains(config_test_pulseaudio, yes) {
-        CONFIG += link_pkgconfig
-        PKGCONFIG += libpulse
-
-        DEFINES += QT_MULTIMEDIA_PULSEAUDIO
-        PRIVATE_HEADERS += effects/qsoundeffect_pulse_p.h
-        SOURCES += effects/qsoundeffect_pulse_p.cpp
-        !maemo*:DEFINES += QTM_PULSEAUDIO_DEFAULTBUFFER
-    } else {
-        DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
-        PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
-        SOURCES += effects/qsoundeffect_qmedia_p.cpp
-    }
-} else {
-    DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
-    PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
-    SOURCES += effects/qsoundeffect_qmedia_p.cpp
-}
-
-PUBLIC_HEADERS += \
-        effects/qsoundeffect.h \
-        effects/qsound.h
-
-PRIVATE_HEADERS += \
-        effects/qwavedecoder_p.h \
-        effects/qsamplecache_p.h
-
-SOURCES += \
-    effects/qsoundeffect.cpp \
-    effects/qwavedecoder_p.cpp \
-    effects/qsamplecache_p.cpp \
-    effects/qsound.cpp
-
-HEADERS +=
diff --git a/src/multimedia/imageviewer/imageviewer.pri b/src/multimedia/imageviewer/imageviewer.pri
new file mode 100644
index 000000000..409615c7e
--- /dev/null
+++ b/src/multimedia/imageviewer/imageviewer.pri
@@ -0,0 +1,13 @@
+
+INCLUDEPATH += imageviewer
+
+PUBLIC_HEADERS += \
+    imageviewer/qmediaimageviewer.h
+
+PRIVATE_HEADERS += \
+    imageviewer/qmediaimageviewerservice_p.h
+
+SOURCES += \
+    imageviewer/qmediaimageviewer.cpp \
+    imageviewer/qmediaimageviewerservice.cpp
+
diff --git a/src/multimedia/qmediaimageviewer.cpp b/src/multimedia/imageviewer/qmediaimageviewer.cpp
index 562aad4d2..562aad4d2 100644
--- a/src/multimedia/qmediaimageviewer.cpp
+++ b/src/multimedia/imageviewer/qmediaimageviewer.cpp
diff --git a/src/multimedia/qmediaimageviewer.h b/src/multimedia/imageviewer/qmediaimageviewer.h
index 7010fad3f..7010fad3f 100644
--- a/src/multimedia/qmediaimageviewer.h
+++ b/src/multimedia/imageviewer/qmediaimageviewer.h
diff --git a/src/multimedia/qmediaimageviewerservice.cpp b/src/multimedia/imageviewer/qmediaimageviewerservice.cpp
index 94c6d2eef..94c6d2eef 100644
--- a/src/multimedia/qmediaimageviewerservice.cpp
+++ b/src/multimedia/imageviewer/qmediaimageviewerservice.cpp
diff --git a/src/multimedia/qmediaimageviewerservice_p.h b/src/multimedia/imageviewer/qmediaimageviewerservice_p.h
index d1b6956d9..d1b6956d9 100644
--- a/src/multimedia/qmediaimageviewerservice_p.h
+++ b/src/multimedia/imageviewer/qmediaimageviewerservice_p.h
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 120f8faf6..05213b0f9 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -19,141 +19,44 @@ load(qt_module_config)
 
 HEADERS += qtmultimediaversion.h
 
+INCLUDEPATH *= .
+
 PRIVATE_HEADERS += \
     qmediacontrol_p.h \
     qmediaobject_p.h \
-    qmediaservice_p.h  \
-    qmediaplaylist_p.h \
-    qmediaplaylistprovider_p.h \
-    qmediaimageviewerservice_p.h \
     qmediapluginloader_p.h \
-    qvideosurfaceoutput_p.h
+    qmediaservice_p.h \
 
 PUBLIC_HEADERS += \
+    qmediabindableinterface.h \
     qmediacontrol.h \
+    qmediaenumdebug.h \
     qmediaobject.h \
     qmediaservice.h \
-    qmediabindableinterface.h \
-    qlocalmediaplaylistprovider.h \
-    qmediaimageviewer.h \
-    qmediaplayer.h \
-    qmediaplayercontrol.h \
-    qmediaplaylist.h \
-    qmediaplaylistnavigator.h \
-    qmediaplaylistprovider.h \
-    qmediaplaylistioplugin.h \
-    qmediabackgroundplaybackcontrol.h \
-    qmediacontent.h \
-    qmediaresource.h \
-    qmediarecorder.h \
-    qmediaencodersettings.h \
-    qmediarecordercontrol.h \
     qmediaserviceprovider.h \
     qmediaserviceproviderplugin.h \
-    qmetadatareadercontrol.h \
-    qmetadatawritercontrol.h \
-    qmediastreamscontrol.h \
-    qradiotuner.h \
-    qradiodata.h \
-    qradiotunercontrol.h \
-    qradiodatacontrol.h \
-    qtmedianamespace.h \
-    qaudioencodercontrol.h \
-    qvideoencodercontrol.h \
-    qimageencodercontrol.h \
-    qaudiocapturesource.h \
-    qmediacontainercontrol.h \
-    qmediaplaylistcontrol.h \
-    qmediaplaylistsourcecontrol.h \
-    qaudioendpointselector.h \
-    qvideodevicecontrol.h \
-    qvideorenderercontrol.h \
     qmediatimerange.h \
-    qmedianetworkaccesscontrol.h \
-    qmediaenumdebug.h \
+    qtmedianamespace.h \
     qtmultimediadefs.h \
-    qmediagaplessplaybackcontrol.h
 
-SOURCES += qmediacontrol.cpp \
+SOURCES += \
+    qmediabindableinterface.cpp \
+    qmediacontrol.cpp \
     qmediaobject.cpp \
+    qmediapluginloader.cpp \
     qmediaservice.cpp \
-    qmediabindableinterface.cpp \
-    qlocalmediaplaylistprovider.cpp \
-    qmediaimageviewer.cpp \
-    qmediaimageviewerservice.cpp \
-    qmediaplayer.cpp \
-    qmediaplayercontrol.cpp \
-    qmediaplaylist.cpp \
-    qmediaplaylistioplugin.cpp \
-    qmediaplaylistnavigator.cpp \
-    qmediaplaylistprovider.cpp \
-    qmediarecorder.cpp \
-    qmediaencodersettings.cpp \
-    qmediarecordercontrol.cpp \
-    qmediacontent.cpp \
-    qmediaresource.cpp \
     qmediaserviceprovider.cpp \
-    qmetadatareadercontrol.cpp \
-    qmetadatawritercontrol.cpp \
-    qmediastreamscontrol.cpp \
-    qradiotuner.cpp \
-    qradiodata.cpp \
-    qradiotunercontrol.cpp \
-    qradiodatacontrol.cpp \
-    qaudioencodercontrol.cpp \
-    qvideoencodercontrol.cpp \
-    qimageencodercontrol.cpp \
-    qaudiocapturesource.cpp \
-    qmediacontainercontrol.cpp \
-    qmediaplaylistcontrol.cpp \
-    qmediaplaylistsourcecontrol.cpp \
-    qaudioendpointselector.cpp \
-    qvideodevicecontrol.cpp \
-    qmediapluginloader.cpp \
-    qvideorenderercontrol.cpp \
     qmediatimerange.cpp \
-    qmedianetworkaccesscontrol.cpp \
-    qvideosurfaceoutput.cpp \
-    qmediabackgroundplaybackcontrol.cpp \
-    qtmedianamespace.cpp \
-    qmediagaplessplaybackcontrol.cpp
-
-#Camera
-PUBLIC_HEADERS += \
-    qcamera.h \
-    qcameraimagecapture.h \
-    qcameraimagecapturecontrol.h \
-    qcameraexposure.h \
-    qcamerafocus.h \
-    qcameraimageprocessing.h \
-    qcameracontrol.h \
-    qcameralockscontrol.h \
-    qcameraexposurecontrol.h \
-    qcamerafocuscontrol.h \
-    qcameraflashcontrol.h \
-    qcameraimageprocessingcontrol.h \
-    qcameracapturedestinationcontrol.h \
-    qcameracapturebufferformatcontrol.h
-
-SOURCES += \
-    qcamera.cpp \
-    qcameraexposure.cpp \
-    qcamerafocus.cpp \
-    qcameraimageprocessing.cpp \
-    qcameraimagecapture.cpp \
-    qcameraimagecapturecontrol.cpp \
-    qcameracontrol.cpp \
-    qcameralockscontrol.cpp \
-    qcameraexposurecontrol.cpp \
-    qcamerafocuscontrol.cpp \
-    qcameraflashcontrol.cpp \
-    qcameraimageprocessingcontrol.cpp \
-    qcameracapturedestinationcontrol.cpp \
-    qcameracapturebufferformatcontrol.cpp
+    qtmedianamespace.cpp
 
 include(audio/audio.pri)
+include(camera/camera.pri)
+include(controls/controls.pri)
+include(imageviewer/imageviewer.pri)
+include(playback/playback.pri)
+include(radio/radio.pri)
+include(recording/recording.pri)
 include(video/video.pri)
-include(effects/effects.pri)
 
 mac {
    LIBS += -framework AppKit -framework QuartzCore -framework QTKit
diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/playback/playback.pri
new file mode 100644
index 000000000..f43f608f1
--- /dev/null
+++ b/src/multimedia/playback/playback.pri
@@ -0,0 +1,27 @@
+INCLUDEPATH += playback
+
+PUBLIC_HEADERS += \
+    playback/qaudioendpointselector.h \
+    playback/qlocalmediaplaylistprovider.h \
+    playback/qmediacontent.h \
+    playback/qmediaplayer.h \
+    playback/qmediaplaylist.h \
+    playback/qmediaplaylistioplugin.h \
+    playback/qmediaplaylistnavigator.h \
+    playback/qmediaplaylistprovider.h \
+    playback/qmediaresource.h
+
+PRIVATE_HEADERS += \
+    playback/qmediaplaylist_p.h \
+    playback/qmediaplaylistprovider_p.h
+
+SOURCES += \
+    playback/qaudioendpointselector.cpp \
+    playback/qlocalmediaplaylistprovider.cpp \
+    playback/qmediacontent.cpp \
+    playback/qmediaplayer.cpp \
+    playback/qmediaplaylist.cpp \
+    playback/qmediaplaylistioplugin.cpp \
+    playback/qmediaplaylistnavigator.cpp \
+    playback/qmediaplaylistprovider.cpp \
+    playback/qmediaresource.cpp
diff --git a/src/multimedia/qaudioendpointselector.cpp b/src/multimedia/playback/qaudioendpointselector.cpp
index ba02c8d15..ba02c8d15 100644
--- a/src/multimedia/qaudioendpointselector.cpp
+++ b/src/multimedia/playback/qaudioendpointselector.cpp
diff --git a/src/multimedia/qaudioendpointselector.h b/src/multimedia/playback/qaudioendpointselector.h
index 00250bc54..00250bc54 100644
--- a/src/multimedia/qaudioendpointselector.h
+++ b/src/multimedia/playback/qaudioendpointselector.h
diff --git a/src/multimedia/qlocalmediaplaylistprovider.cpp b/src/multimedia/playback/qlocalmediaplaylistprovider.cpp
index 84d54ecfd..84d54ecfd 100644
--- a/src/multimedia/qlocalmediaplaylistprovider.cpp
+++ b/src/multimedia/playback/qlocalmediaplaylistprovider.cpp
diff --git a/src/multimedia/qlocalmediaplaylistprovider.h b/src/multimedia/playback/qlocalmediaplaylistprovider.h
index e712a3f73..e712a3f73 100644
--- a/src/multimedia/qlocalmediaplaylistprovider.h
+++ b/src/multimedia/playback/qlocalmediaplaylistprovider.h
diff --git a/src/multimedia/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp
index 373710cec..373710cec 100644
--- a/src/multimedia/qmediacontent.cpp
+++ b/src/multimedia/playback/qmediacontent.cpp
diff --git a/src/multimedia/qmediacontent.h b/src/multimedia/playback/qmediacontent.h
index cfd109d84..cfd109d84 100644
--- a/src/multimedia/qmediacontent.h
+++ b/src/multimedia/playback/qmediacontent.h
diff --git a/src/multimedia/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 312122d56..312122d56 100644
--- a/src/multimedia/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
diff --git a/src/multimedia/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index f53b50ceb..f53b50ceb 100644
--- a/src/multimedia/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
index 1b6959c66..1b6959c66 100644
--- a/src/multimedia/qmediaplaylist.cpp
+++ b/src/multimedia/playback/qmediaplaylist.cpp
diff --git a/src/multimedia/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
index 7b4b62260..7b4b62260 100644
--- a/src/multimedia/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
diff --git a/src/multimedia/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h
index c04483c02..c04483c02 100644
--- a/src/multimedia/qmediaplaylist_p.h
+++ b/src/multimedia/playback/qmediaplaylist_p.h
diff --git a/src/multimedia/qmediaplaylistioplugin.cpp b/src/multimedia/playback/qmediaplaylistioplugin.cpp
index 80fe0ef6b..80fe0ef6b 100644
--- a/src/multimedia/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/playback/qmediaplaylistioplugin.cpp
diff --git a/src/multimedia/qmediaplaylistioplugin.h b/src/multimedia/playback/qmediaplaylistioplugin.h
index 97ded8b43..97ded8b43 100644
--- a/src/multimedia/qmediaplaylistioplugin.h
+++ b/src/multimedia/playback/qmediaplaylistioplugin.h
diff --git a/src/multimedia/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index d78e6ef42..d78e6ef42 100644
--- a/src/multimedia/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
diff --git a/src/multimedia/qmediaplaylistnavigator.h b/src/multimedia/playback/qmediaplaylistnavigator.h
index 72e452072..72e452072 100644
--- a/src/multimedia/qmediaplaylistnavigator.h
+++ b/src/multimedia/playback/qmediaplaylistnavigator.h
diff --git a/src/multimedia/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp
index 75e927b39..75e927b39 100644
--- a/src/multimedia/qmediaplaylistprovider.cpp
+++ b/src/multimedia/playback/qmediaplaylistprovider.cpp
diff --git a/src/multimedia/qmediaplaylistprovider.h b/src/multimedia/playback/qmediaplaylistprovider.h
index 79167e8ba..79167e8ba 100644
--- a/src/multimedia/qmediaplaylistprovider.h
+++ b/src/multimedia/playback/qmediaplaylistprovider.h
diff --git a/src/multimedia/qmediaplaylistprovider_p.h b/src/multimedia/playback/qmediaplaylistprovider_p.h
index 71fb86f20..71fb86f20 100644
--- a/src/multimedia/qmediaplaylistprovider_p.h
+++ b/src/multimedia/playback/qmediaplaylistprovider_p.h
diff --git a/src/multimedia/qmediaresource.cpp b/src/multimedia/playback/qmediaresource.cpp
index 9bd488786..9bd488786 100644
--- a/src/multimedia/qmediaresource.cpp
+++ b/src/multimedia/playback/qmediaresource.cpp
diff --git a/src/multimedia/qmediaresource.h b/src/multimedia/playback/qmediaresource.h
index b06c61dcb..b06c61dcb 100644
--- a/src/multimedia/qmediaresource.h
+++ b/src/multimedia/playback/qmediaresource.h
diff --git a/src/multimedia/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp
index bb9032fdd..bb9032fdd 100644
--- a/src/multimedia/qradiodata.cpp
+++ b/src/multimedia/radio/qradiodata.cpp
diff --git a/src/multimedia/qradiodata.h b/src/multimedia/radio/qradiodata.h
index 71ae222b8..71ae222b8 100644
--- a/src/multimedia/qradiodata.h
+++ b/src/multimedia/radio/qradiodata.h
diff --git a/src/multimedia/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index 66b0c7048..66b0c7048 100644
--- a/src/multimedia/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
diff --git a/src/multimedia/qradiotuner.h b/src/multimedia/radio/qradiotuner.h
index 21497f45c..21497f45c 100644
--- a/src/multimedia/qradiotuner.h
+++ b/src/multimedia/radio/qradiotuner.h
diff --git a/src/multimedia/radio/radio.pri b/src/multimedia/radio/radio.pri
new file mode 100644
index 000000000..41e43faa2
--- /dev/null
+++ b/src/multimedia/radio/radio.pri
@@ -0,0 +1,9 @@
+INCLUDEPATH += radio
+
+PUBLIC_HEADERS += \
+    radio/qradiodata.h \
+    radio/qradiotuner.h
+
+SOURCES += \
+    radio/qradiodata.cpp \
+    radio/qradiotuner.cpp
diff --git a/src/multimedia/qaudiocapturesource.cpp b/src/multimedia/recording/qaudiocapturesource.cpp
index 469617123..469617123 100644
--- a/src/multimedia/qaudiocapturesource.cpp
+++ b/src/multimedia/recording/qaudiocapturesource.cpp
diff --git a/src/multimedia/qaudiocapturesource.h b/src/multimedia/recording/qaudiocapturesource.h
index 1571b4e8a..1571b4e8a 100644
--- a/src/multimedia/qaudiocapturesource.h
+++ b/src/multimedia/recording/qaudiocapturesource.h
diff --git a/src/multimedia/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp
index 5f85eec37..5f85eec37 100644
--- a/src/multimedia/qmediaencodersettings.cpp
+++ b/src/multimedia/recording/qmediaencodersettings.cpp
diff --git a/src/multimedia/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h
index 28bf6d6c8..28bf6d6c8 100644
--- a/src/multimedia/qmediaencodersettings.h
+++ b/src/multimedia/recording/qmediaencodersettings.h
diff --git a/src/multimedia/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 6be462df8..6be462df8 100644
--- a/src/multimedia/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
diff --git a/src/multimedia/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index fbd47ddde..fbd47ddde 100644
--- a/src/multimedia/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
diff --git a/src/multimedia/recording/recording.pri b/src/multimedia/recording/recording.pri
new file mode 100644
index 000000000..b55999a02
--- /dev/null
+++ b/src/multimedia/recording/recording.pri
@@ -0,0 +1,11 @@
+INCLUDEPATH += recording
+
+PUBLIC_HEADERS += \
+    recording/qaudiocapturesource.h \
+    recording/qmediaencodersettings.h \
+    recording/qmediarecorder.h \
+
+SOURCES += \
+    recording/qaudiocapturesource.cpp \
+    recording/qmediaencodersettings.cpp \
+    recording/qmediarecorder.cpp
diff --git a/src/multimedia/qvideosurfaceoutput.cpp b/src/multimedia/video/qvideosurfaceoutput.cpp
index cdbec5596..cdbec5596 100644
--- a/src/multimedia/qvideosurfaceoutput.cpp
+++ b/src/multimedia/video/qvideosurfaceoutput.cpp
diff --git a/src/multimedia/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h
index 76ec5e84d..76ec5e84d 100644
--- a/src/multimedia/qvideosurfaceoutput_p.h
+++ b/src/multimedia/video/qvideosurfaceoutput_p.h
diff --git a/src/multimedia/video/video.pri b/src/multimedia/video/video.pri
index accaa3371..01550a8ec 100644
--- a/src/multimedia/video/video.pri
+++ b/src/multimedia/video/video.pri
@@ -10,7 +10,8 @@ PUBLIC_HEADERS += \
 PRIVATE_HEADERS += \
     video/qabstractvideobuffer_p.h \
     video/qimagevideobuffer_p.h \
-    video/qmemoryvideobuffer_p.h
+    video/qmemoryvideobuffer_p.h \
+    video/qvideosurfaceoutput_p.h
 
 SOURCES += \
     video/qabstractvideobuffer.cpp \
@@ -18,5 +19,6 @@ SOURCES += \
     video/qimagevideobuffer.cpp \
     video/qmemoryvideobuffer.cpp \
     video/qvideoframe.cpp \
-    video/qvideosurfaceformat.cpp
+    video/qvideosurfaceformat.cpp \
+    video/qvideosurfaceoutput.cpp
 
diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
index 7428c5c3e..172a6de54 100644
--- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qwavedecoder
-HEADERS += $$QT.multimedia.sources/effects/qwavedecoder_p.h
+HEADERS += $$QT.multimedia.sources/audio/qwavedecoder_p.h
 SOURCES += tst_qwavedecoder.cpp \
-           $$QT.multimedia.sources/effects/qwavedecoder_p.cpp
+           $$QT.multimedia.sources/audio/qwavedecoder_p.cpp
 
 QT += multimedia-private testlib network
 CONFIG += no_private_qt_headers_warning testcase