move all libraries to src/ subdir

659 files changed, 282 insertions, 280 deletions

diff --git a/configure b/configure
index 77acba0e55..a2f5fec4f1 100755
--- a/configure
+++ b/configure
@@ -293,14 +293,14 @@ echo "Generating Mobility Headers..."
 #remove old headers
 rm -rf $shadowpath/include
 mkdir $shadowpath/include
-$relpath/bin/syncheaders $shadowpath/include $relpath/bearer
-$relpath/bin/syncheaders $shadowpath/include $relpath/context
-$relpath/bin/syncheaders $shadowpath/include $relpath/location
-$relpath/bin/syncheaders $shadowpath/include $relpath/serviceframework
-$relpath/bin/syncheaders $shadowpath/include $relpath/systeminfo
-$relpath/bin/syncheaders $shadowpath/include $relpath/contacts
-$relpath/bin/syncheaders $shadowpath/include $relpath/multimedia
-$relpath/bin/syncheaders $shadowpath/include $relpath/messaging
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/bearer
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/context
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/location
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/serviceframework
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/systeminfo
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/multimedia
+$relpath/bin/syncheaders $shadowpath/include $relpath/src/messaging
 
 mv "$CONFIG_IN" config.pri
 mkdir -p "$shadowpath/features"
diff --git a/configure.bat b/configure.bat
index dfeae3868d..41a8feb7cd 100644
--- a/configure.bat
+++ b/configure.bat
@@ -258,14 +258,14 @@ if not exist "%BUILD_PATH%\features" mkdir %BUILD_PATH%\features
 echo "Generating Mobility Headers..."
 rd /s /q %BUILD_PATH%\include
 mkdir %BUILD_PATH%\include
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\bearer
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\context
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\location
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\serviceframework
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\systeminfo
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\contacts
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\multimedia
-perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\messaging
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\bearer
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\context
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\location
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\serviceframework
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\systeminfo
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\contacts
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia
+perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\messaging
 
 echo.
 echo Running qmake...
diff --git a/doc/src/qtmobility.qdocconf b/doc/src/qtmobility.qdocconf
index 9c14d37849..02e9ceed50 100644
--- a/doc/src/qtmobility.qdocconf
+++ b/doc/src/qtmobility.qdocconf
@@ -3,24 +3,24 @@ description = Qt Mobility Library Reference Documentation
 
 imagedirs = images
 
-headerdirs = ../../bearer \
-             ../../serviceframework \
-             ../../location \
-             ../../context \
-             ../../systeminfo \
-             ../../contacts \
-             ../../multimedia \
-             ../../messaging \
+headerdirs = ../../src/bearer \
+             ../../src/serviceframework \
+             ../../src/location \
+             ../../src/context \
+             ../../src/systeminfo \
+             ../../src/contacts \
+             ../../src/multimedia \
+             ../../src/messaging \
              .
 
-sourcedirs = ../../bearer \
-             ../../serviceframework \
-             ../../location \
-             ../../context \
-             ../../systeminfo \
-             ../../contacts \
-             ../../multimedia \
-             ../../messaging \
+sourcedirs = ../../src/bearer \
+             ../../src/serviceframework \
+             ../../src/location \
+             ../../src/context \
+             ../../src/systeminfo \
+             ../../src/contacts \
+             ../../src/multimedia \
+             ../../src/messaging \
              .
 
 exampledirs = ../../examples \
diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro
index ac69b01bb2..09e3af145f 100644
--- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro
+++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro
@@ -7,10 +7,10 @@
 TEMPLATE = app
 TARGET = qtcontactsdocsample
 include(../../../../common.pri)
-INCLUDEPATH += ../../../../contacts \
-                ../../../../contacts/requests \
-                ../../../../contacts/filters \
-                ../../../../contacts/details
+INCLUDEPATH += ../../../../src/contacts \
+                ../../../../src/contacts/requests \
+                ../../../../src/contacts/filters \
+                ../../../../src/contacts/details
 
 DESTDIR = $$QT_MOBILITY_BUILD_TREE/bin/examples
 QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib
diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro
index 48b60e0f70..83358990b9 100644
--- a/examples/audiorecorder/audiorecorder.pro
+++ b/examples/audiorecorder/audiorecorder.pro
@@ -3,7 +3,7 @@ CONFIG += example
 
 contains(QT_CONFIG, multimedia): QT += multimedia
 
-INCLUDEPATH += ../../multimedia ../../multimedia/endpoints
+INCLUDEPATH += ../../src/multimedia
 include(../examples.pri)
 
 qtAddLibrary(QtMedia)
diff --git a/examples/battery-charge/battery-consumer/battery-consumer.pro b/examples/battery-charge/battery-consumer/battery-consumer.pro
index 70209552a4..543832b47d 100644
--- a/examples/battery-charge/battery-consumer/battery-consumer.pro
+++ b/examples/battery-charge/battery-consumer/battery-consumer.pro
@@ -1,8 +1,8 @@
 TEMPLATE = app
 TARGET = battery-consumer
 QT += declarative
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 include(../../examples.pri)
 qtAddLibrary(QtPublishSubscribe)
 SOURCES = main.cpp
diff --git a/examples/battery-charge/battery-provider/battery-provider.pro b/examples/battery-charge/battery-provider/battery-provider.pro
index 3225e909ea..5dfcec9d0b 100644
--- a/examples/battery-charge/battery-provider/battery-provider.pro
+++ b/examples/battery-charge/battery-provider/battery-provider.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = battery-provider
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 
 HEADERS = batteryprovider.h
 
diff --git a/examples/bearercloud/bearercloud.pro b/examples/bearercloud/bearercloud.pro
index 80d775ea91..27f9a71c27 100644
--- a/examples/bearercloud/bearercloud.pro
+++ b/examples/bearercloud/bearercloud.pro
@@ -11,7 +11,7 @@ TARGET = bearercloud
 
 QT = core gui network svg
 
-INCLUDEPATH += ../../bearer
+INCLUDEPATH += ../../src/bearer
 
 include(../examples.pri)
 
diff --git a/examples/bearermonitor/bearermonitor.pro b/examples/bearermonitor/bearermonitor.pro
index 8af4738cb6..8d1f6733f8 100644
--- a/examples/bearermonitor/bearermonitor.pro
+++ b/examples/bearermonitor/bearermonitor.pro
@@ -13,7 +13,7 @@ TARGET = bearermonitor
 
 QT = core gui network
 
-INCLUDEPATH += ../../bearer
+INCLUDEPATH += ../../src/bearer
 
 include(../examples.pri)
 
diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
index 4a9d673935..7329503c0c 100644
--- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
+++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-INCLUDEPATH += ../../serviceframework
+INCLUDEPATH += ../../src/serviceframework
 HEADERS += bluetoothtransferplugin.h \
            bluetoothtransfer.h
 SOURCES += bluetoothtransferplugin.cpp \
diff --git a/examples/cameracapture/cameracapture.pro b/examples/cameracapture/cameracapture.pro
index 5d9953bcce..f27c764163 100644
--- a/examples/cameracapture/cameracapture.pro
+++ b/examples/cameracapture/cameracapture.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = cameracapture
 
-INCLUDEPATH+=../../multimedia
+INCLUDEPATH+=../../src/multimedia
 include(../examples.pri)
 
 qtAddLibrary(QtMedia)
diff --git a/examples/declarative/demo/demo.pro b/examples/declarative/demo/demo.pro
index d19d32310b..c6fd190e84 100644
--- a/examples/declarative/demo/demo.pro
+++ b/examples/declarative/demo/demo.pro
@@ -1,6 +1,6 @@
 TEMPLATE=app
 TARGET=sfw-kinetic-example
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 include(../../examples.pri)
 
diff --git a/examples/declarative/landlinedialer/landlinedialer.pro b/examples/declarative/landlinedialer/landlinedialer.pro
index 79aa1cadad..038a982f29 100644
--- a/examples/declarative/landlinedialer/landlinedialer.pro
+++ b/examples/declarative/landlinedialer/landlinedialer.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 TARGET = serviceframework_landlinedialerservice
 include(../../../common.pri)
 
diff --git a/examples/declarative/voipdialer/voipdialer.pro b/examples/declarative/voipdialer/voipdialer.pro
index 0fcdbe451b..c62628472d 100644
--- a/examples/declarative/voipdialer/voipdialer.pro
+++ b/examples/declarative/voipdialer/voipdialer.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 TARGET = serviceframework_voipdialerservice
 include(../../../common.pri)
 
diff --git a/examples/fetchgooglemaps/fetchgooglemaps.pro b/examples/fetchgooglemaps/fetchgooglemaps.pro
index e9a1e5c1e4..bb2534322a 100644
--- a/examples/fetchgooglemaps/fetchgooglemaps.pro
+++ b/examples/fetchgooglemaps/fetchgooglemaps.pro
@@ -1,5 +1,5 @@
 TEMPLATE=app
-INCLUDEPATH += ../../location
+INCLUDEPATH += ../../src/location
 
 QT += webkit network
 
diff --git a/examples/filemanagerplugin/filemanagerplugin.pro b/examples/filemanagerplugin/filemanagerplugin.pro
index 3ff9262d64..1d66a01ef8 100644
--- a/examples/filemanagerplugin/filemanagerplugin.pro
+++ b/examples/filemanagerplugin/filemanagerplugin.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-INCLUDEPATH += ../../serviceframework
+INCLUDEPATH += ../../src/serviceframework
 HEADERS += filemanagerplugin.h \
            filemanagerstorage.h \
            filemanagertransfer.h
diff --git a/examples/incomingcalls/incomingcalls.pro b/examples/incomingcalls/incomingcalls.pro
index 3fa5364b11..880ef6d8c9 100644
--- a/examples/incomingcalls/incomingcalls.pro
+++ b/examples/incomingcalls/incomingcalls.pro
@@ -7,10 +7,10 @@
 TEMPLATE = app
 TARGET = incomingcalls
 DEPENDPATH += .
-INCLUDEPATH += . ../../contacts \
-               ../../contacts/details \
-               ../../contacts/requests \
-               ../../contacts/filters
+INCLUDEPATH += . ../../src/contacts \
+               ../../src/contacts/details \
+               ../../src/contacts/requests \
+               ../../src/contacts/filters
 
 
 qtAddLibrary(QtContacts)
diff --git a/examples/keepintouch/keepintouch.pro b/examples/keepintouch/keepintouch.pro
index 1665f21851..341be9e70a 100644
--- a/examples/keepintouch/keepintouch.pro
+++ b/examples/keepintouch/keepintouch.pro
@@ -6,7 +6,7 @@ QT += gui
 include(../examples.pri)
 
 qtAddLibrary(QtMessaging)
-INCLUDEPATH += ../../messaging
+INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
 } else {
diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro
index e85d6e9187..05e15a4927 100644
--- a/examples/logfilepositionsource/logfilepositionsource.pro
+++ b/examples/logfilepositionsource/logfilepositionsource.pro
@@ -1,5 +1,5 @@
 TEMPLATE=app
-INCLUDEPATH += ../../location
+INCLUDEPATH += ../../src/location
 
 HEADERS = logfilepositionsource.h \
           clientapplication.h
diff --git a/examples/player/player.pro b/examples/player/player.pro
index f283436870..980e7ab579 100644
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = player
 
-INCLUDEPATH += ../../multimedia
+INCLUDEPATH += ../../src/multimedia
 
 include(../examples.pri)
 qtAddLibrary(QtMedia)
diff --git a/examples/publish-subscribe/publish-subscribe.pro b/examples/publish-subscribe/publish-subscribe.pro
index b21502c8d8..7c53aa906d 100644
--- a/examples/publish-subscribe/publish-subscribe.pro
+++ b/examples/publish-subscribe/publish-subscribe.pro
@@ -1,8 +1,8 @@
 TEMPLATE = app
 TARGET = publish-subscribe
 
-INCLUDEPATH += ../../context
-DEPENDPATH += ../../context
+INCLUDEPATH += ../../src/publishsubscribe
+DEPENDPATH += ../../src/publishsubscribe
 
 HEADERS = providerdialog.h \
           consumerdialog.h
diff --git a/examples/querymessages/querymessages.pro b/examples/querymessages/querymessages.pro
index e40f42e612..0c1c0c263b 100644
--- a/examples/querymessages/querymessages.pro
+++ b/examples/querymessages/querymessages.pro
@@ -6,7 +6,7 @@ QT += gui
 include(../examples.pri)
 
 qtAddLibrary(QtMessaging)
-INCLUDEPATH += ../../messaging
+INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
 } else {
diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro
index b4ecc060d4..8029a46da3 100644
--- a/examples/radio/radio.pro
+++ b/examples/radio/radio.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 CONFIG += example
 
-INCLUDEPATH += ../../multimedia ../../multimedia/endpoints
+INCLUDEPATH += ../../src/multimedia
 include(../examples.pri)
 
 qtAddLibrary(QtMedia)
diff --git a/examples/recorder/recorder.pro b/examples/recorder/recorder.pro
index 394bb54769..45410bf93d 100644
--- a/examples/recorder/recorder.pro
+++ b/examples/recorder/recorder.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = recorder
 
-INCLUDEPATH+=../../multimedia
+INCLUDEPATH+=../../src/multimedia
 include(../examples.pri)
 
 qtAddLibrary(QtMedia)
diff --git a/examples/samplephonebook/samplephonebook.pro b/examples/samplephonebook/samplephonebook.pro
index 2859cef798..0906f2d64a 100644
--- a/examples/samplephonebook/samplephonebook.pro
+++ b/examples/samplephonebook/samplephonebook.pro
@@ -8,10 +8,10 @@ TEMPLATE = app
 TARGET = samplephonebook
 DEPENDPATH += .
 INCLUDEPATH += . \
-               ../../contacts\
-               ../../contacts/filters \
-               ../../contacts/requests \
-               ../../contacts/details 
+               ../../src/contacts\
+               ../../src/contacts/filters \
+               ../../src/contacts/requests \
+               ../../src/contacts/details 
 
 INCLUDEPATH += ../testmodel
 VPATH += ../testmodel
diff --git a/examples/sendmessage/sendmessage.pro b/examples/sendmessage/sendmessage.pro
index 4274f148f0..dadf8357d4 100644
--- a/examples/sendmessage/sendmessage.pro
+++ b/examples/sendmessage/sendmessage.pro
@@ -6,7 +6,7 @@ QT += gui
 include(../examples.pri)
 
 qtAddLibrary(QtMessaging)
-INCLUDEPATH += ../../messaging
+INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
 } else {
diff --git a/examples/serviceactions/serviceactions.pro b/examples/serviceactions/serviceactions.pro
index e9548f7140..479d352469 100644
--- a/examples/serviceactions/serviceactions.pro
+++ b/examples/serviceactions/serviceactions.pro
@@ -6,7 +6,7 @@ QT += gui
 include(../examples.pri)
 
 qtAddLibrary(QtMessaging)
-INCLUDEPATH += ../../messaging
+INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
 } else {
diff --git a/examples/servicebrowser/servicebrowser.pro b/examples/servicebrowser/servicebrowser.pro
index b44b75dd03..ddf8bf6006 100644
--- a/examples/servicebrowser/servicebrowser.pro
+++ b/examples/servicebrowser/servicebrowser.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = servicebrowser
-INCLUDEPATH += ../../serviceframework
+INCLUDEPATH += ../../src/serviceframework
 
 include(../examples.pri)
 
diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro
index fbe98c35af..a41c1f6895 100644
--- a/examples/slideshow/slideshow.pro
+++ b/examples/slideshow/slideshow.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = slideshow
-INCLUDEPATH+=../../multimedia
+INCLUDEPATH+=../../src/multimedia
 include (../examples.pri)
 
 qtAddLibrary(QtMedia)
diff --git a/examples/streamplayer/streamplayer.pro b/examples/streamplayer/streamplayer.pro
index 4becbf4e58..7dd76213a2 100644
--- a/examples/streamplayer/streamplayer.pro
+++ b/examples/streamplayer/streamplayer.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET=streamplayer
 
-INCLUDEPATH+=../../multimedia
+INCLUDEPATH+=../../src/multimedia
 include (../examples.pri)
 
 qtAddLibrary(QtMedia)
diff --git a/examples/sysinfo/sysinfo.pro b/examples/sysinfo/sysinfo.pro
index b2a62b7e59..2b70c91882 100644
--- a/examples/sysinfo/sysinfo.pro
+++ b/examples/sysinfo/sysinfo.pro
@@ -9,7 +9,7 @@ SOURCES += main.cpp\
 
 HEADERS  += dialog.h
 
-INCLUDEPATH += ../../systeminfo
+INCLUDEPATH += ../../src/systeminfo
 
 include(../examples.pri)
 qtAddLibrary(QtSystemInfo)
diff --git a/plugins/audiocapture/audiocapture.pro b/plugins/audiocapture/audiocapture.pro
index 0ea5447cf3..6f02b4e193 100644
--- a/plugins/audiocapture/audiocapture.pro
+++ b/plugins/audiocapture/audiocapture.pro
@@ -4,7 +4,7 @@ TARGET = $$qtLibraryTarget(audioengine)
 PLUGIN_TYPE=mediaservice
 
 include (../../common.pri)
-INCLUDEPATH += ../../multimedia
+INCLUDEPATH += ../../src/multimedia
 
 qtAddLibrary(QtMedia)
 
diff --git a/plugins/contacts/symbian/symbian.pro b/plugins/contacts/symbian/symbian.pro
index 7211376464..a9dbf38c72 100644
--- a/plugins/contacts/symbian/symbian.pro
+++ b/plugins/contacts/symbian/symbian.pro
@@ -15,10 +15,10 @@ symbian: {
   
     INCLUDEPATH += inc
 	INCLUDEPATH += rss
-	INCLUDEPATH += $$SOURCE_DIR/contacts 
-	INCLUDEPATH += $$SOURCE_DIR/contacts/details 
-	INCLUDEPATH += $$SOURCE_DIR/contacts/filters 
-	INCLUDEPATH += $$SOURCE_DIR/contacts/requests
+	INCLUDEPATH += $$SOURCE_DIR/src/contacts 
+	INCLUDEPATH += $$SOURCE_DIR/src/contacts/details 
+	INCLUDEPATH += $$SOURCE_DIR/src/contacts/filters 
+	INCLUDEPATH += $$SOURCE_DIR/src/contacts/requests
 
   HEADERS += \
         $$PUBLIC_HEADERS \
diff --git a/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro b/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro
index 0f6a12eef7..046c03c12e 100644
--- a/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro
+++ b/plugins/contacts/symbian/tsrc/tst_details/tst_details.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/plugins/contacts/symbian/tsrc/ut_cntsymbianengine_p/ut_cntsymbianengine_p.pro b/plugins/contacts/symbian/tsrc/ut_cntsymbianengine_p/ut_cntsymbianengine_p.pro
index baf6af1a6d..5f3b7efcf6 100644
--- a/plugins/contacts/symbian/tsrc/ut_cntsymbianengine_p/ut_cntsymbianengine_p.pro
+++ b/plugins/contacts/symbian/tsrc/ut_cntsymbianengine_p/ut_cntsymbianengine_p.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += .\inc
 INCLUDEPATH += ..\..\inc
 INCLUDEPATH += ..\..\rss
 INCLUDEPATH += ..\..\..\..\contacts
-INCLUDEPATH += ..\..\..\..\..\contacts
+INCLUDEPATH += ..\..\..\..\..\src\contacts
 
 include(../tsrc.pri)
 
diff --git a/plugins/contacts/symbian/tsrc/ut_sqlfiltering/ut_sqlfiltering.pro b/plugins/contacts/symbian/tsrc/ut_sqlfiltering/ut_sqlfiltering.pro
index ad0fca3ac0..729b71ad87 100644
--- a/plugins/contacts/symbian/tsrc/ut_sqlfiltering/ut_sqlfiltering.pro
+++ b/plugins/contacts/symbian/tsrc/ut_sqlfiltering/ut_sqlfiltering.pro
@@ -13,7 +13,7 @@ INCLUDEPATH += .\inc
 INCLUDEPATH += ..\..\inc
 INCLUDEPATH += ..\..\rss
 INCLUDEPATH += ..\..\..\..\contacts
-INCLUDEPATH += ..\..\..\..\..\contacts
+INCLUDEPATH += ..\..\..\..\..\src\contacts
 include(../tsrc.pri)
 
 symbian:
diff --git a/plugins/contacts/wince/wince.pro b/plugins/contacts/wince/wince.pro
index 880c8b81c9..409b3b2e41 100644
--- a/plugins/contacts/wince/wince.pro
+++ b/plugins/contacts/wince/wince.pro
@@ -11,7 +11,7 @@ SOURCES += \
         contactconversions.cpp
 
 
-INCLUDEPATH += $$SOURCE_DIR/contacts $$SOURCE_DIR/contacts/details $$SOURCE_DIR/contacts/filters $$SOURCE_DIR/contacts/requests
+INCLUDEPATH += $$SOURCE_DIR/src/contacts $$SOURCE_DIR/src/contacts/details $$SOURCE_DIR/src/contacts/filters $$SOURCE_DIR/src/contacts/requests
 
 target.path=$$QT_MOBILITY_PREFIX/plugins/contacts
 INSTALLS+=target
diff --git a/plugins/directshow/directshow.pro b/plugins/directshow/directshow.pro
index 942142e373..e5b98f9287 100644
--- a/plugins/directshow/directshow.pro
+++ b/plugins/directshow/directshow.pro
@@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget(dsengine)
 PLUGIN_TYPE = mediaservice
 
 include (../../common.pri)
-INCLUDEPATH+=../../multimedia
+INCLUDEPATH+=../../src/multimedia
 
 qtAddLibrary(QtMedia)
 
diff --git a/plugins/gstreamer/gstreamer.pro b/plugins/gstreamer/gstreamer.pro
index e2bdd668ff..6a00100f5e 100644
--- a/plugins/gstreamer/gstreamer.pro
+++ b/plugins/gstreamer/gstreamer.pro
@@ -4,7 +4,7 @@ TARGET = $$qtLibraryTarget(gstengine)
 PLUGIN_TYPE=mediaservice
 
 include(../../common.pri)
-INCLUDEPATH+=../../multimedia
+INCLUDEPATH+=../../src/multimedia
 
 qtAddLibrary(QtMedia)
 
diff --git a/plugins/m3u/m3u.pro b/plugins/m3u/m3u.pro
index 8dbd9eeeb2..6425bc5eac 100644
--- a/plugins/m3u/m3u.pro
+++ b/plugins/m3u/m3u.pro
@@ -10,7 +10,7 @@ qtAddLibrary(QtMedia)
 
 DEPENDPATH += .
 INCLUDEPATH += . \
-    ../../multimedia
+    ../../src/multimedia
 
 HEADERS += qm3uhandler.h
 SOURCES += main.cpp \
diff --git a/plugins/phonon/phonon.pro b/plugins/phonon/phonon.pro
index c2f5195275..df960cbe1b 100644
--- a/plugins/phonon/phonon.pro
+++ b/plugins/phonon/phonon.pro
@@ -9,7 +9,7 @@ include (../../common.pri)
 
 qtAddLibrary(QtMedia)
 
-INCLUDEPATH += ../../multimedia
+INCLUDEPATH += ../../src/multimedia
 
 DEPENDPATH += .
 
diff --git a/plugins/v4l/v4l.pro b/plugins/v4l/v4l.pro
index e36602d806..b220085869 100644
--- a/plugins/v4l/v4l.pro
+++ b/plugins/v4l/v4l.pro
@@ -10,7 +10,7 @@ qtAddLibrary(QtMedia)
 
 DEPENDPATH += .
 
-INCLUDEPATH += ../../multimedia
+INCLUDEPATH += ../../src/multimedia
 
 HEADERS += v4lserviceplugin.h
 SOURCES += v4lserviceplugin.cpp
diff --git a/plugins/wmp/wmp.pro b/plugins/wmp/wmp.pro
index f0734f17f9..58f4740dd3 100644
--- a/plugins/wmp/wmp.pro
+++ b/plugins/wmp/wmp.pro
@@ -4,7 +4,7 @@ TARGET = $$qtLibraryTarget(qwmp)
 
 PLUGIN_TYPE = mediaservice
 
-INCLUDEPATH+=../../multimedia
+INCLUDEPATH+=../../src/multimedia
 include(../../common.pri)
 
 TMP_INCLUDE = $$quote($$(INCLUDE))
diff --git a/qtmobility.pro b/qtmobility.pro
index a0877dcd5d..0659c9cdbc 100644
--- a/qtmobility.pro
+++ b/qtmobility.pro
@@ -28,24 +28,14 @@ symbian:system(type $${QT_MOBILITY_SOURCE_TREE}\features\mobility.prf.template >
 # install feature file
 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
 feature.files = $$QT_MOBILITY_BUILD_TREE/features/mobility.prf
-
 INSTALLS += feature
 
 TEMPLATE = subdirs
 CONFIG+=ordered
 
-SUBDIRS += serviceframework
-symbian:SUBDIRS += serviceframework/symbian/dll/databasemanagerserver_dll.pro \
-                   serviceframework/symbian/exe/databasemanagerserver_exe.pro
-
-SUBDIRS += bearer location contacts multimedia context systeminfo tools plugins
-SUBDIRS += doc   #built documentation snippets
-
-
-contains(qmf_enabled, yes)|wince*|win32|symbian|maemo {
-    SUBDIRS += messaging
-}
-
+SUBDIRS += src tools plugins
+#built documentation snippets
+SUBDIRS += doc   
 
 contains(build_unit_tests, yes):SUBDIRS+=tests
 contains(build_examples, yes):SUBDIRS+=examples
diff --git a/bearer/bearer.pro b/src/bearer/bearer.pro
index 9419681a6d..79d1b70325 100644
--- a/bearer/bearer.pro
+++ b/src/bearer/bearer.pro
@@ -3,7 +3,7 @@ TEMPLATE = lib
 TARGET = QtBearer
 
 QT += network
-include (../common.pri)
+include (../../common.pri)
 
 DEFINES += QT_BUILD_BEARER_LIB QT_MAKEDLL
 
@@ -145,4 +145,4 @@ symbian: {
     }
 }
 
-include(../features/deploy.pri)
+include(../../features/deploy.pri)
diff --git a/bearer/qbearerglobal.h b/src/bearer/qbearerglobal.h
index 00f68b2ab0..00f68b2ab0 100644
--- a/bearer/qbearerglobal.h
+++ b/src/bearer/qbearerglobal.h
diff --git a/bearer/qcorewlanengine_mac.mm b/src/bearer/qcorewlanengine_mac.mm
index fea694b5d3..fea694b5d3 100644
--- a/bearer/qcorewlanengine_mac.mm
+++ b/src/bearer/qcorewlanengine_mac.mm
diff --git a/bearer/qcorewlanengine_mac_p.h b/src/bearer/qcorewlanengine_mac_p.h
index c6f0cd5df5..c6f0cd5df5 100644
--- a/bearer/qcorewlanengine_mac_p.h
+++ b/src/bearer/qcorewlanengine_mac_p.h
diff --git a/bearer/qgenericengine.cpp b/src/bearer/qgenericengine.cpp
index 65ea57ff21..65ea57ff21 100644
--- a/bearer/qgenericengine.cpp
+++ b/src/bearer/qgenericengine.cpp
diff --git a/bearer/qgenericengine_p.h b/src/bearer/qgenericengine_p.h
index 88de2a0306..88de2a0306 100644
--- a/bearer/qgenericengine_p.h
+++ b/src/bearer/qgenericengine_p.h
diff --git a/bearer/qnativewifiengine_win.cpp b/src/bearer/qnativewifiengine_win.cpp
index 128505f4b7..128505f4b7 100644
--- a/bearer/qnativewifiengine_win.cpp
+++ b/src/bearer/qnativewifiengine_win.cpp
diff --git a/bearer/qnativewifiengine_win_p.h b/src/bearer/qnativewifiengine_win_p.h
index adc75e133a..adc75e133a 100644
--- a/bearer/qnativewifiengine_win_p.h
+++ b/src/bearer/qnativewifiengine_win_p.h
diff --git a/bearer/qnetworkconfigmanager.cpp b/src/bearer/qnetworkconfigmanager.cpp
index 8e8ab2d038..8e8ab2d038 100644
--- a/bearer/qnetworkconfigmanager.cpp
+++ b/src/bearer/qnetworkconfigmanager.cpp
diff --git a/bearer/qnetworkconfigmanager.h b/src/bearer/qnetworkconfigmanager.h
index f6337e0389..f6337e0389 100644
--- a/bearer/qnetworkconfigmanager.h
+++ b/src/bearer/qnetworkconfigmanager.h
diff --git a/bearer/qnetworkconfigmanager_maemo.cpp b/src/bearer/qnetworkconfigmanager_maemo.cpp
index 3fd9bd1a87..3fd9bd1a87 100644
--- a/bearer/qnetworkconfigmanager_maemo.cpp
+++ b/src/bearer/qnetworkconfigmanager_maemo.cpp
diff --git a/bearer/qnetworkconfigmanager_maemo_p.h b/src/bearer/qnetworkconfigmanager_maemo_p.h
index b56aa9a757..b56aa9a757 100644
--- a/bearer/qnetworkconfigmanager_maemo_p.h
+++ b/src/bearer/qnetworkconfigmanager_maemo_p.h
diff --git a/bearer/qnetworkconfigmanager_p.cpp b/src/bearer/qnetworkconfigmanager_p.cpp
index 17e15e4e6e..17e15e4e6e 100644
--- a/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/bearer/qnetworkconfigmanager_p.cpp
diff --git a/bearer/qnetworkconfigmanager_p.h b/src/bearer/qnetworkconfigmanager_p.h
index 9f47081c72..9f47081c72 100644
--- a/bearer/qnetworkconfigmanager_p.h
+++ b/src/bearer/qnetworkconfigmanager_p.h
diff --git a/bearer/qnetworkconfigmanager_s60_p.cpp b/src/bearer/qnetworkconfigmanager_s60_p.cpp
index e444acf97b..e444acf97b 100644
--- a/bearer/qnetworkconfigmanager_s60_p.cpp
+++ b/src/bearer/qnetworkconfigmanager_s60_p.cpp
diff --git a/bearer/qnetworkconfigmanager_s60_p.h b/src/bearer/qnetworkconfigmanager_s60_p.h
index 0f9c4aa771..0f9c4aa771 100644
--- a/bearer/qnetworkconfigmanager_s60_p.h
+++ b/src/bearer/qnetworkconfigmanager_s60_p.h
diff --git a/bearer/qnetworkconfiguration.cpp b/src/bearer/qnetworkconfiguration.cpp
index f7e0434da6..f7e0434da6 100644
--- a/bearer/qnetworkconfiguration.cpp
+++ b/src/bearer/qnetworkconfiguration.cpp
diff --git a/bearer/qnetworkconfiguration.h b/src/bearer/qnetworkconfiguration.h
index 79572d19f3..79572d19f3 100644
--- a/bearer/qnetworkconfiguration.h
+++ b/src/bearer/qnetworkconfiguration.h
diff --git a/bearer/qnetworkconfiguration_maemo_p.h b/src/bearer/qnetworkconfiguration_maemo_p.h
index 5a7fcd4c5b..5a7fcd4c5b 100644
--- a/bearer/qnetworkconfiguration_maemo_p.h
+++ b/src/bearer/qnetworkconfiguration_maemo_p.h
diff --git a/bearer/qnetworkconfiguration_p.h b/src/bearer/qnetworkconfiguration_p.h
index 3b3e37d3a7..3b3e37d3a7 100644
--- a/bearer/qnetworkconfiguration_p.h
+++ b/src/bearer/qnetworkconfiguration_p.h
diff --git a/bearer/qnetworkconfiguration_s60_p.cpp b/src/bearer/qnetworkconfiguration_s60_p.cpp
index 3d15a31167..3d15a31167 100644
--- a/bearer/qnetworkconfiguration_s60_p.cpp
+++ b/src/bearer/qnetworkconfiguration_s60_p.cpp
diff --git a/bearer/qnetworkconfiguration_s60_p.h b/src/bearer/qnetworkconfiguration_s60_p.h
index bccad0c4a4..bccad0c4a4 100644
--- a/bearer/qnetworkconfiguration_s60_p.h
+++ b/src/bearer/qnetworkconfiguration_s60_p.h
diff --git a/bearer/qnetworkmanagerservice_p.cpp b/src/bearer/qnetworkmanagerservice_p.cpp
index 0d574f3c64..0d574f3c64 100644
--- a/bearer/qnetworkmanagerservice_p.cpp
+++ b/src/bearer/qnetworkmanagerservice_p.cpp
diff --git a/bearer/qnetworkmanagerservice_p.h b/src/bearer/qnetworkmanagerservice_p.h
index d0b0129ed3..d0b0129ed3 100644
--- a/bearer/qnetworkmanagerservice_p.h
+++ b/src/bearer/qnetworkmanagerservice_p.h
diff --git a/bearer/qnetworksession.cpp b/src/bearer/qnetworksession.cpp
index 2e78a4ac78..2e78a4ac78 100644
--- a/bearer/qnetworksession.cpp
+++ b/src/bearer/qnetworksession.cpp
diff --git a/bearer/qnetworksession.h b/src/bearer/qnetworksession.h
index 26020d3af2..26020d3af2 100644
--- a/bearer/qnetworksession.h
+++ b/src/bearer/qnetworksession.h
diff --git a/bearer/qnetworksession_maemo.cpp b/src/bearer/qnetworksession_maemo.cpp
index 8518936b9f..8518936b9f 100644
--- a/bearer/qnetworksession_maemo.cpp
+++ b/src/bearer/qnetworksession_maemo.cpp
diff --git a/bearer/qnetworksession_maemo_p.h b/src/bearer/qnetworksession_maemo_p.h
index efc5366205..efc5366205 100644
--- a/bearer/qnetworksession_maemo_p.h
+++ b/src/bearer/qnetworksession_maemo_p.h
diff --git a/bearer/qnetworksession_p.cpp b/src/bearer/qnetworksession_p.cpp
index dc33eb55ff..dc33eb55ff 100644
--- a/bearer/qnetworksession_p.cpp
+++ b/src/bearer/qnetworksession_p.cpp
diff --git a/bearer/qnetworksession_p.h b/src/bearer/qnetworksession_p.h
index c9fa8ac4f2..c9fa8ac4f2 100644
--- a/bearer/qnetworksession_p.h
+++ b/src/bearer/qnetworksession_p.h
diff --git a/bearer/qnetworksession_s60_p.cpp b/src/bearer/qnetworksession_s60_p.cpp
index dfbfe197d9..dfbfe197d9 100644
--- a/bearer/qnetworksession_s60_p.cpp
+++ b/src/bearer/qnetworksession_s60_p.cpp
diff --git a/bearer/qnetworksession_s60_p.h b/src/bearer/qnetworksession_s60_p.h
index 92708a9f1d..92708a9f1d 100644
--- a/bearer/qnetworksession_s60_p.h
+++ b/src/bearer/qnetworksession_s60_p.h
diff --git a/bearer/qnetworksessionengine.cpp b/src/bearer/qnetworksessionengine.cpp
index c7f5b1058d..c7f5b1058d 100644
--- a/bearer/qnetworksessionengine.cpp
+++ b/src/bearer/qnetworksessionengine.cpp
diff --git a/bearer/qnetworksessionengine_p.h b/src/bearer/qnetworksessionengine_p.h
index 415fd94024..415fd94024 100644
--- a/bearer/qnetworksessionengine_p.h
+++ b/src/bearer/qnetworksessionengine_p.h
diff --git a/bearer/qnetworksessionengine_win_p.h b/src/bearer/qnetworksessionengine_win_p.h
index cf01719296..cf01719296 100644
--- a/bearer/qnetworksessionengine_win_p.h
+++ b/src/bearer/qnetworksessionengine_win_p.h
diff --git a/bearer/qnlaengine_win.cpp b/src/bearer/qnlaengine_win.cpp
index e24a5270bf..e24a5270bf 100644
--- a/bearer/qnlaengine_win.cpp
+++ b/src/bearer/qnlaengine_win.cpp
diff --git a/bearer/qnlaengine_win_p.h b/src/bearer/qnlaengine_win_p.h
index d9d752bef7..d9d752bef7 100644
--- a/bearer/qnlaengine_win_p.h
+++ b/src/bearer/qnlaengine_win_p.h
diff --git a/bearer/qnmdbushelper.cpp b/src/bearer/qnmdbushelper.cpp
index 418a821d1e..418a821d1e 100644
--- a/bearer/qnmdbushelper.cpp
+++ b/src/bearer/qnmdbushelper.cpp
diff --git a/bearer/qnmdbushelper_p.h b/src/bearer/qnmdbushelper_p.h
index ebd4e63db5..ebd4e63db5 100644
--- a/bearer/qnmdbushelper_p.h
+++ b/src/bearer/qnmdbushelper_p.h
diff --git a/bearer/qnmwifiengine_unix.cpp b/src/bearer/qnmwifiengine_unix.cpp
index 69242b9643..69242b9643 100644
--- a/bearer/qnmwifiengine_unix.cpp
+++ b/src/bearer/qnmwifiengine_unix.cpp
diff --git a/bearer/qnmwifiengine_unix_p.h b/src/bearer/qnmwifiengine_unix_p.h
index a1bdb7b70c..a1bdb7b70c 100644
--- a/bearer/qnmwifiengine_unix_p.h
+++ b/src/bearer/qnmwifiengine_unix_p.h
diff --git a/contacts/contacts.README b/src/contacts/contacts.README
index a7208fcb44..a7208fcb44 100644
--- a/contacts/contacts.README
+++ b/src/contacts/contacts.README
diff --git a/contacts/contacts.doxygen b/src/contacts/contacts.doxygen
index 7d1ebf8e3d..7d1ebf8e3d 100644
--- a/contacts/contacts.doxygen
+++ b/src/contacts/contacts.doxygen
diff --git a/contacts/contacts.pro b/src/contacts/contacts.pro
index 5bf4ccc53e..4e39e6eb1e 100644
--- a/contacts/contacts.pro
+++ b/src/contacts/contacts.pro
@@ -8,7 +8,7 @@ TARGET = QtContacts
 DEFINES += BUILD_QTCONTACTS \
     QT_ASCII_CAST_WARNINGS
 
-include(../common.pri)
+include(../../common.pri)
 
 include(details/details.pri)
 include(engines/engines.pri)
@@ -95,4 +95,4 @@ symbian {
         BLD_INF_RULES.prj_exports += "$$header $$deploy.path$$exportheaders.path/$$basename(header)"
     }
 }
-include(../features/deploy.pri)
+include(../../features/deploy.pri)
diff --git a/contacts/details/details.pri b/src/contacts/details/details.pri
index bfbbb1c94e..bfbbb1c94e 100644
--- a/contacts/details/details.pri
+++ b/src/contacts/details/details.pri
diff --git a/contacts/details/qcontactaddress.h b/src/contacts/details/qcontactaddress.h
index 4f24aa5100..4f24aa5100 100644
--- a/contacts/details/qcontactaddress.h
+++ b/src/contacts/details/qcontactaddress.h
diff --git a/contacts/details/qcontactanniversary.h b/src/contacts/details/qcontactanniversary.h
index aaf8805ce8..aaf8805ce8 100644
--- a/contacts/details/qcontactanniversary.h
+++ b/src/contacts/details/qcontactanniversary.h
diff --git a/contacts/details/qcontactavatar.h b/src/contacts/details/qcontactavatar.h
index 0c10e58dec..0c10e58dec 100644
--- a/contacts/details/qcontactavatar.h
+++ b/src/contacts/details/qcontactavatar.h
diff --git a/contacts/details/qcontactbirthday.h b/src/contacts/details/qcontactbirthday.h
index 283dd1b9d6..283dd1b9d6 100644
--- a/contacts/details/qcontactbirthday.h
+++ b/src/contacts/details/qcontactbirthday.h
diff --git a/contacts/details/qcontactdetails.cpp b/src/contacts/details/qcontactdetails.cpp
index 176adacdf6..176adacdf6 100644
--- a/contacts/details/qcontactdetails.cpp
+++ b/src/contacts/details/qcontactdetails.cpp
diff --git a/contacts/details/qcontactdetails.h b/src/contacts/details/qcontactdetails.h
index a90173427c..a90173427c 100644
--- a/contacts/details/qcontactdetails.h
+++ b/src/contacts/details/qcontactdetails.h
diff --git a/contacts/details/qcontactdisplaylabel.h b/src/contacts/details/qcontactdisplaylabel.h
index 598d4e2a35..598d4e2a35 100644
--- a/contacts/details/qcontactdisplaylabel.h
+++ b/src/contacts/details/qcontactdisplaylabel.h
diff --git a/contacts/details/qcontactemailaddress.h b/src/contacts/details/qcontactemailaddress.h
index 2076109241..2076109241 100644
--- a/contacts/details/qcontactemailaddress.h
+++ b/src/contacts/details/qcontactemailaddress.h
diff --git a/contacts/details/qcontactfamily.h b/src/contacts/details/qcontactfamily.h
index 58e69b4df5..58e69b4df5 100644
--- a/contacts/details/qcontactfamily.h
+++ b/src/contacts/details/qcontactfamily.h
diff --git a/contacts/details/qcontactgender.h b/src/contacts/details/qcontactgender.h
index 287178ddfa..287178ddfa 100644
--- a/contacts/details/qcontactgender.h
+++ b/src/contacts/details/qcontactgender.h
diff --git a/contacts/details/qcontactgeolocation.h b/src/contacts/details/qcontactgeolocation.h
index d9e391f708..d9e391f708 100644
--- a/contacts/details/qcontactgeolocation.h
+++ b/src/contacts/details/qcontactgeolocation.h
diff --git a/contacts/details/qcontactguid.h b/src/contacts/details/qcontactguid.h
index f8301a9dd3..f8301a9dd3 100644
--- a/contacts/details/qcontactguid.h
+++ b/src/contacts/details/qcontactguid.h
diff --git a/contacts/details/qcontactname.h b/src/contacts/details/qcontactname.h
index 6cd6ccf089..6cd6ccf089 100644
--- a/contacts/details/qcontactname.h
+++ b/src/contacts/details/qcontactname.h
diff --git a/contacts/details/qcontactnickname.h b/src/contacts/details/qcontactnickname.h
index 7d789197ef..7d789197ef 100644
--- a/contacts/details/qcontactnickname.h
+++ b/src/contacts/details/qcontactnickname.h
diff --git a/contacts/details/qcontactnote.h b/src/contacts/details/qcontactnote.h
index be555e4844..be555e4844 100644
--- a/contacts/details/qcontactnote.h
+++ b/src/contacts/details/qcontactnote.h
diff --git a/contacts/details/qcontactonlineaccount.h b/src/contacts/details/qcontactonlineaccount.h
index 7ca978642c..7ca978642c 100644
--- a/contacts/details/qcontactonlineaccount.h
+++ b/src/contacts/details/qcontactonlineaccount.h
diff --git a/contacts/details/qcontactorganization.h b/src/contacts/details/qcontactorganization.h
index 163d240d8e..163d240d8e 100644
--- a/contacts/details/qcontactorganization.h
+++ b/src/contacts/details/qcontactorganization.h
diff --git a/contacts/details/qcontactphonenumber.h b/src/contacts/details/qcontactphonenumber.h
index 2ef806ad88..2ef806ad88 100644
--- a/contacts/details/qcontactphonenumber.h
+++ b/src/contacts/details/qcontactphonenumber.h
diff --git a/contacts/details/qcontactpresence.h b/src/contacts/details/qcontactpresence.h
index 4fd601dba4..4fd601dba4 100644
--- a/contacts/details/qcontactpresence.h
+++ b/src/contacts/details/qcontactpresence.h
diff --git a/contacts/details/qcontactsynctarget.h b/src/contacts/details/qcontactsynctarget.h
index 2f0d4bbb04..2f0d4bbb04 100644
--- a/contacts/details/qcontactsynctarget.h
+++ b/src/contacts/details/qcontactsynctarget.h
diff --git a/contacts/details/qcontacttimestamp.h b/src/contacts/details/qcontacttimestamp.h
index 5ee06256dc..5ee06256dc 100644
--- a/contacts/details/qcontacttimestamp.h
+++ b/src/contacts/details/qcontacttimestamp.h
diff --git a/contacts/details/qcontacttype.h b/src/contacts/details/qcontacttype.h
index d4a20e2ffe..d4a20e2ffe 100644
--- a/contacts/details/qcontacttype.h
+++ b/src/contacts/details/qcontacttype.h
diff --git a/contacts/details/qcontacturl.h b/src/contacts/details/qcontacturl.h
index fdf6ff2ac6..fdf6ff2ac6 100644
--- a/contacts/details/qcontacturl.h
+++ b/src/contacts/details/qcontacturl.h
diff --git a/contacts/engines/README b/src/contacts/engines/README
index aeb125af50..aeb125af50 100644
--- a/contacts/engines/README
+++ b/src/contacts/engines/README
diff --git a/contacts/engines/engines.pri b/src/contacts/engines/engines.pri
index 4a32160f43..4a32160f43 100644
--- a/contacts/engines/engines.pri
+++ b/src/contacts/engines/engines.pri
diff --git a/contacts/engines/qcontactinvalidbackend.cpp b/src/contacts/engines/qcontactinvalidbackend.cpp
index 139f24f69a..139f24f69a 100644
--- a/contacts/engines/qcontactinvalidbackend.cpp
+++ b/src/contacts/engines/qcontactinvalidbackend.cpp
diff --git a/contacts/engines/qcontactinvalidbackend_p.h b/src/contacts/engines/qcontactinvalidbackend_p.h
index ac5a099571..ac5a099571 100644
--- a/contacts/engines/qcontactinvalidbackend_p.h
+++ b/src/contacts/engines/qcontactinvalidbackend_p.h
diff --git a/contacts/engines/qcontactmemorybackend.cpp b/src/contacts/engines/qcontactmemorybackend.cpp
index 848eeeb4a9..848eeeb4a9 100644
--- a/contacts/engines/qcontactmemorybackend.cpp
+++ b/src/contacts/engines/qcontactmemorybackend.cpp
diff --git a/contacts/engines/qcontactmemorybackend_p.h b/src/contacts/engines/qcontactmemorybackend_p.h
index d7510741dd..d7510741dd 100644
--- a/contacts/engines/qcontactmemorybackend_p.h
+++ b/src/contacts/engines/qcontactmemorybackend_p.h
diff --git a/contacts/filters/filters.pri b/src/contacts/filters/filters.pri
index 1c73d43d24..1c73d43d24 100644
--- a/contacts/filters/filters.pri
+++ b/src/contacts/filters/filters.pri
diff --git a/contacts/filters/qcontactactionfilter.cpp b/src/contacts/filters/qcontactactionfilter.cpp
index bad14884b4..bad14884b4 100644
--- a/contacts/filters/qcontactactionfilter.cpp
+++ b/src/contacts/filters/qcontactactionfilter.cpp
diff --git a/contacts/filters/qcontactactionfilter.h b/src/contacts/filters/qcontactactionfilter.h
index 2ee7df791d..2ee7df791d 100644
--- a/contacts/filters/qcontactactionfilter.h
+++ b/src/contacts/filters/qcontactactionfilter.h
diff --git a/contacts/filters/qcontactactionfilter_p.h b/src/contacts/filters/qcontactactionfilter_p.h
index 44adfcfa01..44adfcfa01 100644
--- a/contacts/filters/qcontactactionfilter_p.h
+++ b/src/contacts/filters/qcontactactionfilter_p.h
diff --git a/contacts/filters/qcontactchangelogfilter.cpp b/src/contacts/filters/qcontactchangelogfilter.cpp
index e9eb0394f2..e9eb0394f2 100644
--- a/contacts/filters/qcontactchangelogfilter.cpp
+++ b/src/contacts/filters/qcontactchangelogfilter.cpp
diff --git a/contacts/filters/qcontactchangelogfilter.h b/src/contacts/filters/qcontactchangelogfilter.h
index dbf48bfbc6..dbf48bfbc6 100644
--- a/contacts/filters/qcontactchangelogfilter.h
+++ b/src/contacts/filters/qcontactchangelogfilter.h
diff --git a/contacts/filters/qcontactchangelogfilter_p.h b/src/contacts/filters/qcontactchangelogfilter_p.h
index c380ea474f..c380ea474f 100644
--- a/contacts/filters/qcontactchangelogfilter_p.h
+++ b/src/contacts/filters/qcontactchangelogfilter_p.h
diff --git a/contacts/filters/qcontactdetailfilter.cpp b/src/contacts/filters/qcontactdetailfilter.cpp
index f4e8006c4d..f4e8006c4d 100644
--- a/contacts/filters/qcontactdetailfilter.cpp
+++ b/src/contacts/filters/qcontactdetailfilter.cpp
diff --git a/contacts/filters/qcontactdetailfilter.h b/src/contacts/filters/qcontactdetailfilter.h
index 7a1adb27b4..7a1adb27b4 100644
--- a/contacts/filters/qcontactdetailfilter.h
+++ b/src/contacts/filters/qcontactdetailfilter.h
diff --git a/contacts/filters/qcontactdetailfilter_p.h b/src/contacts/filters/qcontactdetailfilter_p.h
index b6aa2f5758..b6aa2f5758 100644
--- a/contacts/filters/qcontactdetailfilter_p.h
+++ b/src/contacts/filters/qcontactdetailfilter_p.h
diff --git a/contacts/filters/qcontactdetailrangefilter.cpp b/src/contacts/filters/qcontactdetailrangefilter.cpp
index 72e8436ae2..72e8436ae2 100644
--- a/contacts/filters/qcontactdetailrangefilter.cpp
+++ b/src/contacts/filters/qcontactdetailrangefilter.cpp
diff --git a/contacts/filters/qcontactdetailrangefilter.h b/src/contacts/filters/qcontactdetailrangefilter.h
index e98a51d15c..e98a51d15c 100644
--- a/contacts/filters/qcontactdetailrangefilter.h
+++ b/src/contacts/filters/qcontactdetailrangefilter.h
diff --git a/contacts/filters/qcontactdetailrangefilter_p.h b/src/contacts/filters/qcontactdetailrangefilter_p.h
index 99e8f52844..99e8f52844 100644
--- a/contacts/filters/qcontactdetailrangefilter_p.h
+++ b/src/contacts/filters/qcontactdetailrangefilter_p.h
diff --git a/contacts/filters/qcontactfilters.h b/src/contacts/filters/qcontactfilters.h
index 0b8fa551f3..0b8fa551f3 100644
--- a/contacts/filters/qcontactfilters.h
+++ b/src/contacts/filters/qcontactfilters.h
diff --git a/contacts/filters/qcontactintersectionfilter.cpp b/src/contacts/filters/qcontactintersectionfilter.cpp
index 58e4863675..58e4863675 100644
--- a/contacts/filters/qcontactintersectionfilter.cpp
+++ b/src/contacts/filters/qcontactintersectionfilter.cpp
diff --git a/contacts/filters/qcontactintersectionfilter.h b/src/contacts/filters/qcontactintersectionfilter.h
index 8166eff445..8166eff445 100644
--- a/contacts/filters/qcontactintersectionfilter.h
+++ b/src/contacts/filters/qcontactintersectionfilter.h
diff --git a/contacts/filters/qcontactintersectionfilter_p.h b/src/contacts/filters/qcontactintersectionfilter_p.h
index 8882dea58d..8882dea58d 100644
--- a/contacts/filters/qcontactintersectionfilter_p.h
+++ b/src/contacts/filters/qcontactintersectionfilter_p.h
diff --git a/contacts/filters/qcontactinvalidfilter.cpp b/src/contacts/filters/qcontactinvalidfilter.cpp
index eae06ecd00..eae06ecd00 100644
--- a/contacts/filters/qcontactinvalidfilter.cpp
+++ b/src/contacts/filters/qcontactinvalidfilter.cpp
diff --git a/contacts/filters/qcontactinvalidfilter.h b/src/contacts/filters/qcontactinvalidfilter.h
index c5d22bf2fd..c5d22bf2fd 100644
--- a/contacts/filters/qcontactinvalidfilter.h
+++ b/src/contacts/filters/qcontactinvalidfilter.h
diff --git a/contacts/filters/qcontactlocalidfilter.cpp b/src/contacts/filters/qcontactlocalidfilter.cpp
index 34bcd89b80..34bcd89b80 100644
--- a/contacts/filters/qcontactlocalidfilter.cpp
+++ b/src/contacts/filters/qcontactlocalidfilter.cpp
diff --git a/contacts/filters/qcontactlocalidfilter.h b/src/contacts/filters/qcontactlocalidfilter.h
index f67098b975..f67098b975 100644
--- a/contacts/filters/qcontactlocalidfilter.h
+++ b/src/contacts/filters/qcontactlocalidfilter.h
diff --git a/contacts/filters/qcontactlocalidfilter_p.h b/src/contacts/filters/qcontactlocalidfilter_p.h
index 5228f055ca..5228f055ca 100644
--- a/contacts/filters/qcontactlocalidfilter_p.h
+++ b/src/contacts/filters/qcontactlocalidfilter_p.h
diff --git a/contacts/filters/qcontactrelationshipfilter.cpp b/src/contacts/filters/qcontactrelationshipfilter.cpp
index 8d8c7d1857..8d8c7d1857 100644
--- a/contacts/filters/qcontactrelationshipfilter.cpp
+++ b/src/contacts/filters/qcontactrelationshipfilter.cpp
diff --git a/contacts/filters/qcontactrelationshipfilter.h b/src/contacts/filters/qcontactrelationshipfilter.h
index 87a700c779..87a700c779 100644
--- a/contacts/filters/qcontactrelationshipfilter.h
+++ b/src/contacts/filters/qcontactrelationshipfilter.h
diff --git a/contacts/filters/qcontactrelationshipfilter_p.h b/src/contacts/filters/qcontactrelationshipfilter_p.h
index 8c34738de7..8c34738de7 100644
--- a/contacts/filters/qcontactrelationshipfilter_p.h
+++ b/src/contacts/filters/qcontactrelationshipfilter_p.h
diff --git a/contacts/filters/qcontactunionfilter.cpp b/src/contacts/filters/qcontactunionfilter.cpp
index 4aa1c7277c..4aa1c7277c 100644
--- a/contacts/filters/qcontactunionfilter.cpp
+++ b/src/contacts/filters/qcontactunionfilter.cpp
diff --git a/contacts/filters/qcontactunionfilter.h b/src/contacts/filters/qcontactunionfilter.h
index 93d2149cc3..93d2149cc3 100644
--- a/contacts/filters/qcontactunionfilter.h
+++ b/src/contacts/filters/qcontactunionfilter.h
diff --git a/contacts/filters/qcontactunionfilter_p.h b/src/contacts/filters/qcontactunionfilter_p.h
index a1a5432026..a1a5432026 100644
--- a/contacts/filters/qcontactunionfilter_p.h
+++ b/src/contacts/filters/qcontactunionfilter_p.h
diff --git a/contacts/qcontact.cpp b/src/contacts/qcontact.cpp
index 1aed46b0ab..1aed46b0ab 100644
--- a/contacts/qcontact.cpp
+++ b/src/contacts/qcontact.cpp
diff --git a/contacts/qcontact.h b/src/contacts/qcontact.h
index 5db731a7cd..5db731a7cd 100644
--- a/contacts/qcontact.h
+++ b/src/contacts/qcontact.h
diff --git a/contacts/qcontact_p.h b/src/contacts/qcontact_p.h
index 7650b94e06..7650b94e06 100644
--- a/contacts/qcontact_p.h
+++ b/src/contacts/qcontact_p.h
diff --git a/contacts/qcontactabstractrequest.cpp b/src/contacts/qcontactabstractrequest.cpp
index 9925499746..9925499746 100644
--- a/contacts/qcontactabstractrequest.cpp
+++ b/src/contacts/qcontactabstractrequest.cpp
diff --git a/contacts/qcontactabstractrequest.h b/src/contacts/qcontactabstractrequest.h
index 82c873ecaf..82c873ecaf 100644
--- a/contacts/qcontactabstractrequest.h
+++ b/src/contacts/qcontactabstractrequest.h
diff --git a/contacts/qcontactabstractrequest_p.h b/src/contacts/qcontactabstractrequest_p.h
index 388ad702ac..388ad702ac 100644
--- a/contacts/qcontactabstractrequest_p.h
+++ b/src/contacts/qcontactabstractrequest_p.h
diff --git a/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp
index c029e710c8..c029e710c8 100644
--- a/contacts/qcontactaction.cpp
+++ b/src/contacts/qcontactaction.cpp
diff --git a/contacts/qcontactaction.h b/src/contacts/qcontactaction.h
index 5ede5e897d..5ede5e897d 100644
--- a/contacts/qcontactaction.h
+++ b/src/contacts/qcontactaction.h
diff --git a/contacts/qcontactactiondescriptor.cpp b/src/contacts/qcontactactiondescriptor.cpp
index 42ac4a34ea..42ac4a34ea 100644
--- a/contacts/qcontactactiondescriptor.cpp
+++ b/src/contacts/qcontactactiondescriptor.cpp
diff --git a/contacts/qcontactactiondescriptor.h b/src/contacts/qcontactactiondescriptor.h
index 95a35a233f..95a35a233f 100644
--- a/contacts/qcontactactiondescriptor.h
+++ b/src/contacts/qcontactactiondescriptor.h
diff --git a/contacts/qcontactactiondescriptor_p.h b/src/contacts/qcontactactiondescriptor_p.h
index f640cd38e5..f640cd38e5 100644
--- a/contacts/qcontactactiondescriptor_p.h
+++ b/src/contacts/qcontactactiondescriptor_p.h
diff --git a/contacts/qcontactactionfactory.cpp b/src/contacts/qcontactactionfactory.cpp
index 76ba3f1448..76ba3f1448 100644
--- a/contacts/qcontactactionfactory.cpp
+++ b/src/contacts/qcontactactionfactory.cpp
diff --git a/contacts/qcontactactionfactory.h b/src/contacts/qcontactactionfactory.h
index 1d2da1c56a..1d2da1c56a 100644
--- a/contacts/qcontactactionfactory.h
+++ b/src/contacts/qcontactactionfactory.h
diff --git a/contacts/qcontactchangeset.cpp b/src/contacts/qcontactchangeset.cpp
index 810c576ca3..810c576ca3 100644
--- a/contacts/qcontactchangeset.cpp
+++ b/src/contacts/qcontactchangeset.cpp
diff --git a/contacts/qcontactchangeset.h b/src/contacts/qcontactchangeset.h
index 2dd81468ae..2dd81468ae 100644
--- a/contacts/qcontactchangeset.h
+++ b/src/contacts/qcontactchangeset.h
diff --git a/contacts/qcontactchangeset_p.h b/src/contacts/qcontactchangeset_p.h
index 784d2474ea..784d2474ea 100644
--- a/contacts/qcontactchangeset_p.h
+++ b/src/contacts/qcontactchangeset_p.h
diff --git a/contacts/qcontactdetail.cpp b/src/contacts/qcontactdetail.cpp
index c01e8396a9..c01e8396a9 100644
--- a/contacts/qcontactdetail.cpp
+++ b/src/contacts/qcontactdetail.cpp
diff --git a/contacts/qcontactdetail.h b/src/contacts/qcontactdetail.h
index bbac524077..bbac524077 100644
--- a/contacts/qcontactdetail.h
+++ b/src/contacts/qcontactdetail.h
diff --git a/contacts/qcontactdetail_p.h b/src/contacts/qcontactdetail_p.h
index 3e6c4246d3..3e6c4246d3 100644
--- a/contacts/qcontactdetail_p.h
+++ b/src/contacts/qcontactdetail_p.h
diff --git a/contacts/qcontactdetaildefinition.cpp b/src/contacts/qcontactdetaildefinition.cpp
index 8e816aa878..8e816aa878 100644
--- a/contacts/qcontactdetaildefinition.cpp
+++ b/src/contacts/qcontactdetaildefinition.cpp
diff --git a/contacts/qcontactdetaildefinition.h b/src/contacts/qcontactdetaildefinition.h
index a274378f3d..a274378f3d 100644
--- a/contacts/qcontactdetaildefinition.h
+++ b/src/contacts/qcontactdetaildefinition.h
diff --git a/contacts/qcontactdetaildefinition_p.h b/src/contacts/qcontactdetaildefinition_p.h
index 355a89f6de..355a89f6de 100644
--- a/contacts/qcontactdetaildefinition_p.h
+++ b/src/contacts/qcontactdetaildefinition_p.h
diff --git a/contacts/qcontactfilter.cpp b/src/contacts/qcontactfilter.cpp
index 87bdeb1449..87bdeb1449 100644
--- a/contacts/qcontactfilter.cpp
+++ b/src/contacts/qcontactfilter.cpp
diff --git a/contacts/qcontactfilter.h b/src/contacts/qcontactfilter.h
index 3e683d8d1f..3e683d8d1f 100644
--- a/contacts/qcontactfilter.h
+++ b/src/contacts/qcontactfilter.h
diff --git a/contacts/qcontactfilter_p.h b/src/contacts/qcontactfilter_p.h
index 59965a7d0d..59965a7d0d 100644
--- a/contacts/qcontactfilter_p.h
+++ b/src/contacts/qcontactfilter_p.h
diff --git a/contacts/qcontactgroup.cpp b/src/contacts/qcontactgroup.cpp
index dd5923a821..dd5923a821 100644
--- a/contacts/qcontactgroup.cpp
+++ b/src/contacts/qcontactgroup.cpp
diff --git a/contacts/qcontactid.cpp b/src/contacts/qcontactid.cpp
index 88acbfb863..88acbfb863 100644
--- a/contacts/qcontactid.cpp
+++ b/src/contacts/qcontactid.cpp
diff --git a/contacts/qcontactid.h b/src/contacts/qcontactid.h
index bb97a34616..bb97a34616 100644
--- a/contacts/qcontactid.h
+++ b/src/contacts/qcontactid.h
diff --git a/contacts/qcontactid_p.h b/src/contacts/qcontactid_p.h
index b76f1eedad..b76f1eedad 100644
--- a/contacts/qcontactid_p.h
+++ b/src/contacts/qcontactid_p.h
diff --git a/contacts/qcontactmanager.cpp b/src/contacts/qcontactmanager.cpp
index 3da41893bc..3da41893bc 100644
--- a/contacts/qcontactmanager.cpp
+++ b/src/contacts/qcontactmanager.cpp
diff --git a/contacts/qcontactmanager.h b/src/contacts/qcontactmanager.h
index e2d3d24746..e2d3d24746 100644
--- a/contacts/qcontactmanager.h
+++ b/src/contacts/qcontactmanager.h
diff --git a/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp
index 24f3f0db9a..24f3f0db9a 100644
--- a/contacts/qcontactmanager_p.cpp
+++ b/src/contacts/qcontactmanager_p.cpp
diff --git a/contacts/qcontactmanager_p.h b/src/contacts/qcontactmanager_p.h
index 1387c1a80b..1387c1a80b 100644
--- a/contacts/qcontactmanager_p.h
+++ b/src/contacts/qcontactmanager_p.h
diff --git a/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp
index 645728e762..645728e762 100644
--- a/contacts/qcontactmanagerengine.cpp
+++ b/src/contacts/qcontactmanagerengine.cpp
diff --git a/contacts/qcontactmanagerengine.h b/src/contacts/qcontactmanagerengine.h
index 4cea58d690..4cea58d690 100644
--- a/contacts/qcontactmanagerengine.h
+++ b/src/contacts/qcontactmanagerengine.h
diff --git a/contacts/qcontactmanagerenginefactory.cpp b/src/contacts/qcontactmanagerenginefactory.cpp
index 25e976cc7c..25e976cc7c 100644
--- a/contacts/qcontactmanagerenginefactory.cpp
+++ b/src/contacts/qcontactmanagerenginefactory.cpp
diff --git a/contacts/qcontactmanagerenginefactory.h b/src/contacts/qcontactmanagerenginefactory.h
index b55b3093c3..b55b3093c3 100644
--- a/contacts/qcontactmanagerenginefactory.h
+++ b/src/contacts/qcontactmanagerenginefactory.h
diff --git a/contacts/qcontactmanagerinfo.cpp b/src/contacts/qcontactmanagerinfo.cpp
index 2176f19f55..2176f19f55 100644
--- a/contacts/qcontactmanagerinfo.cpp
+++ b/src/contacts/qcontactmanagerinfo.cpp
diff --git a/contacts/qcontactmanagerinfo.h b/src/contacts/qcontactmanagerinfo.h
index c660d82091..c660d82091 100644
--- a/contacts/qcontactmanagerinfo.h
+++ b/src/contacts/qcontactmanagerinfo.h
diff --git a/contacts/qcontactrelationship.cpp b/src/contacts/qcontactrelationship.cpp
index 5ea50a20c1..5ea50a20c1 100644
--- a/contacts/qcontactrelationship.cpp
+++ b/src/contacts/qcontactrelationship.cpp
diff --git a/contacts/qcontactrelationship.h b/src/contacts/qcontactrelationship.h
index 91d88c4c71..91d88c4c71 100644
--- a/contacts/qcontactrelationship.h
+++ b/src/contacts/qcontactrelationship.h
diff --git a/contacts/qcontactrelationship_p.h b/src/contacts/qcontactrelationship_p.h
index f550efbe86..f550efbe86 100644
--- a/contacts/qcontactrelationship_p.h
+++ b/src/contacts/qcontactrelationship_p.h
diff --git a/contacts/qcontactrequestworker.cpp b/src/contacts/qcontactrequestworker.cpp
index fbb17bd10e..fbb17bd10e 100644
--- a/contacts/qcontactrequestworker.cpp
+++ b/src/contacts/qcontactrequestworker.cpp
diff --git a/contacts/qcontactrequestworker.h b/src/contacts/qcontactrequestworker.h
index c06a799ad8..c06a799ad8 100644
--- a/contacts/qcontactrequestworker.h
+++ b/src/contacts/qcontactrequestworker.h
diff --git a/contacts/qcontactrequestworker_p.h b/src/contacts/qcontactrequestworker_p.h
index c849a94c83..c849a94c83 100644
--- a/contacts/qcontactrequestworker_p.h
+++ b/src/contacts/qcontactrequestworker_p.h
diff --git a/contacts/qcontactsortorder.cpp b/src/contacts/qcontactsortorder.cpp
index 7c01e500ab..7c01e500ab 100644
--- a/contacts/qcontactsortorder.cpp
+++ b/src/contacts/qcontactsortorder.cpp
diff --git a/contacts/qcontactsortorder.h b/src/contacts/qcontactsortorder.h
index 357f8e55da..357f8e55da 100644
--- a/contacts/qcontactsortorder.h
+++ b/src/contacts/qcontactsortorder.h
diff --git a/contacts/qcontactsortorder_p.h b/src/contacts/qcontactsortorder_p.h
index aed0bebcee..aed0bebcee 100644
--- a/contacts/qcontactsortorder_p.h
+++ b/src/contacts/qcontactsortorder_p.h
diff --git a/contacts/qtcontacts.h b/src/contacts/qtcontacts.h
index 7d0f8db2ea..7d0f8db2ea 100644
--- a/contacts/qtcontacts.h
+++ b/src/contacts/qtcontacts.h
diff --git a/contacts/qtcontactsglobal.h b/src/contacts/qtcontactsglobal.h
index a915bf85dd..a915bf85dd 100644
--- a/contacts/qtcontactsglobal.h
+++ b/src/contacts/qtcontactsglobal.h
diff --git a/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp
index 55cf96af86..55cf96af86 100644
--- a/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp
+++ b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp
diff --git a/contacts/requests/qcontactdetaildefinitionfetchrequest.h b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h
index 69e3c5ef3c..69e3c5ef3c 100644
--- a/contacts/requests/qcontactdetaildefinitionfetchrequest.h
+++ b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h
diff --git a/contacts/requests/qcontactdetaildefinitionremoverequest.cpp b/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp
index 9390988f63..9390988f63 100644
--- a/contacts/requests/qcontactdetaildefinitionremoverequest.cpp
+++ b/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp
diff --git a/contacts/requests/qcontactdetaildefinitionremoverequest.h b/src/contacts/requests/qcontactdetaildefinitionremoverequest.h
index 3073fa3151..3073fa3151 100644
--- a/contacts/requests/qcontactdetaildefinitionremoverequest.h
+++ b/src/contacts/requests/qcontactdetaildefinitionremoverequest.h
diff --git a/contacts/requests/qcontactdetaildefinitionsaverequest.cpp b/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp
index f2264c298d..f2264c298d 100644
--- a/contacts/requests/qcontactdetaildefinitionsaverequest.cpp
+++ b/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp
diff --git a/contacts/requests/qcontactdetaildefinitionsaverequest.h b/src/contacts/requests/qcontactdetaildefinitionsaverequest.h
index c07a436c62..c07a436c62 100644
--- a/contacts/requests/qcontactdetaildefinitionsaverequest.h
+++ b/src/contacts/requests/qcontactdetaildefinitionsaverequest.h
diff --git a/contacts/requests/qcontactfetchrequest.cpp b/src/contacts/requests/qcontactfetchrequest.cpp
index c351bbf638..c351bbf638 100644
--- a/contacts/requests/qcontactfetchrequest.cpp
+++ b/src/contacts/requests/qcontactfetchrequest.cpp
diff --git a/contacts/requests/qcontactfetchrequest.h b/src/contacts/requests/qcontactfetchrequest.h
index fb5336b286..fb5336b286 100644
--- a/contacts/requests/qcontactfetchrequest.h
+++ b/src/contacts/requests/qcontactfetchrequest.h
diff --git a/contacts/requests/qcontactgroupfetchrequest.cpp b/src/contacts/requests/qcontactgroupfetchrequest.cpp
index c2e742d17f..c2e742d17f 100644
--- a/contacts/requests/qcontactgroupfetchrequest.cpp
+++ b/src/contacts/requests/qcontactgroupfetchrequest.cpp
diff --git a/contacts/requests/qcontactlocalidfetchrequest.cpp b/src/contacts/requests/qcontactlocalidfetchrequest.cpp
index 7d6d170ff9..7d6d170ff9 100644
--- a/contacts/requests/qcontactlocalidfetchrequest.cpp
+++ b/src/contacts/requests/qcontactlocalidfetchrequest.cpp
diff --git a/contacts/requests/qcontactlocalidfetchrequest.h b/src/contacts/requests/qcontactlocalidfetchrequest.h
index 7496251e7c..7496251e7c 100644
--- a/contacts/requests/qcontactlocalidfetchrequest.h
+++ b/src/contacts/requests/qcontactlocalidfetchrequest.h
diff --git a/contacts/requests/qcontactrelationshipfetchrequest.cpp b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
index 22413e113c..22413e113c 100644
--- a/contacts/requests/qcontactrelationshipfetchrequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
diff --git a/contacts/requests/qcontactrelationshipfetchrequest.h b/src/contacts/requests/qcontactrelationshipfetchrequest.h
index 59855e9e53..59855e9e53 100644
--- a/contacts/requests/qcontactrelationshipfetchrequest.h
+++ b/src/contacts/requests/qcontactrelationshipfetchrequest.h
diff --git a/contacts/requests/qcontactrelationshipremoverequest.cpp b/src/contacts/requests/qcontactrelationshipremoverequest.cpp
index c43a02dafb..c43a02dafb 100644
--- a/contacts/requests/qcontactrelationshipremoverequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipremoverequest.cpp
diff --git a/contacts/requests/qcontactrelationshipremoverequest.h b/src/contacts/requests/qcontactrelationshipremoverequest.h
index 5518b4b297..5518b4b297 100644
--- a/contacts/requests/qcontactrelationshipremoverequest.h
+++ b/src/contacts/requests/qcontactrelationshipremoverequest.h
diff --git a/contacts/requests/qcontactrelationshipsaverequest.cpp b/src/contacts/requests/qcontactrelationshipsaverequest.cpp
index c7046bf707..c7046bf707 100644
--- a/contacts/requests/qcontactrelationshipsaverequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipsaverequest.cpp
diff --git a/contacts/requests/qcontactrelationshipsaverequest.h b/src/contacts/requests/qcontactrelationshipsaverequest.h
index 057d06cbde..057d06cbde 100644
--- a/contacts/requests/qcontactrelationshipsaverequest.h
+++ b/src/contacts/requests/qcontactrelationshipsaverequest.h
diff --git a/contacts/requests/qcontactremoverequest.cpp b/src/contacts/requests/qcontactremoverequest.cpp
index b11c0b4451..b11c0b4451 100644
--- a/contacts/requests/qcontactremoverequest.cpp
+++ b/src/contacts/requests/qcontactremoverequest.cpp
diff --git a/contacts/requests/qcontactremoverequest.h b/src/contacts/requests/qcontactremoverequest.h
index 43ac9eb7de..43ac9eb7de 100644
--- a/contacts/requests/qcontactremoverequest.h
+++ b/src/contacts/requests/qcontactremoverequest.h
diff --git a/contacts/requests/qcontactrequests.h b/src/contacts/requests/qcontactrequests.h
index db6a5051cf..db6a5051cf 100644
--- a/contacts/requests/qcontactrequests.h
+++ b/src/contacts/requests/qcontactrequests.h
diff --git a/contacts/requests/qcontactrequests_p.h b/src/contacts/requests/qcontactrequests_p.h
index 81fe1cf631..81fe1cf631 100644
--- a/contacts/requests/qcontactrequests_p.h
+++ b/src/contacts/requests/qcontactrequests_p.h
diff --git a/contacts/requests/qcontactsaverequest.cpp b/src/contacts/requests/qcontactsaverequest.cpp
index d218f7786f..d218f7786f 100644
--- a/contacts/requests/qcontactsaverequest.cpp
+++ b/src/contacts/requests/qcontactsaverequest.cpp
diff --git a/contacts/requests/qcontactsaverequest.h b/src/contacts/requests/qcontactsaverequest.h
index da0e1f7e83..da0e1f7e83 100644
--- a/contacts/requests/qcontactsaverequest.h
+++ b/src/contacts/requests/qcontactsaverequest.h
diff --git a/contacts/requests/requests.pri b/src/contacts/requests/requests.pri
index 02c7be528d..02c7be528d 100644
--- a/contacts/requests/requests.pri
+++ b/src/contacts/requests/requests.pri
diff --git a/location/location.pro b/src/location/location.pro
index f8a68f5913..5a7190dae6 100644
--- a/location/location.pro
+++ b/src/location/location.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = QtLocation
 QT = core
 
-include(../common.pri)
+include(../../common.pri)
 
 #S60 area monitoring must be switched on explicitly, it requires
 #LBT headers and binaries
@@ -105,4 +105,4 @@ symbian {
     DEPLOYMENT += QtLocationDeployment
 }
 
-include(../features/deploy.pri)
+include(../../features/deploy.pri)
diff --git a/location/notificationcallback_s60_p.h b/src/location/notificationcallback_s60_p.h
index 231775a201..231775a201 100644
--- a/location/notificationcallback_s60_p.h
+++ b/src/location/notificationcallback_s60_p.h
diff --git a/location/notificationmonitorcallback_s60_p.h b/src/location/notificationmonitorcallback_s60_p.h
index 7cd67e9db5..7cd67e9db5 100644
--- a/location/notificationmonitorcallback_s60_p.h
+++ b/src/location/notificationmonitorcallback_s60_p.h
diff --git a/location/qgeoareamonitor.cpp b/src/location/qgeoareamonitor.cpp
index 2191d2ac69..2191d2ac69 100644
--- a/location/qgeoareamonitor.cpp
+++ b/src/location/qgeoareamonitor.cpp
diff --git a/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h
index 9fff54b9e5..9fff54b9e5 100644
--- a/location/qgeoareamonitor.h
+++ b/src/location/qgeoareamonitor.h
diff --git a/location/qgeoareamonitor_s60.cpp b/src/location/qgeoareamonitor_s60.cpp
index 11f64a1e26..11f64a1e26 100644
--- a/location/qgeoareamonitor_s60.cpp
+++ b/src/location/qgeoareamonitor_s60.cpp
diff --git a/location/qgeoareamonitor_s60_p.h b/src/location/qgeoareamonitor_s60_p.h
index cb808a19d3..cb808a19d3 100644
--- a/location/qgeoareamonitor_s60_p.h
+++ b/src/location/qgeoareamonitor_s60_p.h
diff --git a/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp
index e0e35a9da3..e0e35a9da3 100644
--- a/location/qgeocoordinate.cpp
+++ b/src/location/qgeocoordinate.cpp
diff --git a/location/qgeocoordinate.h b/src/location/qgeocoordinate.h
index a4afd5fe48..a4afd5fe48 100644
--- a/location/qgeocoordinate.h
+++ b/src/location/qgeocoordinate.h
diff --git a/location/qgeoinfothread_wince.cpp b/src/location/qgeoinfothread_wince.cpp
index 5a25530034..5a25530034 100644
--- a/location/qgeoinfothread_wince.cpp
+++ b/src/location/qgeoinfothread_wince.cpp
diff --git a/location/qgeoinfothread_wince_p.h b/src/location/qgeoinfothread_wince_p.h
index 5f6f9f0d85..5f6f9f0d85 100644
--- a/location/qgeoinfothread_wince_p.h
+++ b/src/location/qgeoinfothread_wince_p.h
diff --git a/location/qgeopositioninfo.cpp b/src/location/qgeopositioninfo.cpp
index 08a66b0526..08a66b0526 100644
--- a/location/qgeopositioninfo.cpp
+++ b/src/location/qgeopositioninfo.cpp
diff --git a/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h
index 4a2b2faa8a..4a2b2faa8a 100644
--- a/location/qgeopositioninfo.h
+++ b/src/location/qgeopositioninfo.h
diff --git a/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp
index 6914bd69a6..6914bd69a6 100644
--- a/location/qgeopositioninfosource.cpp
+++ b/src/location/qgeopositioninfosource.cpp
diff --git a/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h
index aa54cdb01a..aa54cdb01a 100644
--- a/location/qgeopositioninfosource.h
+++ b/src/location/qgeopositioninfosource.h
diff --git a/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp
index 6df7551ba0..6df7551ba0 100644
--- a/location/qgeopositioninfosource_s60.cpp
+++ b/src/location/qgeopositioninfosource_s60.cpp
diff --git a/location/qgeopositioninfosource_s60_p.h b/src/location/qgeopositioninfosource_s60_p.h
index 6b9db252b9..6b9db252b9 100644
--- a/location/qgeopositioninfosource_s60_p.h
+++ b/src/location/qgeopositioninfosource_s60_p.h
diff --git a/location/qgeopositioninfosource_wince.cpp b/src/location/qgeopositioninfosource_wince.cpp
index 0e7111b29e..0e7111b29e 100644
--- a/location/qgeopositioninfosource_wince.cpp
+++ b/src/location/qgeopositioninfosource_wince.cpp
diff --git a/location/qgeopositioninfosource_wince_p.h b/src/location/qgeopositioninfosource_wince_p.h
index 919c97d07c..919c97d07c 100644
--- a/location/qgeopositioninfosource_wince_p.h
+++ b/src/location/qgeopositioninfosource_wince_p.h
diff --git a/location/qgeosatelliteinfo.cpp b/src/location/qgeosatelliteinfo.cpp
index 49654efcea..49654efcea 100644
--- a/location/qgeosatelliteinfo.cpp
+++ b/src/location/qgeosatelliteinfo.cpp
diff --git a/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h
index 9108ff05fc..9108ff05fc 100644
--- a/location/qgeosatelliteinfo.h
+++ b/src/location/qgeosatelliteinfo.h
diff --git a/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp
index 7fbfb5fd4e..7fbfb5fd4e 100644
--- a/location/qgeosatelliteinfosource.cpp
+++ b/src/location/qgeosatelliteinfosource.cpp
diff --git a/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h
index c7da2afd4c..c7da2afd4c 100644
--- a/location/qgeosatelliteinfosource.h
+++ b/src/location/qgeosatelliteinfosource.h
diff --git a/location/qgeosatelliteinfosource_wince.cpp b/src/location/qgeosatelliteinfosource_wince.cpp
index 236350d6d5..236350d6d5 100644
--- a/location/qgeosatelliteinfosource_wince.cpp
+++ b/src/location/qgeosatelliteinfosource_wince.cpp
diff --git a/location/qgeosatelliteinfosource_wince_p.h b/src/location/qgeosatelliteinfosource_wince_p.h
index 708ba37afc..708ba37afc 100644
--- a/location/qgeosatelliteinfosource_wince_p.h
+++ b/src/location/qgeosatelliteinfosource_wince_p.h
diff --git a/location/qlocationglobal.h b/src/location/qlocationglobal.h
index f4e4923672..f4e4923672 100644
--- a/location/qlocationglobal.h
+++ b/src/location/qlocationglobal.h
diff --git a/location/qlocationutils.cpp b/src/location/qlocationutils.cpp
index 60637c9ff3..60637c9ff3 100644
--- a/location/qlocationutils.cpp
+++ b/src/location/qlocationutils.cpp
diff --git a/location/qlocationutils_p.h b/src/location/qlocationutils_p.h
index a4a87dc874..a4a87dc874 100644
--- a/location/qlocationutils_p.h
+++ b/src/location/qlocationutils_p.h
diff --git a/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp
index 04fae86d74..04fae86d74 100644
--- a/location/qmlbackendao_s60.cpp
+++ b/src/location/qmlbackendao_s60.cpp
diff --git a/location/qmlbackendao_s60_p.h b/src/location/qmlbackendao_s60_p.h
index e780fe3fbd..e780fe3fbd 100644
--- a/location/qmlbackendao_s60_p.h
+++ b/src/location/qmlbackendao_s60_p.h
diff --git a/location/qmlbackendmonitorao_s60.cpp b/src/location/qmlbackendmonitorao_s60.cpp
index aa9e13b792..aa9e13b792 100644
--- a/location/qmlbackendmonitorao_s60.cpp
+++ b/src/location/qmlbackendmonitorao_s60.cpp
diff --git a/location/qmlbackendmonitorao_s60_p.h b/src/location/qmlbackendmonitorao_s60_p.h
index a924e3aa13..a924e3aa13 100644
--- a/location/qmlbackendmonitorao_s60_p.h
+++ b/src/location/qmlbackendmonitorao_s60_p.h
diff --git a/location/qmlbackendmonitorcreatetriggerao_s60.cpp b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp
index 4473d63b7e..4473d63b7e 100644
--- a/location/qmlbackendmonitorcreatetriggerao_s60.cpp
+++ b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp
diff --git a/location/qmlbackendmonitorcreatetriggerao_s60_p.h b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h
index 633f1dde7d..633f1dde7d 100644
--- a/location/qmlbackendmonitorcreatetriggerao_s60_p.h
+++ b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h
diff --git a/location/qmlbackendmonitorinfo_s60.cpp b/src/location/qmlbackendmonitorinfo_s60.cpp
index bddc283f2a..bddc283f2a 100644
--- a/location/qmlbackendmonitorinfo_s60.cpp
+++ b/src/location/qmlbackendmonitorinfo_s60.cpp
diff --git a/location/qmlbackendmonitorinfo_s60_p.h b/src/location/qmlbackendmonitorinfo_s60_p.h
index 0daba941b2..0daba941b2 100644
--- a/location/qmlbackendmonitorinfo_s60_p.h
+++ b/src/location/qmlbackendmonitorinfo_s60_p.h
diff --git a/location/qmlbackendtriggerchangeao_s60.cpp b/src/location/qmlbackendtriggerchangeao_s60.cpp
index de2dbeeefc..de2dbeeefc 100644
--- a/location/qmlbackendtriggerchangeao_s60.cpp
+++ b/src/location/qmlbackendtriggerchangeao_s60.cpp
diff --git a/location/qmlbackendtriggerchangeao_s60_p.h b/src/location/qmlbackendtriggerchangeao_s60_p.h
index d233b907d4..d233b907d4 100644
--- a/location/qmlbackendtriggerchangeao_s60_p.h
+++ b/src/location/qmlbackendtriggerchangeao_s60_p.h
diff --git a/location/qnmeapositioninfosource.cpp b/src/location/qnmeapositioninfosource.cpp
index 2b337e7f16..2b337e7f16 100644
--- a/location/qnmeapositioninfosource.cpp
+++ b/src/location/qnmeapositioninfosource.cpp
diff --git a/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h
index 5b5bf8989b..5b5bf8989b 100644
--- a/location/qnmeapositioninfosource.h
+++ b/src/location/qnmeapositioninfosource.h
diff --git a/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h
index 9c72e99390..9c72e99390 100644
--- a/location/qnmeapositioninfosource_p.h
+++ b/src/location/qnmeapositioninfosource_p.h
diff --git a/messaging/addresshelper.cpp b/src/messaging/addresshelper.cpp
index 7f77249dd1..7f77249dd1 100644
--- a/messaging/addresshelper.cpp
+++ b/src/messaging/addresshelper.cpp
diff --git a/messaging/addresshelper_p.h b/src/messaging/addresshelper_p.h
index b8dd029694..b8dd029694 100644
--- a/messaging/addresshelper_p.h
+++ b/src/messaging/addresshelper_p.h
diff --git a/messaging/messaging.README b/src/messaging/messaging.README
index fabde34896..fabde34896 100644
--- a/messaging/messaging.README
+++ b/src/messaging/messaging.README
diff --git a/messaging/messaging.pro b/src/messaging/messaging.pro
index 373126de42..25d39511f0 100644
--- a/messaging/messaging.pro
+++ b/src/messaging/messaging.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = QtMessaging
 
-include(../common.pri)
+include(../../common.pri)
 
 INCLUDEPATH += .
 
@@ -176,4 +176,4 @@ SOURCES += qmessageid_qmf.cpp \
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
-include(../features/deploy.pri)
+include(../../features/deploy.pri)
diff --git a/messaging/qmessage.cpp b/src/messaging/qmessage.cpp
index d09d1488fa..d09d1488fa 100644
--- a/messaging/qmessage.cpp
+++ b/src/messaging/qmessage.cpp
diff --git a/messaging/qmessage.h b/src/messaging/qmessage.h
index e092379bb9..e092379bb9 100644
--- a/messaging/qmessage.h
+++ b/src/messaging/qmessage.h
diff --git a/messaging/qmessage_maemo.cpp b/src/messaging/qmessage_maemo.cpp
index 02e8874fd8..02e8874fd8 100644
--- a/messaging/qmessage_maemo.cpp
+++ b/src/messaging/qmessage_maemo.cpp
diff --git a/messaging/qmessage_p.h b/src/messaging/qmessage_p.h
index e80d186c92..e80d186c92 100644
--- a/messaging/qmessage_p.h
+++ b/src/messaging/qmessage_p.h
diff --git a/messaging/qmessage_qmf.cpp b/src/messaging/qmessage_qmf.cpp
index f8cc98eabf..f8cc98eabf 100644
--- a/messaging/qmessage_qmf.cpp
+++ b/src/messaging/qmessage_qmf.cpp
diff --git a/messaging/qmessage_symbian.cpp b/src/messaging/qmessage_symbian.cpp
index 02e8874fd8..02e8874fd8 100644
--- a/messaging/qmessage_symbian.cpp
+++ b/src/messaging/qmessage_symbian.cpp
diff --git a/messaging/qmessage_win.cpp b/src/messaging/qmessage_win.cpp
index 646e039f9a..646e039f9a 100644
--- a/messaging/qmessage_win.cpp
+++ b/src/messaging/qmessage_win.cpp
diff --git a/messaging/qmessageaccount.cpp b/src/messaging/qmessageaccount.cpp
index 3133aa830a..3133aa830a 100644
--- a/messaging/qmessageaccount.cpp
+++ b/src/messaging/qmessageaccount.cpp
diff --git a/messaging/qmessageaccount.h b/src/messaging/qmessageaccount.h
index 7aaed26bf4..7aaed26bf4 100644
--- a/messaging/qmessageaccount.h
+++ b/src/messaging/qmessageaccount.h
diff --git a/messaging/qmessageaccount_maemo.cpp b/src/messaging/qmessageaccount_maemo.cpp
index cd34699511..cd34699511 100644
--- a/messaging/qmessageaccount_maemo.cpp
+++ b/src/messaging/qmessageaccount_maemo.cpp
diff --git a/messaging/qmessageaccount_p.h b/src/messaging/qmessageaccount_p.h
index 43592da935..43592da935 100644
--- a/messaging/qmessageaccount_p.h
+++ b/src/messaging/qmessageaccount_p.h
diff --git a/messaging/qmessageaccount_qmf.cpp b/src/messaging/qmessageaccount_qmf.cpp
index a3c6533ef6..a3c6533ef6 100644
--- a/messaging/qmessageaccount_qmf.cpp
+++ b/src/messaging/qmessageaccount_qmf.cpp
diff --git a/messaging/qmessageaccount_symbian.cpp b/src/messaging/qmessageaccount_symbian.cpp
index cd34699511..cd34699511 100644
--- a/messaging/qmessageaccount_symbian.cpp
+++ b/src/messaging/qmessageaccount_symbian.cpp
diff --git a/messaging/qmessageaccount_win.cpp b/src/messaging/qmessageaccount_win.cpp
index 11093ed5ab..11093ed5ab 100644
--- a/messaging/qmessageaccount_win.cpp
+++ b/src/messaging/qmessageaccount_win.cpp
diff --git a/messaging/qmessageaccountfilter.cpp b/src/messaging/qmessageaccountfilter.cpp
index 764cc0f434..764cc0f434 100644
--- a/messaging/qmessageaccountfilter.cpp
+++ b/src/messaging/qmessageaccountfilter.cpp
diff --git a/messaging/qmessageaccountfilter.h b/src/messaging/qmessageaccountfilter.h
index 78d9dd309b..78d9dd309b 100644
--- a/messaging/qmessageaccountfilter.h
+++ b/src/messaging/qmessageaccountfilter.h
diff --git a/messaging/qmessageaccountfilter_maemo.cpp b/src/messaging/qmessageaccountfilter_maemo.cpp
index 66ce261350..66ce261350 100644
--- a/messaging/qmessageaccountfilter_maemo.cpp
+++ b/src/messaging/qmessageaccountfilter_maemo.cpp
diff --git a/messaging/qmessageaccountfilter_p.h b/src/messaging/qmessageaccountfilter_p.h
index ec6a26257b..ec6a26257b 100644
--- a/messaging/qmessageaccountfilter_p.h
+++ b/src/messaging/qmessageaccountfilter_p.h
diff --git a/messaging/qmessageaccountfilter_qmf.cpp b/src/messaging/qmessageaccountfilter_qmf.cpp
index 05879cc63f..05879cc63f 100644
--- a/messaging/qmessageaccountfilter_qmf.cpp
+++ b/src/messaging/qmessageaccountfilter_qmf.cpp
diff --git a/messaging/qmessageaccountfilter_symbian.cpp b/src/messaging/qmessageaccountfilter_symbian.cpp
index 66ce261350..66ce261350 100644
--- a/messaging/qmessageaccountfilter_symbian.cpp
+++ b/src/messaging/qmessageaccountfilter_symbian.cpp
diff --git a/messaging/qmessageaccountfilter_win.cpp b/src/messaging/qmessageaccountfilter_win.cpp
index 67d409fd15..67d409fd15 100644
--- a/messaging/qmessageaccountfilter_win.cpp
+++ b/src/messaging/qmessageaccountfilter_win.cpp
diff --git a/messaging/qmessageaccountid.cpp b/src/messaging/qmessageaccountid.cpp
index 3e87689480..3e87689480 100644
--- a/messaging/qmessageaccountid.cpp
+++ b/src/messaging/qmessageaccountid.cpp
diff --git a/messaging/qmessageaccountid.h b/src/messaging/qmessageaccountid.h
index 51666d7cf0..51666d7cf0 100644
--- a/messaging/qmessageaccountid.h
+++ b/src/messaging/qmessageaccountid.h
diff --git a/messaging/qmessageaccountid_maemo.cpp b/src/messaging/qmessageaccountid_maemo.cpp
index a1888b838e..a1888b838e 100644
--- a/messaging/qmessageaccountid_maemo.cpp
+++ b/src/messaging/qmessageaccountid_maemo.cpp
diff --git a/messaging/qmessageaccountid_p.h b/src/messaging/qmessageaccountid_p.h
index 5b9dd63682..5b9dd63682 100644
--- a/messaging/qmessageaccountid_p.h
+++ b/src/messaging/qmessageaccountid_p.h
diff --git a/messaging/qmessageaccountid_qmf.cpp b/src/messaging/qmessageaccountid_qmf.cpp
index 142758bb35..142758bb35 100644
--- a/messaging/qmessageaccountid_qmf.cpp
+++ b/src/messaging/qmessageaccountid_qmf.cpp
diff --git a/messaging/qmessageaccountid_symbian.cpp b/src/messaging/qmessageaccountid_symbian.cpp
index a1888b838e..a1888b838e 100644
--- a/messaging/qmessageaccountid_symbian.cpp
+++ b/src/messaging/qmessageaccountid_symbian.cpp
diff --git a/messaging/qmessageaccountid_win.cpp b/src/messaging/qmessageaccountid_win.cpp
index 08ca9ec541..08ca9ec541 100644
--- a/messaging/qmessageaccountid_win.cpp
+++ b/src/messaging/qmessageaccountid_win.cpp
diff --git a/messaging/qmessageaccountordering.cpp b/src/messaging/qmessageaccountordering.cpp
index 2aac46ff93..2aac46ff93 100644
--- a/messaging/qmessageaccountordering.cpp
+++ b/src/messaging/qmessageaccountordering.cpp
diff --git a/messaging/qmessageaccountordering.h b/src/messaging/qmessageaccountordering.h
index ec85f33572..ec85f33572 100644
--- a/messaging/qmessageaccountordering.h
+++ b/src/messaging/qmessageaccountordering.h
diff --git a/messaging/qmessageaccountordering_maemo.cpp b/src/messaging/qmessageaccountordering_maemo.cpp
index 8eddce7585..8eddce7585 100644
--- a/messaging/qmessageaccountordering_maemo.cpp
+++ b/src/messaging/qmessageaccountordering_maemo.cpp
diff --git a/messaging/qmessageaccountordering_p.h b/src/messaging/qmessageaccountordering_p.h
index 8ebe72bb52..8ebe72bb52 100644
--- a/messaging/qmessageaccountordering_p.h
+++ b/src/messaging/qmessageaccountordering_p.h
diff --git a/messaging/qmessageaccountordering_qmf.cpp b/src/messaging/qmessageaccountordering_qmf.cpp
index ce8ea535c1..ce8ea535c1 100644
--- a/messaging/qmessageaccountordering_qmf.cpp
+++ b/src/messaging/qmessageaccountordering_qmf.cpp
diff --git a/messaging/qmessageaccountordering_symbian.cpp b/src/messaging/qmessageaccountordering_symbian.cpp
index 8eddce7585..8eddce7585 100644
--- a/messaging/qmessageaccountordering_symbian.cpp
+++ b/src/messaging/qmessageaccountordering_symbian.cpp
diff --git a/messaging/qmessageaccountordering_win.cpp b/src/messaging/qmessageaccountordering_win.cpp
index f612da494b..f612da494b 100644
--- a/messaging/qmessageaccountordering_win.cpp
+++ b/src/messaging/qmessageaccountordering_win.cpp
diff --git a/messaging/qmessageaddress.cpp b/src/messaging/qmessageaddress.cpp
index ce594c3d28..ce594c3d28 100644
--- a/messaging/qmessageaddress.cpp
+++ b/src/messaging/qmessageaddress.cpp
diff --git a/messaging/qmessageaddress.h b/src/messaging/qmessageaddress.h
index b6a8e929e7..b6a8e929e7 100644
--- a/messaging/qmessageaddress.h
+++ b/src/messaging/qmessageaddress.h
diff --git a/messaging/qmessageaddress_p.h b/src/messaging/qmessageaddress_p.h
index 145d2b5fd7..145d2b5fd7 100644
--- a/messaging/qmessageaddress_p.h
+++ b/src/messaging/qmessageaddress_p.h
diff --git a/messaging/qmessagecontentcontainer.cpp b/src/messaging/qmessagecontentcontainer.cpp
index a787fdfa32..a787fdfa32 100644
--- a/messaging/qmessagecontentcontainer.cpp
+++ b/src/messaging/qmessagecontentcontainer.cpp
diff --git a/messaging/qmessagecontentcontainer.h b/src/messaging/qmessagecontentcontainer.h
index 881d793024..881d793024 100644
--- a/messaging/qmessagecontentcontainer.h
+++ b/src/messaging/qmessagecontentcontainer.h
diff --git a/messaging/qmessagecontentcontainer_maemo.cpp b/src/messaging/qmessagecontentcontainer_maemo.cpp
index 22eb6cd8bb..22eb6cd8bb 100644
--- a/messaging/qmessagecontentcontainer_maemo.cpp
+++ b/src/messaging/qmessagecontentcontainer_maemo.cpp
diff --git a/messaging/qmessagecontentcontainer_p.h b/src/messaging/qmessagecontentcontainer_p.h
index 074a7b9df9..074a7b9df9 100644
--- a/messaging/qmessagecontentcontainer_p.h
+++ b/src/messaging/qmessagecontentcontainer_p.h
diff --git a/messaging/qmessagecontentcontainer_qmf.cpp b/src/messaging/qmessagecontentcontainer_qmf.cpp
index c5f83f7e82..c5f83f7e82 100644
--- a/messaging/qmessagecontentcontainer_qmf.cpp
+++ b/src/messaging/qmessagecontentcontainer_qmf.cpp
diff --git a/messaging/qmessagecontentcontainer_symbian.cpp b/src/messaging/qmessagecontentcontainer_symbian.cpp
index 22eb6cd8bb..22eb6cd8bb 100644
--- a/messaging/qmessagecontentcontainer_symbian.cpp
+++ b/src/messaging/qmessagecontentcontainer_symbian.cpp
diff --git a/messaging/qmessagecontentcontainer_win.cpp b/src/messaging/qmessagecontentcontainer_win.cpp
index 8e53b8e873..8e53b8e873 100644
--- a/messaging/qmessagecontentcontainer_win.cpp
+++ b/src/messaging/qmessagecontentcontainer_win.cpp
diff --git a/messaging/qmessagecontentcontainerid.cpp b/src/messaging/qmessagecontentcontainerid.cpp
index 611616cee5..611616cee5 100644
--- a/messaging/qmessagecontentcontainerid.cpp
+++ b/src/messaging/qmessagecontentcontainerid.cpp
diff --git a/messaging/qmessagecontentcontainerid.h b/src/messaging/qmessagecontentcontainerid.h
index eb5d58ce50..eb5d58ce50 100644
--- a/messaging/qmessagecontentcontainerid.h
+++ b/src/messaging/qmessagecontentcontainerid.h
diff --git a/messaging/qmessagecontentcontainerid_maemo.cpp b/src/messaging/qmessagecontentcontainerid_maemo.cpp
index 9cfbb4e88f..9cfbb4e88f 100644
--- a/messaging/qmessagecontentcontainerid_maemo.cpp
+++ b/src/messaging/qmessagecontentcontainerid_maemo.cpp
diff --git a/messaging/qmessagecontentcontainerid_p.h b/src/messaging/qmessagecontentcontainerid_p.h
index eaf09df177..eaf09df177 100644
--- a/messaging/qmessagecontentcontainerid_p.h
+++ b/src/messaging/qmessagecontentcontainerid_p.h
diff --git a/messaging/qmessagecontentcontainerid_qmf.cpp b/src/messaging/qmessagecontentcontainerid_qmf.cpp
index 96d28fd19d..96d28fd19d 100644
--- a/messaging/qmessagecontentcontainerid_qmf.cpp
+++ b/src/messaging/qmessagecontentcontainerid_qmf.cpp
diff --git a/messaging/qmessagecontentcontainerid_symbian.cpp b/src/messaging/qmessagecontentcontainerid_symbian.cpp
index 9cfbb4e88f..9cfbb4e88f 100644
--- a/messaging/qmessagecontentcontainerid_symbian.cpp
+++ b/src/messaging/qmessagecontentcontainerid_symbian.cpp
diff --git a/messaging/qmessagecontentcontainerid_win.cpp b/src/messaging/qmessagecontentcontainerid_win.cpp
index 2284ed6fff..2284ed6fff 100644
--- a/messaging/qmessagecontentcontainerid_win.cpp
+++ b/src/messaging/qmessagecontentcontainerid_win.cpp
diff --git a/messaging/qmessagedatacomparator.cpp b/src/messaging/qmessagedatacomparator.cpp
index 75ae4a7916..75ae4a7916 100644
--- a/messaging/qmessagedatacomparator.cpp
+++ b/src/messaging/qmessagedatacomparator.cpp
diff --git a/messaging/qmessagedatacomparator.h b/src/messaging/qmessagedatacomparator.h
index 67d3e9a152..67d3e9a152 100644
--- a/messaging/qmessagedatacomparator.h
+++ b/src/messaging/qmessagedatacomparator.h
diff --git a/messaging/qmessagefilter.cpp b/src/messaging/qmessagefilter.cpp
index 4e6e4b5f99..4e6e4b5f99 100644
--- a/messaging/qmessagefilter.cpp
+++ b/src/messaging/qmessagefilter.cpp
diff --git a/messaging/qmessagefilter.h b/src/messaging/qmessagefilter.h
index 970a085f42..970a085f42 100644
--- a/messaging/qmessagefilter.h
+++ b/src/messaging/qmessagefilter.h
diff --git a/messaging/qmessagefilter_maemo.cpp b/src/messaging/qmessagefilter_maemo.cpp
index 2688c7db4b..2688c7db4b 100644
--- a/messaging/qmessagefilter_maemo.cpp
+++ b/src/messaging/qmessagefilter_maemo.cpp
diff --git a/messaging/qmessagefilter_p.h b/src/messaging/qmessagefilter_p.h
index 0f4324491e..0f4324491e 100644
--- a/messaging/qmessagefilter_p.h
+++ b/src/messaging/qmessagefilter_p.h
diff --git a/messaging/qmessagefilter_qmf.cpp b/src/messaging/qmessagefilter_qmf.cpp
index 864c23b4de..864c23b4de 100644
--- a/messaging/qmessagefilter_qmf.cpp
+++ b/src/messaging/qmessagefilter_qmf.cpp
diff --git a/messaging/qmessagefilter_symbian.cpp b/src/messaging/qmessagefilter_symbian.cpp
index 2688c7db4b..2688c7db4b 100644
--- a/messaging/qmessagefilter_symbian.cpp
+++ b/src/messaging/qmessagefilter_symbian.cpp
diff --git a/messaging/qmessagefilter_win.cpp b/src/messaging/qmessagefilter_win.cpp
index 13e919b8f4..13e919b8f4 100644
--- a/messaging/qmessagefilter_win.cpp
+++ b/src/messaging/qmessagefilter_win.cpp
diff --git a/messaging/qmessagefolder.cpp b/src/messaging/qmessagefolder.cpp
index 8d2aedb8a5..8d2aedb8a5 100644
--- a/messaging/qmessagefolder.cpp
+++ b/src/messaging/qmessagefolder.cpp
diff --git a/messaging/qmessagefolder.h b/src/messaging/qmessagefolder.h
index d62f19b233..d62f19b233 100644
--- a/messaging/qmessagefolder.h
+++ b/src/messaging/qmessagefolder.h
diff --git a/messaging/qmessagefolder_maemo.cpp b/src/messaging/qmessagefolder_maemo.cpp
index 4c4c9b8021..4c4c9b8021 100644
--- a/messaging/qmessagefolder_maemo.cpp
+++ b/src/messaging/qmessagefolder_maemo.cpp
diff --git a/messaging/qmessagefolder_p.h b/src/messaging/qmessagefolder_p.h
index 6fe4ed34f3..6fe4ed34f3 100644
--- a/messaging/qmessagefolder_p.h
+++ b/src/messaging/qmessagefolder_p.h
diff --git a/messaging/qmessagefolder_qmf.cpp b/src/messaging/qmessagefolder_qmf.cpp
index 2726b041dc..2726b041dc 100644
--- a/messaging/qmessagefolder_qmf.cpp
+++ b/src/messaging/qmessagefolder_qmf.cpp
diff --git a/messaging/qmessagefolder_symbian.cpp b/src/messaging/qmessagefolder_symbian.cpp
index 4c4c9b8021..4c4c9b8021 100644
--- a/messaging/qmessagefolder_symbian.cpp
+++ b/src/messaging/qmessagefolder_symbian.cpp
diff --git a/messaging/qmessagefolder_win.cpp b/src/messaging/qmessagefolder_win.cpp
index a99d0066d7..a99d0066d7 100644
--- a/messaging/qmessagefolder_win.cpp
+++ b/src/messaging/qmessagefolder_win.cpp
diff --git a/messaging/qmessagefolderfilter.cpp b/src/messaging/qmessagefolderfilter.cpp
index 0cc72973c9..0cc72973c9 100644
--- a/messaging/qmessagefolderfilter.cpp
+++ b/src/messaging/qmessagefolderfilter.cpp
diff --git a/messaging/qmessagefolderfilter.h b/src/messaging/qmessagefolderfilter.h
index 6770764071..6770764071 100644
--- a/messaging/qmessagefolderfilter.h
+++ b/src/messaging/qmessagefolderfilter.h
diff --git a/messaging/qmessagefolderfilter_maemo.cpp b/src/messaging/qmessagefolderfilter_maemo.cpp
index a8ed845dea..a8ed845dea 100644
--- a/messaging/qmessagefolderfilter_maemo.cpp
+++ b/src/messaging/qmessagefolderfilter_maemo.cpp
diff --git a/messaging/qmessagefolderfilter_p.h b/src/messaging/qmessagefolderfilter_p.h
index bc0d497853..bc0d497853 100644
--- a/messaging/qmessagefolderfilter_p.h
+++ b/src/messaging/qmessagefolderfilter_p.h
diff --git a/messaging/qmessagefolderfilter_qmf.cpp b/src/messaging/qmessagefolderfilter_qmf.cpp
index cbf1606ea3..cbf1606ea3 100644
--- a/messaging/qmessagefolderfilter_qmf.cpp
+++ b/src/messaging/qmessagefolderfilter_qmf.cpp
diff --git a/messaging/qmessagefolderfilter_symbian.cpp b/src/messaging/qmessagefolderfilter_symbian.cpp
index a8ed845dea..a8ed845dea 100644
--- a/messaging/qmessagefolderfilter_symbian.cpp
+++ b/src/messaging/qmessagefolderfilter_symbian.cpp
diff --git a/messaging/qmessagefolderfilter_win.cpp b/src/messaging/qmessagefolderfilter_win.cpp
index 0fe91c7a4f..0fe91c7a4f 100644
--- a/messaging/qmessagefolderfilter_win.cpp
+++ b/src/messaging/qmessagefolderfilter_win.cpp
diff --git a/messaging/qmessagefolderid.cpp b/src/messaging/qmessagefolderid.cpp
index cb53a8dc66..cb53a8dc66 100644
--- a/messaging/qmessagefolderid.cpp
+++ b/src/messaging/qmessagefolderid.cpp
diff --git a/messaging/qmessagefolderid.h b/src/messaging/qmessagefolderid.h
index 45be642f31..45be642f31 100644
--- a/messaging/qmessagefolderid.h
+++ b/src/messaging/qmessagefolderid.h
diff --git a/messaging/qmessagefolderid_maemo.cpp b/src/messaging/qmessagefolderid_maemo.cpp
index 285c959eec..285c959eec 100644
--- a/messaging/qmessagefolderid_maemo.cpp
+++ b/src/messaging/qmessagefolderid_maemo.cpp
diff --git a/messaging/qmessagefolderid_p.h b/src/messaging/qmessagefolderid_p.h
index 5b649ff961..5b649ff961 100644
--- a/messaging/qmessagefolderid_p.h
+++ b/src/messaging/qmessagefolderid_p.h
diff --git a/messaging/qmessagefolderid_qmf.cpp b/src/messaging/qmessagefolderid_qmf.cpp
index 9e06e3859d..9e06e3859d 100644
--- a/messaging/qmessagefolderid_qmf.cpp
+++ b/src/messaging/qmessagefolderid_qmf.cpp
diff --git a/messaging/qmessagefolderid_symbian.cpp b/src/messaging/qmessagefolderid_symbian.cpp
index 5ce834f2aa..5ce834f2aa 100644
--- a/messaging/qmessagefolderid_symbian.cpp
+++ b/src/messaging/qmessagefolderid_symbian.cpp
diff --git a/messaging/qmessagefolderid_win.cpp b/src/messaging/qmessagefolderid_win.cpp
index e78cf21e3b..e78cf21e3b 100644
--- a/messaging/qmessagefolderid_win.cpp
+++ b/src/messaging/qmessagefolderid_win.cpp
diff --git a/messaging/qmessagefolderordering.cpp b/src/messaging/qmessagefolderordering.cpp
index 7b634a0ff4..7b634a0ff4 100644
--- a/messaging/qmessagefolderordering.cpp
+++ b/src/messaging/qmessagefolderordering.cpp
diff --git a/messaging/qmessagefolderordering.h b/src/messaging/qmessagefolderordering.h
index 85a3369f8e..85a3369f8e 100644
--- a/messaging/qmessagefolderordering.h
+++ b/src/messaging/qmessagefolderordering.h
diff --git a/messaging/qmessagefolderordering_maemo.cpp b/src/messaging/qmessagefolderordering_maemo.cpp
index e50850f0b7..e50850f0b7 100644
--- a/messaging/qmessagefolderordering_maemo.cpp
+++ b/src/messaging/qmessagefolderordering_maemo.cpp
diff --git a/messaging/qmessagefolderordering_p.h b/src/messaging/qmessagefolderordering_p.h
index fffb5ed9e5..fffb5ed9e5 100644
--- a/messaging/qmessagefolderordering_p.h
+++ b/src/messaging/qmessagefolderordering_p.h
diff --git a/messaging/qmessagefolderordering_qmf.cpp b/src/messaging/qmessagefolderordering_qmf.cpp
index cf57595a16..cf57595a16 100644
--- a/messaging/qmessagefolderordering_qmf.cpp
+++ b/src/messaging/qmessagefolderordering_qmf.cpp
diff --git a/messaging/qmessagefolderordering_symbian.cpp b/src/messaging/qmessagefolderordering_symbian.cpp
index e50850f0b7..e50850f0b7 100644
--- a/messaging/qmessagefolderordering_symbian.cpp
+++ b/src/messaging/qmessagefolderordering_symbian.cpp
diff --git a/messaging/qmessagefolderordering_win.cpp b/src/messaging/qmessagefolderordering_win.cpp
index c666fdd8bf..c666fdd8bf 100644
--- a/messaging/qmessagefolderordering_win.cpp
+++ b/src/messaging/qmessagefolderordering_win.cpp
diff --git a/messaging/qmessageglobal.h b/src/messaging/qmessageglobal.h
index 01ddde1daf..01ddde1daf 100644
--- a/messaging/qmessageglobal.h
+++ b/src/messaging/qmessageglobal.h
diff --git a/messaging/qmessageid.cpp b/src/messaging/qmessageid.cpp
index 8e63f8ca52..8e63f8ca52 100644
--- a/messaging/qmessageid.cpp
+++ b/src/messaging/qmessageid.cpp
diff --git a/messaging/qmessageid.h b/src/messaging/qmessageid.h
index fc79b2ffd5..fc79b2ffd5 100644
--- a/messaging/qmessageid.h
+++ b/src/messaging/qmessageid.h
diff --git a/messaging/qmessageid_maemo.cpp b/src/messaging/qmessageid_maemo.cpp
index 5779d51a4b..5779d51a4b 100644
--- a/messaging/qmessageid_maemo.cpp
+++ b/src/messaging/qmessageid_maemo.cpp
diff --git a/messaging/qmessageid_p.h b/src/messaging/qmessageid_p.h
index 77f29a9b95..77f29a9b95 100644
--- a/messaging/qmessageid_p.h
+++ b/src/messaging/qmessageid_p.h
diff --git a/messaging/qmessageid_qmf.cpp b/src/messaging/qmessageid_qmf.cpp
index b242a652d2..b242a652d2 100644
--- a/messaging/qmessageid_qmf.cpp
+++ b/src/messaging/qmessageid_qmf.cpp
diff --git a/messaging/qmessageid_symbian.cpp b/src/messaging/qmessageid_symbian.cpp
index 5779d51a4b..5779d51a4b 100644
--- a/messaging/qmessageid_symbian.cpp
+++ b/src/messaging/qmessageid_symbian.cpp
diff --git a/messaging/qmessageid_win.cpp b/src/messaging/qmessageid_win.cpp
index d859f6291b..d859f6291b 100644
--- a/messaging/qmessageid_win.cpp
+++ b/src/messaging/qmessageid_win.cpp
diff --git a/messaging/qmessageordering.cpp b/src/messaging/qmessageordering.cpp
index 6ceb33cc0d..6ceb33cc0d 100644
--- a/messaging/qmessageordering.cpp
+++ b/src/messaging/qmessageordering.cpp
diff --git a/messaging/qmessageordering.h b/src/messaging/qmessageordering.h
index c15f7dd5c4..c15f7dd5c4 100644
--- a/messaging/qmessageordering.h
+++ b/src/messaging/qmessageordering.h
diff --git a/messaging/qmessageordering_maemo.cpp b/src/messaging/qmessageordering_maemo.cpp
index f033c80fae..f033c80fae 100644
--- a/messaging/qmessageordering_maemo.cpp
+++ b/src/messaging/qmessageordering_maemo.cpp
diff --git a/messaging/qmessageordering_p.h b/src/messaging/qmessageordering_p.h
index 79609f8b89..79609f8b89 100644
--- a/messaging/qmessageordering_p.h
+++ b/src/messaging/qmessageordering_p.h
diff --git a/messaging/qmessageordering_qmf.cpp b/src/messaging/qmessageordering_qmf.cpp
index 1d7ba4d454..1d7ba4d454 100644
--- a/messaging/qmessageordering_qmf.cpp
+++ b/src/messaging/qmessageordering_qmf.cpp
diff --git a/messaging/qmessageordering_symbian.cpp b/src/messaging/qmessageordering_symbian.cpp
index f033c80fae..f033c80fae 100644
--- a/messaging/qmessageordering_symbian.cpp
+++ b/src/messaging/qmessageordering_symbian.cpp
diff --git a/messaging/qmessageordering_win.cpp b/src/messaging/qmessageordering_win.cpp
index 7b695334f2..7b695334f2 100644
--- a/messaging/qmessageordering_win.cpp
+++ b/src/messaging/qmessageordering_win.cpp
diff --git a/messaging/qmessageserviceaction.cpp b/src/messaging/qmessageserviceaction.cpp
index 40818d043e..40818d043e 100644
--- a/messaging/qmessageserviceaction.cpp
+++ b/src/messaging/qmessageserviceaction.cpp
diff --git a/messaging/qmessageserviceaction.h b/src/messaging/qmessageserviceaction.h
index eaa6fa83fd..eaa6fa83fd 100644
--- a/messaging/qmessageserviceaction.h
+++ b/src/messaging/qmessageserviceaction.h
diff --git a/messaging/qmessageserviceaction_maemo.cpp b/src/messaging/qmessageserviceaction_maemo.cpp
index b900b919f5..b900b919f5 100644
--- a/messaging/qmessageserviceaction_maemo.cpp
+++ b/src/messaging/qmessageserviceaction_maemo.cpp
diff --git a/messaging/qmessageserviceaction_qmf.cpp b/src/messaging/qmessageserviceaction_qmf.cpp
index d5aee7001b..d5aee7001b 100644
--- a/messaging/qmessageserviceaction_qmf.cpp
+++ b/src/messaging/qmessageserviceaction_qmf.cpp
diff --git a/messaging/qmessageserviceaction_symbian.cpp b/src/messaging/qmessageserviceaction_symbian.cpp
index 0168236701..0168236701 100644
--- a/messaging/qmessageserviceaction_symbian.cpp
+++ b/src/messaging/qmessageserviceaction_symbian.cpp
diff --git a/messaging/qmessageserviceaction_win.cpp b/src/messaging/qmessageserviceaction_win.cpp
index dc9a296701..dc9a296701 100644
--- a/messaging/qmessageserviceaction_win.cpp
+++ b/src/messaging/qmessageserviceaction_win.cpp
diff --git a/messaging/qmessagestore.cpp b/src/messaging/qmessagestore.cpp
index 63f66689e1..63f66689e1 100644
--- a/messaging/qmessagestore.cpp
+++ b/src/messaging/qmessagestore.cpp
diff --git a/messaging/qmessagestore.h b/src/messaging/qmessagestore.h
index 1718302969..1718302969 100644
--- a/messaging/qmessagestore.h
+++ b/src/messaging/qmessagestore.h
diff --git a/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp
index 487b75d5f4..487b75d5f4 100644
--- a/messaging/qmessagestore_maemo.cpp
+++ b/src/messaging/qmessagestore_maemo.cpp
diff --git a/messaging/qmessagestore_p.h b/src/messaging/qmessagestore_p.h
index 5b9334bba4..5b9334bba4 100644
--- a/messaging/qmessagestore_p.h
+++ b/src/messaging/qmessagestore_p.h
diff --git a/messaging/qmessagestore_qmf.cpp b/src/messaging/qmessagestore_qmf.cpp
index 8ddf28f7ce..8ddf28f7ce 100644
--- a/messaging/qmessagestore_qmf.cpp
+++ b/src/messaging/qmessagestore_qmf.cpp
diff --git a/messaging/qmessagestore_symbian.cpp b/src/messaging/qmessagestore_symbian.cpp
index 5563c07788..5563c07788 100644
--- a/messaging/qmessagestore_symbian.cpp
+++ b/src/messaging/qmessagestore_symbian.cpp
diff --git a/messaging/qmessagestore_win.cpp b/src/messaging/qmessagestore_win.cpp
index f72bc54b58..f72bc54b58 100644
--- a/messaging/qmessagestore_win.cpp
+++ b/src/messaging/qmessagestore_win.cpp
diff --git a/messaging/qmfhelpers.cpp b/src/messaging/qmfhelpers.cpp
index 0fe747f5f1..0fe747f5f1 100644
--- a/messaging/qmfhelpers.cpp
+++ b/src/messaging/qmfhelpers.cpp
diff --git a/messaging/qmfhelpers_p.h b/src/messaging/qmfhelpers_p.h
index 363a86b363..363a86b363 100644
--- a/messaging/qmfhelpers_p.h
+++ b/src/messaging/qmfhelpers_p.h
diff --git a/messaging/qtmessaging.h b/src/messaging/qtmessaging.h
index 90fcc995e7..90fcc995e7 100644
--- a/messaging/qtmessaging.h
+++ b/src/messaging/qtmessaging.h
diff --git a/messaging/winhelpers.cpp b/src/messaging/winhelpers.cpp
index e5d8e8836b..e5d8e8836b 100644
--- a/messaging/winhelpers.cpp
+++ b/src/messaging/winhelpers.cpp
diff --git a/messaging/winhelpers_p.h b/src/messaging/winhelpers_p.h
index 7bd11a979b..7bd11a979b 100644
--- a/messaging/winhelpers_p.h
+++ b/src/messaging/winhelpers_p.h
diff --git a/multimedia/experimental/experimental.pri b/src/multimedia/experimental/experimental.pri
index c590921b03..c590921b03 100644
--- a/multimedia/experimental/experimental.pri
+++ b/src/multimedia/experimental/experimental.pri
diff --git a/multimedia/experimental/qcamera.cpp b/src/multimedia/experimental/qcamera.cpp
index b5d6c5f879..b5d6c5f879 100644
--- a/multimedia/experimental/qcamera.cpp
+++ b/src/multimedia/experimental/qcamera.cpp
diff --git a/multimedia/experimental/qcamera.h b/src/multimedia/experimental/qcamera.h
index 78caba7d3e..78caba7d3e 100644
--- a/multimedia/experimental/qcamera.h
+++ b/src/multimedia/experimental/qcamera.h
diff --git a/multimedia/experimental/qcameracontrol.cpp b/src/multimedia/experimental/qcameracontrol.cpp
index 7c49cfc080..7c49cfc080 100644
--- a/multimedia/experimental/qcameracontrol.cpp
+++ b/src/multimedia/experimental/qcameracontrol.cpp
diff --git a/multimedia/experimental/qcameracontrol.h b/src/multimedia/experimental/qcameracontrol.h
index d3003ee992..d3003ee992 100644
--- a/multimedia/experimental/qcameracontrol.h
+++ b/src/multimedia/experimental/qcameracontrol.h
diff --git a/multimedia/experimental/qcameraexposurecontrol.cpp b/src/multimedia/experimental/qcameraexposurecontrol.cpp
index 5197cab41e..5197cab41e 100644
--- a/multimedia/experimental/qcameraexposurecontrol.cpp
+++ b/src/multimedia/experimental/qcameraexposurecontrol.cpp
diff --git a/multimedia/experimental/qcameraexposurecontrol.h b/src/multimedia/experimental/qcameraexposurecontrol.h
index 519911b2c3..519911b2c3 100644
--- a/multimedia/experimental/qcameraexposurecontrol.h
+++ b/src/multimedia/experimental/qcameraexposurecontrol.h
diff --git a/multimedia/experimental/qcamerafocuscontrol.cpp b/src/multimedia/experimental/qcamerafocuscontrol.cpp
index 688ceca025..688ceca025 100644
--- a/multimedia/experimental/qcamerafocuscontrol.cpp
+++ b/src/multimedia/experimental/qcamerafocuscontrol.cpp
diff --git a/multimedia/experimental/qcamerafocuscontrol.h b/src/multimedia/experimental/qcamerafocuscontrol.h
index 8ca630a43f..8ca630a43f 100644
--- a/multimedia/experimental/qcamerafocuscontrol.h
+++ b/src/multimedia/experimental/qcamerafocuscontrol.h
diff --git a/multimedia/experimental/qimagecapturecontrol.cpp b/src/multimedia/experimental/qimagecapturecontrol.cpp
index fd525b4879..fd525b4879 100644
--- a/multimedia/experimental/qimagecapturecontrol.cpp
+++ b/src/multimedia/experimental/qimagecapturecontrol.cpp
diff --git a/multimedia/experimental/qimagecapturecontrol.h b/src/multimedia/experimental/qimagecapturecontrol.h
index 335058def7..335058def7 100644
--- a/multimedia/experimental/qimagecapturecontrol.h
+++ b/src/multimedia/experimental/qimagecapturecontrol.h
diff --git a/multimedia/experimental/qimageprocessingcontrol.cpp b/src/multimedia/experimental/qimageprocessingcontrol.cpp
index d4cd44c2c6..d4cd44c2c6 100644
--- a/multimedia/experimental/qimageprocessingcontrol.cpp
+++ b/src/multimedia/experimental/qimageprocessingcontrol.cpp
diff --git a/multimedia/experimental/qimageprocessingcontrol.h b/src/multimedia/experimental/qimageprocessingcontrol.h
index 01c888ea4a..01c888ea4a 100644
--- a/multimedia/experimental/qimageprocessingcontrol.h
+++ b/src/multimedia/experimental/qimageprocessingcontrol.h
diff --git a/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index b01c445b88..4a95b3084f 100644
--- a/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -3,7 +3,7 @@ TEMPLATE = lib
 # distinct from QtMultimedia
 TARGET = QtMedia
 
-include (../common.pri)
+include (../../common.pri)
 INCLUDEPATH+= .
 
 QT += network
@@ -126,4 +126,4 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
-include(../features/deploy.pri)
+include(../../features/deploy.pri)
diff --git a/multimedia/qaudiocapturesource.cpp b/src/multimedia/qaudiocapturesource.cpp
index cd81207b71..cd81207b71 100644
--- a/multimedia/qaudiocapturesource.cpp
+++ b/src/multimedia/qaudiocapturesource.cpp
diff --git a/multimedia/qaudiocapturesource.h b/src/multimedia/qaudiocapturesource.h
index 0e41285660..0e41285660 100644
--- a/multimedia/qaudiocapturesource.h
+++ b/src/multimedia/qaudiocapturesource.h
diff --git a/multimedia/qaudiodevicecontrol.cpp b/src/multimedia/qaudiodevicecontrol.cpp
index c2fcfa6e6c..c2fcfa6e6c 100644
--- a/multimedia/qaudiodevicecontrol.cpp
+++ b/src/multimedia/qaudiodevicecontrol.cpp
diff --git a/multimedia/qaudiodevicecontrol.h b/src/multimedia/qaudiodevicecontrol.h
index 458356b911..458356b911 100644
--- a/multimedia/qaudiodevicecontrol.h
+++ b/src/multimedia/qaudiodevicecontrol.h
diff --git a/multimedia/qaudioencodercontrol.cpp b/src/multimedia/qaudioencodercontrol.cpp
index 7e75e41d68..7e75e41d68 100644
--- a/multimedia/qaudioencodercontrol.cpp
+++ b/src/multimedia/qaudioencodercontrol.cpp
diff --git a/multimedia/qaudioencodercontrol.h b/src/multimedia/qaudioencodercontrol.h
index 02bb9fe37f..02bb9fe37f 100644
--- a/multimedia/qaudioencodercontrol.h
+++ b/src/multimedia/qaudioencodercontrol.h
diff --git a/multimedia/qaudioformat.cpp b/src/multimedia/qaudioformat.cpp
index c28f08f644..c28f08f644 100644
--- a/multimedia/qaudioformat.cpp
+++ b/src/multimedia/qaudioformat.cpp
diff --git a/multimedia/qaudioformat.h b/src/multimedia/qaudioformat.h
index c656e1e69d..c656e1e69d 100644
--- a/multimedia/qaudioformat.h
+++ b/src/multimedia/qaudioformat.h
diff --git a/multimedia/qgraphicsvideoitem.cpp b/src/multimedia/qgraphicsvideoitem.cpp
index d999949e80..d999949e80 100644
--- a/multimedia/qgraphicsvideoitem.cpp
+++ b/src/multimedia/qgraphicsvideoitem.cpp
diff --git a/multimedia/qgraphicsvideoitem.h b/src/multimedia/qgraphicsvideoitem.h
index c4c4bd2f49..c4c4bd2f49 100644
--- a/multimedia/qgraphicsvideoitem.h
+++ b/src/multimedia/qgraphicsvideoitem.h
diff --git a/multimedia/qimageencodercontrol.cpp b/src/multimedia/qimageencodercontrol.cpp
index d831050964..d831050964 100644
--- a/multimedia/qimageencodercontrol.cpp
+++ b/src/multimedia/qimageencodercontrol.cpp
diff --git a/multimedia/qimageencodercontrol.h b/src/multimedia/qimageencodercontrol.h
index 58be82861f..58be82861f 100644
--- a/multimedia/qimageencodercontrol.h
+++ b/src/multimedia/qimageencodercontrol.h
diff --git a/multimedia/qlocalmediaplaylistprovider.cpp b/src/multimedia/qlocalmediaplaylistprovider.cpp
index 80697c8e50..80697c8e50 100644
--- a/multimedia/qlocalmediaplaylistprovider.cpp
+++ b/src/multimedia/qlocalmediaplaylistprovider.cpp
diff --git a/multimedia/qlocalmediaplaylistprovider.h b/src/multimedia/qlocalmediaplaylistprovider.h
index b7eb8f9996..b7eb8f9996 100644
--- a/multimedia/qlocalmediaplaylistprovider.h
+++ b/src/multimedia/qlocalmediaplaylistprovider.h
diff --git a/multimedia/qmediacontent.cpp b/src/multimedia/qmediacontent.cpp
index 72f765f358..72f765f358 100644
--- a/multimedia/qmediacontent.cpp
+++ b/src/multimedia/qmediacontent.cpp
diff --git a/multimedia/qmediacontent.h b/src/multimedia/qmediacontent.h
index 49654fa03d..49654fa03d 100644
--- a/multimedia/qmediacontent.h
+++ b/src/multimedia/qmediacontent.h
diff --git a/multimedia/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp
index fd57351da7..fd57351da7 100644
--- a/multimedia/qmediacontrol.cpp
+++ b/src/multimedia/qmediacontrol.cpp
diff --git a/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h
index b7e9cd6f61..b7e9cd6f61 100644
--- a/multimedia/qmediacontrol.h
+++ b/src/multimedia/qmediacontrol.h
diff --git a/multimedia/qmediacontrol_p.h b/src/multimedia/qmediacontrol_p.h
index cc99949b29..cc99949b29 100644
--- a/multimedia/qmediacontrol_p.h
+++ b/src/multimedia/qmediacontrol_p.h
diff --git a/multimedia/qmediaencodersettings.cpp b/src/multimedia/qmediaencodersettings.cpp
index 8bced17922..8bced17922 100644
--- a/multimedia/qmediaencodersettings.cpp
+++ b/src/multimedia/qmediaencodersettings.cpp
diff --git a/multimedia/qmediaencodersettings.h b/src/multimedia/qmediaencodersettings.h
index 463d9743a7..463d9743a7 100644
--- a/multimedia/qmediaencodersettings.h
+++ b/src/multimedia/qmediaencodersettings.h
diff --git a/multimedia/qmediaformatcontrol.cpp b/src/multimedia/qmediaformatcontrol.cpp
index 78db8ec230..78db8ec230 100644
--- a/multimedia/qmediaformatcontrol.cpp
+++ b/src/multimedia/qmediaformatcontrol.cpp
diff --git a/multimedia/qmediaformatcontrol.h b/src/multimedia/qmediaformatcontrol.h
index 83b5c57aa4..83b5c57aa4 100644
--- a/multimedia/qmediaformatcontrol.h
+++ b/src/multimedia/qmediaformatcontrol.h
diff --git a/multimedia/qmediaimageviewer.cpp b/src/multimedia/qmediaimageviewer.cpp
index e781a8ba72..e781a8ba72 100644
--- a/multimedia/qmediaimageviewer.cpp
+++ b/src/multimedia/qmediaimageviewer.cpp
diff --git a/multimedia/qmediaimageviewer.h b/src/multimedia/qmediaimageviewer.h
index aa9ee99a7d..aa9ee99a7d 100644
--- a/multimedia/qmediaimageviewer.h
+++ b/src/multimedia/qmediaimageviewer.h
diff --git a/multimedia/qmediaimageviewerservice.cpp b/src/multimedia/qmediaimageviewerservice.cpp
index e7fee4ff95..e7fee4ff95 100644
--- a/multimedia/qmediaimageviewerservice.cpp
+++ b/src/multimedia/qmediaimageviewerservice.cpp
diff --git a/multimedia/qmediaimageviewerservice_p.h b/src/multimedia/qmediaimageviewerservice_p.h
index 1b7a13b2d8..1b7a13b2d8 100644
--- a/multimedia/qmediaimageviewerservice_p.h
+++ b/src/multimedia/qmediaimageviewerservice_p.h
diff --git a/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index 24b487213b..24b487213b 100644
--- a/multimedia/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
diff --git a/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h
index 7e28e7bbae..7e28e7bbae 100644
--- a/multimedia/qmediaobject.h
+++ b/src/multimedia/qmediaobject.h
diff --git a/multimedia/qmediaobject_p.h b/src/multimedia/qmediaobject_p.h
index 4b5c7398bd..4b5c7398bd 100644
--- a/multimedia/qmediaobject_p.h
+++ b/src/multimedia/qmediaobject_p.h
diff --git a/multimedia/qmediaplayer.cpp b/src/multimedia/qmediaplayer.cpp
index 7b2d24b86b..7b2d24b86b 100644
--- a/multimedia/qmediaplayer.cpp
+++ b/src/multimedia/qmediaplayer.cpp
diff --git a/multimedia/qmediaplayer.h b/src/multimedia/qmediaplayer.h
index 7b53ba1879..7b53ba1879 100644
--- a/multimedia/qmediaplayer.h
+++ b/src/multimedia/qmediaplayer.h
diff --git a/multimedia/qmediaplayercontrol.cpp b/src/multimedia/qmediaplayercontrol.cpp
index 2e565d102e..2e565d102e 100644
--- a/multimedia/qmediaplayercontrol.cpp
+++ b/src/multimedia/qmediaplayercontrol.cpp
diff --git a/multimedia/qmediaplayercontrol.h b/src/multimedia/qmediaplayercontrol.h
index e95b006d55..e95b006d55 100644
--- a/multimedia/qmediaplayercontrol.h
+++ b/src/multimedia/qmediaplayercontrol.h
diff --git a/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp
index 6ca8b06964..6ca8b06964 100644
--- a/multimedia/qmediaplaylist.cpp
+++ b/src/multimedia/qmediaplaylist.cpp
diff --git a/multimedia/qmediaplaylist.h b/src/multimedia/qmediaplaylist.h
index f55cc9ea3a..f55cc9ea3a 100644
--- a/multimedia/qmediaplaylist.h
+++ b/src/multimedia/qmediaplaylist.h
diff --git a/multimedia/qmediaplaylist_p.h b/src/multimedia/qmediaplaylist_p.h
index d60166a261..d60166a261 100644
--- a/multimedia/qmediaplaylist_p.h
+++ b/src/multimedia/qmediaplaylist_p.h
diff --git a/multimedia/qmediaplaylistcontrol.cpp b/src/multimedia/qmediaplaylistcontrol.cpp
index 4fe702f505..4fe702f505 100644
--- a/multimedia/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/qmediaplaylistcontrol.cpp
diff --git a/multimedia/qmediaplaylistcontrol.h b/src/multimedia/qmediaplaylistcontrol.h
index 7ad2d34868..7ad2d34868 100644
--- a/multimedia/qmediaplaylistcontrol.h
+++ b/src/multimedia/qmediaplaylistcontrol.h
diff --git a/multimedia/qmediaplaylistioplugin.cpp b/src/multimedia/qmediaplaylistioplugin.cpp
index f4750d7cde..f4750d7cde 100644
--- a/multimedia/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/qmediaplaylistioplugin.cpp
diff --git a/multimedia/qmediaplaylistioplugin.h b/src/multimedia/qmediaplaylistioplugin.h
index 1b40240080..1b40240080 100644
--- a/multimedia/qmediaplaylistioplugin.h
+++ b/src/multimedia/qmediaplaylistioplugin.h
diff --git a/multimedia/qmediaplaylistnavigator.cpp b/src/multimedia/qmediaplaylistnavigator.cpp
index cc438ef304..cc438ef304 100644
--- a/multimedia/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/qmediaplaylistnavigator.cpp
diff --git a/multimedia/qmediaplaylistnavigator.h b/src/multimedia/qmediaplaylistnavigator.h
index 32944b2eef..32944b2eef 100644
--- a/multimedia/qmediaplaylistnavigator.h
+++ b/src/multimedia/qmediaplaylistnavigator.h
diff --git a/multimedia/qmediaplaylistprovider.cpp b/src/multimedia/qmediaplaylistprovider.cpp
index 6de91b6b2e..6de91b6b2e 100644
--- a/multimedia/qmediaplaylistprovider.cpp
+++ b/src/multimedia/qmediaplaylistprovider.cpp
diff --git a/multimedia/qmediaplaylistprovider.h b/src/multimedia/qmediaplaylistprovider.h
index 2b688e7d7f..2b688e7d7f 100644
--- a/multimedia/qmediaplaylistprovider.h
+++ b/src/multimedia/qmediaplaylistprovider.h
diff --git a/multimedia/qmediaplaylistprovider_p.h b/src/multimedia/qmediaplaylistprovider_p.h
index be81871f88..be81871f88 100644
--- a/multimedia/qmediaplaylistprovider_p.h
+++ b/src/multimedia/qmediaplaylistprovider_p.h
diff --git a/multimedia/qmediapluginloader.cpp b/src/multimedia/qmediapluginloader.cpp
index e36b7da379..e36b7da379 100644
--- a/multimedia/qmediapluginloader.cpp
+++ b/src/multimedia/qmediapluginloader.cpp
diff --git a/multimedia/qmediapluginloader_p.h b/src/multimedia/qmediapluginloader_p.h
index b1e848b87d..b1e848b87d 100644
--- a/multimedia/qmediapluginloader_p.h
+++ b/src/multimedia/qmediapluginloader_p.h
diff --git a/multimedia/qmediarecorder.cpp b/src/multimedia/qmediarecorder.cpp
index 8346368411..8346368411 100644
--- a/multimedia/qmediarecorder.cpp
+++ b/src/multimedia/qmediarecorder.cpp
diff --git a/multimedia/qmediarecorder.h b/src/multimedia/qmediarecorder.h
index 4a7b82aa67..4a7b82aa67 100644
--- a/multimedia/qmediarecorder.h
+++ b/src/multimedia/qmediarecorder.h
diff --git a/multimedia/qmediarecordercontrol.cpp b/src/multimedia/qmediarecordercontrol.cpp
index 21b6152da2..21b6152da2 100644
--- a/multimedia/qmediarecordercontrol.cpp
+++ b/src/multimedia/qmediarecordercontrol.cpp
diff --git a/multimedia/qmediarecordercontrol.h b/src/multimedia/qmediarecordercontrol.h
index 3d67cc7a6d..3d67cc7a6d 100644
--- a/multimedia/qmediarecordercontrol.h
+++ b/src/multimedia/qmediarecordercontrol.h
diff --git a/multimedia/qmediaresource.cpp b/src/multimedia/qmediaresource.cpp
index 275dd07c46..275dd07c46 100644
--- a/multimedia/qmediaresource.cpp
+++ b/src/multimedia/qmediaresource.cpp
diff --git a/multimedia/qmediaresource.h b/src/multimedia/qmediaresource.h
index c4535c419f..c4535c419f 100644
--- a/multimedia/qmediaresource.h
+++ b/src/multimedia/qmediaresource.h
diff --git a/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp
index fcd4505da7..fcd4505da7 100644
--- a/multimedia/qmediaservice.cpp
+++ b/src/multimedia/qmediaservice.cpp
diff --git a/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h
index b0797350c4..b0797350c4 100644
--- a/multimedia/qmediaservice.h
+++ b/src/multimedia/qmediaservice.h
diff --git a/multimedia/qmediaservice_p.h b/src/multimedia/qmediaservice_p.h
index 0e69806e8a..0e69806e8a 100644
--- a/multimedia/qmediaservice_p.h
+++ b/src/multimedia/qmediaservice_p.h
diff --git a/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 181cfdb7a1..181cfdb7a1 100644
--- a/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
diff --git a/multimedia/qmediaserviceprovider.h b/src/multimedia/qmediaserviceprovider.h
index 368ef38c58..368ef38c58 100644
--- a/multimedia/qmediaserviceprovider.h
+++ b/src/multimedia/qmediaserviceprovider.h
diff --git a/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h
index 9203f1a89e..9203f1a89e 100644
--- a/multimedia/qmediaserviceproviderplugin.h
+++ b/src/multimedia/qmediaserviceproviderplugin.h
diff --git a/multimedia/qmediastreamscontrol.cpp b/src/multimedia/qmediastreamscontrol.cpp
index 14989a66e1..14989a66e1 100644
--- a/multimedia/qmediastreamscontrol.cpp
+++ b/src/multimedia/qmediastreamscontrol.cpp
diff --git a/multimedia/qmediastreamscontrol.h b/src/multimedia/qmediastreamscontrol.h
index 0085c8bafc..0085c8bafc 100644
--- a/multimedia/qmediastreamscontrol.h
+++ b/src/multimedia/qmediastreamscontrol.h
diff --git a/multimedia/qmetadatacontrol.cpp b/src/multimedia/qmetadatacontrol.cpp
index 1bbcd1bf3a..1bbcd1bf3a 100644
--- a/multimedia/qmetadatacontrol.cpp
+++ b/src/multimedia/qmetadatacontrol.cpp
diff --git a/multimedia/qmetadatacontrol.h b/src/multimedia/qmetadatacontrol.h
index 059817dcf8..059817dcf8 100644
--- a/multimedia/qmetadatacontrol.h
+++ b/src/multimedia/qmetadatacontrol.h
diff --git a/multimedia/qmultimediaglobal.h b/src/multimedia/qmultimediaglobal.h
index a9e0b33996..a9e0b33996 100644
--- a/multimedia/qmultimediaglobal.h
+++ b/src/multimedia/qmultimediaglobal.h
diff --git a/multimedia/qpaintervideosurface.cpp b/src/multimedia/qpaintervideosurface.cpp
index c3b5f9e537..c3b5f9e537 100644
--- a/multimedia/qpaintervideosurface.cpp
+++ b/src/multimedia/qpaintervideosurface.cpp
diff --git a/multimedia/qpaintervideosurface_p.h b/src/multimedia/qpaintervideosurface_p.h
index 7e94d1a584..7e94d1a584 100644
--- a/multimedia/qpaintervideosurface_p.h
+++ b/src/multimedia/qpaintervideosurface_p.h
diff --git a/multimedia/qradiotuner.cpp b/src/multimedia/qradiotuner.cpp
index d889494581..d889494581 100644
--- a/multimedia/qradiotuner.cpp
+++ b/src/multimedia/qradiotuner.cpp
diff --git a/multimedia/qradiotuner.h b/src/multimedia/qradiotuner.h
index 08e068464c..08e068464c 100644
--- a/multimedia/qradiotuner.h
+++ b/src/multimedia/qradiotuner.h
diff --git a/multimedia/qradiotunercontrol.cpp b/src/multimedia/qradiotunercontrol.cpp
index a36df2576f..a36df2576f 100644
--- a/multimedia/qradiotunercontrol.cpp
+++ b/src/multimedia/qradiotunercontrol.cpp
diff --git a/multimedia/qradiotunercontrol.h b/src/multimedia/qradiotunercontrol.h
index 246f284492..246f284492 100644
--- a/multimedia/qradiotunercontrol.h
+++ b/src/multimedia/qradiotunercontrol.h
diff --git a/multimedia/qtmedianamespace.h b/src/multimedia/qtmedianamespace.h
index 9305ff6781..9305ff6781 100644
--- a/multimedia/qtmedianamespace.h
+++ b/src/multimedia/qtmedianamespace.h
diff --git a/multimedia/qtmedianamespace.qdoc b/src/multimedia/qtmedianamespace.qdoc
index 1cc05dfc85..1cc05dfc85 100644
--- a/multimedia/qtmedianamespace.qdoc
+++ b/src/multimedia/qtmedianamespace.qdoc
diff --git a/multimedia/qvideodevicecontrol.cpp b/src/multimedia/qvideodevicecontrol.cpp
index 7b8477e99c..7b8477e99c 100644
--- a/multimedia/qvideodevicecontrol.cpp
+++ b/src/multimedia/qvideodevicecontrol.cpp
diff --git a/multimedia/qvideodevicecontrol.h b/src/multimedia/qvideodevicecontrol.h
index 8a2421ea15..8a2421ea15 100644
--- a/multimedia/qvideodevicecontrol.h
+++ b/src/multimedia/qvideodevicecontrol.h
diff --git a/multimedia/qvideoencodercontrol.cpp b/src/multimedia/qvideoencodercontrol.cpp
index 15ca7cb952..15ca7cb952 100644
--- a/multimedia/qvideoencodercontrol.cpp
+++ b/src/multimedia/qvideoencodercontrol.cpp
diff --git a/multimedia/qvideoencodercontrol.h b/src/multimedia/qvideoencodercontrol.h
index 8534501314..8534501314 100644
--- a/multimedia/qvideoencodercontrol.h
+++ b/src/multimedia/qvideoencodercontrol.h
diff --git a/multimedia/qvideooutputcontrol.cpp b/src/multimedia/qvideooutputcontrol.cpp
index a002c35636..a002c35636 100644
--- a/multimedia/qvideooutputcontrol.cpp
+++ b/src/multimedia/qvideooutputcontrol.cpp
diff --git a/multimedia/qvideooutputcontrol.h b/src/multimedia/qvideooutputcontrol.h
index b228591c16..b228591c16 100644
--- a/multimedia/qvideooutputcontrol.h
+++ b/src/multimedia/qvideooutputcontrol.h
diff --git a/multimedia/qvideorenderercontrol.cpp b/src/multimedia/qvideorenderercontrol.cpp
index 36cd3a9eb6..36cd3a9eb6 100644
--- a/multimedia/qvideorenderercontrol.cpp
+++ b/src/multimedia/qvideorenderercontrol.cpp
diff --git a/multimedia/qvideorenderercontrol.h b/src/multimedia/qvideorenderercontrol.h
index 9d7b7554a8..9d7b7554a8 100644
--- a/multimedia/qvideorenderercontrol.h
+++ b/src/multimedia/qvideorenderercontrol.h
diff --git a/multimedia/qvideowidget.cpp b/src/multimedia/qvideowidget.cpp
index 47bb303025..47bb303025 100644
--- a/multimedia/qvideowidget.cpp
+++ b/src/multimedia/qvideowidget.cpp
diff --git a/multimedia/qvideowidget.h b/src/multimedia/qvideowidget.h
index 6be62d9e69..6be62d9e69 100644
--- a/multimedia/qvideowidget.h
+++ b/src/multimedia/qvideowidget.h
diff --git a/multimedia/qvideowidget_p.h b/src/multimedia/qvideowidget_p.h
index 98fa5b468e..98fa5b468e 100644
--- a/multimedia/qvideowidget_p.h
+++ b/src/multimedia/qvideowidget_p.h
diff --git a/multimedia/qvideowidgetcontrol.cpp b/src/multimedia/qvideowidgetcontrol.cpp
index 9d26bd7a30..9d26bd7a30 100644
--- a/multimedia/qvideowidgetcontrol.cpp
+++ b/src/multimedia/qvideowidgetcontrol.cpp
diff --git a/multimedia/qvideowidgetcontrol.h b/src/multimedia/qvideowidgetcontrol.h
index 9b3d87e79c..9b3d87e79c 100644
--- a/multimedia/qvideowidgetcontrol.h
+++ b/src/multimedia/qvideowidgetcontrol.h
diff --git a/multimedia/qvideowindowcontrol.cpp b/src/multimedia/qvideowindowcontrol.cpp
index 014dbfcdb1..014dbfcdb1 100644
--- a/multimedia/qvideowindowcontrol.cpp
+++ b/src/multimedia/qvideowindowcontrol.cpp
diff --git a/multimedia/qvideowindowcontrol.h b/src/multimedia/qvideowindowcontrol.h
index 5ba1544645..5ba1544645 100644
--- a/multimedia/qvideowindowcontrol.h
+++ b/src/multimedia/qvideowindowcontrol.h
diff --git a/context/contextkitlayer.cpp b/src/publishsubscribe/contextkitlayer.cpp
index 66d115f033..66d115f033 100644
--- a/context/contextkitlayer.cpp
+++ b/src/publishsubscribe/contextkitlayer.cpp
diff --git a/context/dlmalloc.c b/src/publishsubscribe/dlmalloc.c
index e4b02efdc6..e4b02efdc6 100644
--- a/context/dlmalloc.c
+++ b/src/publishsubscribe/dlmalloc.c
diff --git a/context/context.pro b/src/publishsubscribe/publishsubscribe.pro
index 1ea61945b8..7b91a4884a 100644
--- a/context/context.pro
+++ b/src/publishsubscribe/publishsubscribe.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = QtPublishSubscribe
 QT = core network xml
 
-include(../common.pri)
+include(../../common.pri)
 
 DEFINES += QT_BUILD_CFW_LIB QT_MAKEDLL
 
@@ -63,4 +63,4 @@ win32 {
     wince*:LIBS += -ltoolhelp
 }
 
-include(../features/deploy.pri)
+include(../../features/deploy.pri)
diff --git a/context/qcontextglobal.h b/src/publishsubscribe/qcontextglobal.h
index 2daf347ff6..2daf347ff6 100644
--- a/context/qcontextglobal.h
+++ b/src/publishsubscribe/qcontextglobal.h
diff --git a/context/qcrmlparser.cpp b/src/publishsubscribe/qcrmlparser.cpp
index e35559c5d2..e35559c5d2 100644
--- a/context/qcrmlparser.cpp
+++ b/src/publishsubscribe/qcrmlparser.cpp
diff --git a/context/qcrmlparser_p.h b/src/publishsubscribe/qcrmlparser_p.h
index f39adff2b1..f39adff2b1 100644
--- a/context/qcrmlparser_p.h
+++ b/src/publishsubscribe/qcrmlparser_p.h
diff --git a/context/qmallocpool.cpp b/src/publishsubscribe/qmallocpool.cpp
index dd514fc647..dd514fc647 100644
--- a/context/qmallocpool.cpp
+++ b/src/publishsubscribe/qmallocpool.cpp
diff --git a/context/qmallocpool_p.h b/src/publishsubscribe/qmallocpool_p.h
index 72dcea994e..72dcea994e 100644
--- a/context/qmallocpool_p.h
+++ b/src/publishsubscribe/qmallocpool_p.h
diff --git a/context/qpacketprotocol.cpp b/src/publishsubscribe/qpacketprotocol.cpp
index 1b03dcbf40..1b03dcbf40 100644
--- a/context/qpacketprotocol.cpp
+++ b/src/publishsubscribe/qpacketprotocol.cpp
diff --git a/context/qpacketprotocol_p.h b/src/publishsubscribe/qpacketprotocol_p.h
index 7176e80f33..7176e80f33 100644
--- a/context/qpacketprotocol_p.h
+++ b/src/publishsubscribe/qpacketprotocol_p.h
diff --git a/context/qsystemreadwritelock.cpp b/src/publishsubscribe/qsystemreadwritelock.cpp
index 9d5557ff12..9d5557ff12 100644
--- a/context/qsystemreadwritelock.cpp
+++ b/src/publishsubscribe/qsystemreadwritelock.cpp
diff --git a/context/qsystemreadwritelock_p.h b/src/publishsubscribe/qsystemreadwritelock_p.h
index b2cba25e05..b2cba25e05 100644
--- a/context/qsystemreadwritelock_p.h
+++ b/src/publishsubscribe/qsystemreadwritelock_p.h
diff --git a/context/qvaluespace.cpp b/src/publishsubscribe/qvaluespace.cpp
index bbe9a2737c..bbe9a2737c 100644
--- a/context/qvaluespace.cpp
+++ b/src/publishsubscribe/qvaluespace.cpp
diff --git a/context/qvaluespace.h b/src/publishsubscribe/qvaluespace.h
index 2861369ff2..2861369ff2 100644
--- a/context/qvaluespace.h
+++ b/src/publishsubscribe/qvaluespace.h
diff --git a/context/qvaluespace_p.h b/src/publishsubscribe/qvaluespace_p.h
index a8a9b2fc20..a8a9b2fc20 100644
--- a/context/qvaluespace_p.h
+++ b/src/publishsubscribe/qvaluespace_p.h
diff --git a/context/qvaluespacemanager.cpp b/src/publishsubscribe/qvaluespacemanager.cpp
index ab7aad1354..ab7aad1354 100644
--- a/context/qvaluespacemanager.cpp
+++ b/src/publishsubscribe/qvaluespacemanager.cpp
diff --git a/context/qvaluespacemanager_p.h b/src/publishsubscribe/qvaluespacemanager_p.h
index d098afbb90..d098afbb90 100644
--- a/context/qvaluespacemanager_p.h
+++ b/src/publishsubscribe/qvaluespacemanager_p.h
diff --git a/context/qvaluespaceprovider.cpp b/src/publishsubscribe/qvaluespaceprovider.cpp
index 19ca887a6b..19ca887a6b 100644
--- a/context/qvaluespaceprovider.cpp
+++ b/src/publishsubscribe/qvaluespaceprovider.cpp
diff --git a/context/qvaluespaceprovider.h b/src/publishsubscribe/qvaluespaceprovider.h
index 06b81d7f49..06b81d7f49 100644
--- a/context/qvaluespaceprovider.h
+++ b/src/publishsubscribe/qvaluespaceprovider.h
diff --git a/context/qvaluespacesubscriber.cpp b/src/publishsubscribe/qvaluespacesubscriber.cpp
index d746340f17..d746340f17 100644
--- a/context/qvaluespacesubscriber.cpp
+++ b/src/publishsubscribe/qvaluespacesubscriber.cpp
diff --git a/context/qvaluespacesubscriber.h b/src/publishsubscribe/qvaluespacesubscriber.h
index 76da02474d..76da02474d 100644
--- a/context/qvaluespacesubscriber.h
+++ b/src/publishsubscribe/qvaluespacesubscriber.h
diff --git a/context/registrylayer_win.cpp b/src/publishsubscribe/registrylayer_win.cpp
index 1a130367aa..1a130367aa 100644
--- a/context/registrylayer_win.cpp
+++ b/src/publishsubscribe/registrylayer_win.cpp
diff --git a/context/sharedmemorylayer.cpp b/src/publishsubscribe/sharedmemorylayer.cpp
index a0d7f31a53..a0d7f31a53 100644
--- a/context/sharedmemorylayer.cpp
+++ b/src/publishsubscribe/sharedmemorylayer.cpp
diff --git a/serviceframework/databasemanager.cpp b/src/serviceframework/databasemanager.cpp
index e1a7bc5db8..e1a7bc5db8 100644
--- a/serviceframework/databasemanager.cpp
+++ b/src/serviceframework/databasemanager.cpp
diff --git a/serviceframework/databasemanager_p.h b/src/serviceframework/databasemanager_p.h
index 1071980e94..1071980e94 100644
--- a/serviceframework/databasemanager_p.h
+++ b/src/serviceframework/databasemanager_p.h
diff --git a/serviceframework/databasemanager_s60.cpp b/src/serviceframework/databasemanager_s60.cpp
index 3bd813e8b0..3bd813e8b0 100644
--- a/serviceframework/databasemanager_s60.cpp
+++ b/src/serviceframework/databasemanager_s60.cpp
diff --git a/serviceframework/databasemanager_s60_p.h b/src/serviceframework/databasemanager_s60_p.h
index d4918cc8b7..d4918cc8b7 100644
--- a/serviceframework/databasemanager_s60_p.h
+++ b/src/serviceframework/databasemanager_s60_p.h
diff --git a/serviceframework/dberror.cpp b/src/serviceframework/dberror.cpp
index 4e7acf73d9..4e7acf73d9 100644
--- a/serviceframework/dberror.cpp
+++ b/src/serviceframework/dberror.cpp
diff --git a/serviceframework/dberror_p.h b/src/serviceframework/dberror_p.h
index 06a505132d..06a505132d 100644
--- a/serviceframework/dberror_p.h
+++ b/src/serviceframework/dberror_p.h
diff --git a/serviceframework/qabstractsecuritysession.cpp b/src/serviceframework/qabstractsecuritysession.cpp
index 3030a352bc..3030a352bc 100644
--- a/serviceframework/qabstractsecuritysession.cpp
+++ b/src/serviceframework/qabstractsecuritysession.cpp
diff --git a/serviceframework/qabstractsecuritysession.h b/src/serviceframework/qabstractsecuritysession.h
index 40a8a8c18b..40a8a8c18b 100644
--- a/serviceframework/qabstractsecuritysession.h
+++ b/src/serviceframework/qabstractsecuritysession.h
diff --git a/serviceframework/qservicecontext.cpp b/src/serviceframework/qservicecontext.cpp
index 669ff404a1..669ff404a1 100644
--- a/serviceframework/qservicecontext.cpp
+++ b/src/serviceframework/qservicecontext.cpp
diff --git a/serviceframework/qservicecontext.h b/src/serviceframework/qservicecontext.h
index b4f0b00ac3..b4f0b00ac3 100644
--- a/serviceframework/qservicecontext.h
+++ b/src/serviceframework/qservicecontext.h
diff --git a/serviceframework/qservicefilter.cpp b/src/serviceframework/qservicefilter.cpp
index 591e8742dd..591e8742dd 100644
--- a/serviceframework/qservicefilter.cpp
+++ b/src/serviceframework/qservicefilter.cpp
diff --git a/serviceframework/qservicefilter.h b/src/serviceframework/qservicefilter.h
index 8daed269f9..8daed269f9 100644
--- a/serviceframework/qservicefilter.h
+++ b/src/serviceframework/qservicefilter.h
diff --git a/serviceframework/qserviceglobal.h b/src/serviceframework/qserviceglobal.h
index 38e6707883..38e6707883 100644
--- a/serviceframework/qserviceglobal.h
+++ b/src/serviceframework/qserviceglobal.h
diff --git a/serviceframework/qserviceinterfacedescriptor.cpp b/src/serviceframework/qserviceinterfacedescriptor.cpp
index 211f3f6668..211f3f6668 100644
--- a/serviceframework/qserviceinterfacedescriptor.cpp
+++ b/src/serviceframework/qserviceinterfacedescriptor.cpp
diff --git a/serviceframework/qserviceinterfacedescriptor.h b/src/serviceframework/qserviceinterfacedescriptor.h
index 3e3b1725a0..3e3b1725a0 100644
--- a/serviceframework/qserviceinterfacedescriptor.h
+++ b/src/serviceframework/qserviceinterfacedescriptor.h
diff --git a/serviceframework/qserviceinterfacedescriptor_p.h b/src/serviceframework/qserviceinterfacedescriptor_p.h
index 9e225b8931..9e225b8931 100644
--- a/serviceframework/qserviceinterfacedescriptor_p.h
+++ b/src/serviceframework/qserviceinterfacedescriptor_p.h
diff --git a/serviceframework/qservicemanager.cpp b/src/serviceframework/qservicemanager.cpp
index fd9bb3f557..fd9bb3f557 100644
--- a/serviceframework/qservicemanager.cpp
+++ b/src/serviceframework/qservicemanager.cpp
diff --git a/serviceframework/qservicemanager.h b/src/serviceframework/qservicemanager.h
index db34a45cdc..db34a45cdc 100644
--- a/serviceframework/qservicemanager.h
+++ b/src/serviceframework/qservicemanager.h
diff --git a/serviceframework/qserviceplugininterface.cpp b/src/serviceframework/qserviceplugininterface.cpp
index e209fb3fe9..e209fb3fe9 100644
--- a/serviceframework/qserviceplugininterface.cpp
+++ b/src/serviceframework/qserviceplugininterface.cpp
diff --git a/serviceframework/qserviceplugininterface.h b/src/serviceframework/qserviceplugininterface.h
index 720777bd82..720777bd82 100644
--- a/serviceframework/qserviceplugininterface.h
+++ b/src/serviceframework/qserviceplugininterface.h
diff --git a/serviceframework/servicedatabase.cpp b/src/serviceframework/servicedatabase.cpp
index 14a235e698..14a235e698 100644
--- a/serviceframework/servicedatabase.cpp
+++ b/src/serviceframework/servicedatabase.cpp
diff --git a/serviceframework/servicedatabase_p.h b/src/serviceframework/servicedatabase_p.h
index 07a4b04fe2..07a4b04fe2 100644
--- a/serviceframework/servicedatabase_p.h
+++ b/src/serviceframework/servicedatabase_p.h
diff --git a/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro
index 661723f7c7..7c463f99a9 100644
--- a/serviceframework/serviceframework.pro
+++ b/src/serviceframework/serviceframework.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = QtServiceFramework
 QT = core sql
 
-include(../common.pri)
+include(../../common.pri)
 
 DEFINES += QT_BUILD_SFW_LIB QT_MAKEDLL
 
@@ -61,4 +61,4 @@ symbian {
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
-include(../features/deploy.pri)
+include(../../features/deploy.pri)
diff --git a/serviceframework/servicemetadata.cpp b/src/serviceframework/servicemetadata.cpp
index df17e94d55..df17e94d55 100644
--- a/serviceframework/servicemetadata.cpp
+++ b/src/serviceframework/servicemetadata.cpp
diff --git a/serviceframework/servicemetadata_p.h b/src/serviceframework/servicemetadata_p.h
index b6e7f567db..b6e7f567db 100644
--- a/serviceframework/servicemetadata_p.h
+++ b/src/serviceframework/servicemetadata_p.h
diff --git a/serviceframework/symbian/clientservercommon.h b/src/serviceframework/symbian/clientservercommon.h
index 1bfc3e154b..1bfc3e154b 100644
--- a/serviceframework/symbian/clientservercommon.h
+++ b/src/serviceframework/symbian/clientservercommon.h
diff --git a/serviceframework/symbian/databasemanagerserver.cpp b/src/serviceframework/symbian/databasemanagerserver.cpp
index b6a4a07bf8..b6a4a07bf8 100644
--- a/serviceframework/symbian/databasemanagerserver.cpp
+++ b/src/serviceframework/symbian/databasemanagerserver.cpp
diff --git a/serviceframework/symbian/databasemanagerserver.h b/src/serviceframework/symbian/databasemanagerserver.h
index 178422fac8..178422fac8 100644
--- a/serviceframework/symbian/databasemanagerserver.h
+++ b/src/serviceframework/symbian/databasemanagerserver.h
diff --git a/serviceframework/symbian/databasemanagerserver.pan b/src/serviceframework/symbian/databasemanagerserver.pan
index 9750a379a2..9750a379a2 100644
--- a/serviceframework/symbian/databasemanagerserver.pan
+++ b/src/serviceframework/symbian/databasemanagerserver.pan
diff --git a/serviceframework/symbian/databasemanagerserver_global.h b/src/serviceframework/symbian/databasemanagerserver_global.h
index f8984adbec..f8984adbec 100644
--- a/serviceframework/symbian/databasemanagerserver_global.h
+++ b/src/serviceframework/symbian/databasemanagerserver_global.h
diff --git a/serviceframework/symbian/databasemanagersession.cpp b/src/serviceframework/symbian/databasemanagersession.cpp
index 58f64210d5..58f64210d5 100644
--- a/serviceframework/symbian/databasemanagersession.cpp
+++ b/src/serviceframework/symbian/databasemanagersession.cpp
diff --git a/serviceframework/symbian/databasemanagersession.h b/src/serviceframework/symbian/databasemanagersession.h
index b937e3ba1c..b937e3ba1c 100644
--- a/serviceframework/symbian/databasemanagersession.h
+++ b/src/serviceframework/symbian/databasemanagersession.h
diff --git a/serviceframework/symbian/databasemanagersignalhandler.cpp b/src/serviceframework/symbian/databasemanagersignalhandler.cpp
index 584816bf36..584816bf36 100644
--- a/serviceframework/symbian/databasemanagersignalhandler.cpp
+++ b/src/serviceframework/symbian/databasemanagersignalhandler.cpp
diff --git a/serviceframework/symbian/databasemanagersignalhandler.h b/src/serviceframework/symbian/databasemanagersignalhandler.h
index b5628a8a70..b5628a8a70 100644
--- a/serviceframework/symbian/databasemanagersignalhandler.h
+++ b/src/serviceframework/symbian/databasemanagersignalhandler.h
diff --git a/serviceframework/symbian/dll/databasemanagerserver_dll.pro b/src/serviceframework/symbian/dll/databasemanagerserver_dll.pro
index 4cf7553b07..4cf7553b07 100644
--- a/serviceframework/symbian/dll/databasemanagerserver_dll.pro
+++ b/src/serviceframework/symbian/dll/databasemanagerserver_dll.pro
diff --git a/serviceframework/symbian/exe/databasemanagerserver_exe.pro b/src/serviceframework/symbian/exe/databasemanagerserver_exe.pro
index 7f3a76ad0e..7f3a76ad0e 100644
--- a/serviceframework/symbian/exe/databasemanagerserver_exe.pro
+++ b/src/serviceframework/symbian/exe/databasemanagerserver_exe.pro
diff --git a/serviceframework/symbian/exe/databasemanagerservermain.cpp b/src/serviceframework/symbian/exe/databasemanagerservermain.cpp
index d05c36f1b3..d05c36f1b3 100644
--- a/serviceframework/symbian/exe/databasemanagerservermain.cpp
+++ b/src/serviceframework/symbian/exe/databasemanagerservermain.cpp
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000000..088686b19b
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,12 @@
+include($$QT_MOBILITY_BUILD_TREE/config.pri)
+
+TEMPLATE = subdirs
+SUBDIRS += serviceframework
+symbian:SUBDIRS += serviceframework/symbian/dll/databasemanagerserver_dll.pro \
+                   serviceframework/symbian/exe/databasemanagerserver_exe.pro
+
+SUBDIRS += bearer location contacts multimedia publishsubscribe systeminfo
+
+contains(qmf_enabled, yes)|wince*|win32|symbian|maemo {
+    SUBDIRS += messaging
+}
diff --git a/systeminfo/qhalservice_linux.cpp b/src/systeminfo/qhalservice_linux.cpp
index 6d6a3109f4..6d6a3109f4 100644
--- a/systeminfo/qhalservice_linux.cpp
+++ b/src/systeminfo/qhalservice_linux.cpp
diff --git a/systeminfo/qhalservice_linux_p.h b/src/systeminfo/qhalservice_linux_p.h
index 9c348d91d6..9c348d91d6 100644
--- a/systeminfo/qhalservice_linux_p.h
+++ b/src/systeminfo/qhalservice_linux_p.h
diff --git a/systeminfo/qnetworkmanagerservice_linux.cpp b/src/systeminfo/qnetworkmanagerservice_linux.cpp
index 1e570492c8..1e570492c8 100644
--- a/systeminfo/qnetworkmanagerservice_linux.cpp
+++ b/src/systeminfo/qnetworkmanagerservice_linux.cpp
diff --git a/systeminfo/qnetworkmanagerservice_linux_p.h b/src/systeminfo/qnetworkmanagerservice_linux_p.h
index c5888cba81..c5888cba81 100644
--- a/systeminfo/qnetworkmanagerservice_linux_p.h
+++ b/src/systeminfo/qnetworkmanagerservice_linux_p.h
diff --git a/systeminfo/qsysinfoglobal.h b/src/systeminfo/qsysinfoglobal.h
index c7a06cbe44..c7a06cbe44 100644
--- a/systeminfo/qsysinfoglobal.h
+++ b/src/systeminfo/qsysinfoglobal.h
diff --git a/systeminfo/qsysteminfo.cpp b/src/systeminfo/qsysteminfo.cpp
index a81b250ab7..a81b250ab7 100644
--- a/systeminfo/qsysteminfo.cpp
+++ b/src/systeminfo/qsysteminfo.cpp
diff --git a/systeminfo/qsysteminfo.h b/src/systeminfo/qsysteminfo.h
index e294e1e1d5..e294e1e1d5 100644
--- a/systeminfo/qsysteminfo.h
+++ b/src/systeminfo/qsysteminfo.h
diff --git a/systeminfo/qsysteminfo_linux.cpp b/src/systeminfo/qsysteminfo_linux.cpp
index bd419d75b5..bd419d75b5 100644
--- a/systeminfo/qsysteminfo_linux.cpp
+++ b/src/systeminfo/qsysteminfo_linux.cpp
diff --git a/systeminfo/qsysteminfo_linux_p.h b/src/systeminfo/qsysteminfo_linux_p.h
index d9fca8a091..d9fca8a091 100644
--- a/systeminfo/qsysteminfo_linux_p.h
+++ b/src/systeminfo/qsysteminfo_linux_p.h
diff --git a/systeminfo/qsysteminfo_mac.mm b/src/systeminfo/qsysteminfo_mac.mm
index fc25ae85a5..fc25ae85a5 100644
--- a/systeminfo/qsysteminfo_mac.mm
+++ b/src/systeminfo/qsysteminfo_mac.mm
diff --git a/systeminfo/qsysteminfo_mac_p.h b/src/systeminfo/qsysteminfo_mac_p.h
index 6e800d3fe3..6e800d3fe3 100644
--- a/systeminfo/qsysteminfo_mac_p.h
+++ b/src/systeminfo/qsysteminfo_mac_p.h
diff --git a/systeminfo/qsysteminfo_s60.cpp b/src/systeminfo/qsysteminfo_s60.cpp
index 03095b0bd7..03095b0bd7 100644
--- a/systeminfo/qsysteminfo_s60.cpp
+++ b/src/systeminfo/qsysteminfo_s60.cpp
diff --git a/systeminfo/qsysteminfo_s60_p.h b/src/systeminfo/qsysteminfo_s60_p.h
index 406ba0048f..406ba0048f 100644
--- a/systeminfo/qsysteminfo_s60_p.h
+++ b/src/systeminfo/qsysteminfo_s60_p.h
diff --git a/systeminfo/qsysteminfo_win.cpp b/src/systeminfo/qsysteminfo_win.cpp
index ec91a122d7..ec91a122d7 100644
--- a/systeminfo/qsysteminfo_win.cpp
+++ b/src/systeminfo/qsysteminfo_win.cpp
diff --git a/systeminfo/qsysteminfo_win_p.h b/src/systeminfo/qsysteminfo_win_p.h
index e175c2e957..e175c2e957 100644
--- a/systeminfo/qsysteminfo_win_p.h
+++ b/src/systeminfo/qsysteminfo_win_p.h
diff --git a/systeminfo/qwmihelper_win.cpp b/src/systeminfo/qwmihelper_win.cpp
index ec887bf14f..ec887bf14f 100644
--- a/systeminfo/qwmihelper_win.cpp
+++ b/src/systeminfo/qwmihelper_win.cpp
diff --git a/systeminfo/qwmihelper_win_p.h b/src/systeminfo/qwmihelper_win_p.h
index 341b25debf..341b25debf 100644
--- a/systeminfo/qwmihelper_win_p.h
+++ b/src/systeminfo/qwmihelper_win_p.h
diff --git a/systeminfo/symbian/telephonyinfo_s60.cpp b/src/systeminfo/symbian/telephonyinfo_s60.cpp
index 760f6c0698..760f6c0698 100644
--- a/systeminfo/symbian/telephonyinfo_s60.cpp
+++ b/src/systeminfo/symbian/telephonyinfo_s60.cpp
diff --git a/systeminfo/symbian/telephonyinfo_s60.h b/src/systeminfo/symbian/telephonyinfo_s60.h
index fe1ba5d1c4..fe1ba5d1c4 100644
--- a/systeminfo/symbian/telephonyinfo_s60.h
+++ b/src/systeminfo/symbian/telephonyinfo_s60.h
diff --git a/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
index 550e3d90b5..6fbf5a2827 100644
--- a/systeminfo/systeminfo.pro
+++ b/src/systeminfo/systeminfo.pro
@@ -3,7 +3,7 @@ TARGET = QtSystemInfo
 
 
 QT+= network
-include(../common.pri)
+include(../../common.pri)
 
 # Input
 PUBLIC_HEADERS +=   qsysteminfo.h \
@@ -108,4 +108,4 @@ unix: {
 }
 
 HEADERS += $$PUBLIC_HEADERS 
-include (../features/deploy.pri)
+include (../../features/deploy.pri)
diff --git a/tests/auto/databasemanager/databasemanager.pro b/tests/auto/databasemanager/databasemanager.pro
index e7ad48cdd8..b3228b2328 100644
--- a/tests/auto/databasemanager/databasemanager.pro
+++ b/tests/auto/databasemanager/databasemanager.pro
@@ -1,11 +1,11 @@
 TARGET=tst_databasemanager
 QT = core sql
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 symbian {
-    INCLUDEPATH += ../../../serviceframework/symbian
-    DEPENDPATH += ../../../serviceframework \
-                  ../../../serviceframework/symbian
+    INCLUDEPATH += ../../../src/serviceframework/symbian
+    DEPENDPATH += ../../../src/serviceframework \
+                  ../../../src/serviceframework/symbian
 }
 
 wince*|symbian*: {
@@ -46,7 +46,7 @@ symbian {
     LIBS += -lefsrv
 
 } else {
-    DEPENDPATH += ../../../serviceframework
+    DEPENDPATH += ../../../src/serviceframework
     HEADERS += ../qsfwtestutil.h \
 
 
diff --git a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
index 49aaa32692..98e49bb3c5 100644
--- a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
+++ b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
@@ -1,5 +1,5 @@
 TARGET=tst_qabstractsecuritysession
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
index de71fbf9df..4d4a379e46 100644
--- a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
+++ b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qaudiocapturesource
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 
 CONFIG += testcase
 
diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/qcamera/qcamera.pro
index cd1e01b22e..7623925c9a 100644
--- a/tests/auto/qcamera/qcamera.pro
+++ b/tests/auto/qcamera/qcamera.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qcamera
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 SOURCES += tst_qcamera.cpp
diff --git a/tests/auto/qcontact/qcontact.pro b/tests/auto/qcontact/qcontact.pro
index 93be47695c..ad98427868 100644
--- a/tests/auto/qcontact/qcontact.pro
+++ b/tests/auto/qcontact/qcontact.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro b/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro
index 8f7f1c246a..d52d820883 100644
--- a/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro
+++ b/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro
@@ -5,10 +5,10 @@ PLUGIN_TYPE=contacts
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactactions/unittest/unittest.pro b/tests/auto/qcontactactions/unittest/unittest.pro
index 8fd1cf2a52..03246ab209 100644
--- a/tests/auto/qcontactactions/unittest/unittest.pro
+++ b/tests/auto/qcontactactions/unittest/unittest.pro
@@ -7,10 +7,10 @@ PLUGIN_SUBDIR=dummyplugin/plugins
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES  += tst_qcontactactions.cpp
diff --git a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro
index 9def5ac750..1808854f1f 100644
--- a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro
+++ b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro
@@ -5,10 +5,10 @@ PLUGIN_TYPE=contacts
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactasync/unittest/unittest.pro b/tests/auto/qcontactasync/unittest/unittest.pro
index dbbc8f1c75..10afc6ea8a 100644
--- a/tests/auto/qcontactasync/unittest/unittest.pro
+++ b/tests/auto/qcontactasync/unittest/unittest.pro
@@ -7,10 +7,10 @@ PLUGIN_SUBDIR=dummyplugin/plugins
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactdetail/qcontactdetail.pro b/tests/auto/qcontactdetail/qcontactdetail.pro
index 0f4bf09c28..88f23f4b8d 100644
--- a/tests/auto/qcontactdetail/qcontactdetail.pro
+++ b/tests/auto/qcontactdetail/qcontactdetail.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES  += tst_qcontactdetail.cpp
diff --git a/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro b/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro
index b7ce10d8db..3db38b1827 100644
--- a/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro
+++ b/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES  += tst_qcontactdetaildefinition.cpp
diff --git a/tests/auto/qcontactdetails/qcontactdetails.pro b/tests/auto/qcontactdetails/qcontactdetails.pro
index c0be4a6229..6a734d34e1 100644
--- a/tests/auto/qcontactdetails/qcontactdetails.pro
+++ b/tests/auto/qcontactdetails/qcontactdetails.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES  += tst_qcontactdetails.cpp
diff --git a/tests/auto/qcontactfilter/qcontactfilter.pro b/tests/auto/qcontactfilter/qcontactfilter.pro
index 140c38234e..4c80e531b6 100644
--- a/tests/auto/qcontactfilter/qcontactfilter.pro
+++ b/tests/auto/qcontactfilter/qcontactfilter.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactmanager/qcontactmanager.pro b/tests/auto/qcontactmanager/qcontactmanager.pro
index 3830164961..ea69df4b15 100644
--- a/tests/auto/qcontactmanager/qcontactmanager.pro
+++ b/tests/auto/qcontactmanager/qcontactmanager.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES  += tst_qcontactmanager.cpp
diff --git a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
index 7e8199ae65..f6a5f71e03 100644
--- a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
+++ b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../common.pri)
 
-INCLUDEPATH += ../../../contacts \
-               ../../../contacts/details \
-               ../../../contacts/requests \
-               ../../../contacts/filters
+INCLUDEPATH += ../../../src/contacts \
+               ../../../src/contacts/details \
+               ../../../src/contacts/requests \
+               ../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES  += tst_qcontactmanagerfiltering.cpp
diff --git a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro
index f5dcb2226a..c09b77344f 100644
--- a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro
+++ b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro
@@ -5,10 +5,10 @@ PLUGIN_TYPE=contacts
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES += dummyplugin.cpp
diff --git a/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro b/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro
index c0b4150596..6fd8f8b3b9 100644
--- a/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro
+++ b/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro
@@ -5,10 +5,10 @@ PLUGIN_TYPE=contacts
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro b/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro
index f115f3f4d8..17f78b3ee5 100644
--- a/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro
+++ b/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro
@@ -5,10 +5,10 @@ PLUGIN_TYPE=contacts
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro b/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro
index 77544788cd..c4115f0fb4 100644
--- a/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro
+++ b/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro
@@ -5,10 +5,10 @@ PLUGIN_TYPE=contacts
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 DEFINES += DUMMYPLUGINTARGET=contacts_testdummyinvalid
diff --git a/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro b/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro
index e2d3e8fe88..1d8b779364 100644
--- a/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro
+++ b/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro
@@ -3,10 +3,10 @@ CONFIG += plugin testplugin
 TARGET = $$qtLibraryTarget(contacts_testdummymemory)
 PLUGIN_TYPE=contacts
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 
diff --git a/tests/auto/qcontactmanagerplugins/unittest/unittest.pro b/tests/auto/qcontactmanagerplugins/unittest/unittest.pro
index c85d468726..c9514d1325 100644
--- a/tests/auto/qcontactmanagerplugins/unittest/unittest.pro
+++ b/tests/auto/qcontactmanagerplugins/unittest/unittest.pro
@@ -5,10 +5,10 @@ CONFIG+=testcase
 
 include(../../../../common.pri)
 
-INCLUDEPATH += ../../../../contacts \
-               ../../../../contacts/details \
-               ../../../../contacts/requests \
-               ../../../../contacts/filters
+INCLUDEPATH += ../../../../src/contacts \
+               ../../../../src/contacts/details \
+               ../../../../src/contacts/requests \
+               ../../../../src/contacts/filters
 
 qtAddLibrary(QtContacts)
 SOURCES  += tst_qcontactmanagerplugins.cpp
diff --git a/tests/auto/qcrmlparser/qcrmlparser.pro b/tests/auto/qcrmlparser/qcrmlparser.pro
index 860ffd4d24..bfe2366f32 100644
--- a/tests/auto/qcrmlparser/qcrmlparser.pro
+++ b/tests/auto/qcrmlparser/qcrmlparser.pro
@@ -1,12 +1,12 @@
 TARGET = tst_qcrmlparser
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 CONFIG += testcase
 QT = core xml
 include(../../../common.pri)
 
 # Input
-SOURCES += ../../../context/qcrmlparser.cpp \ 
+SOURCES += ../../../src/publishsubscribe/qcrmlparser.cpp \ 
         tst_qcrmlparser.cpp
 
 wince* {
diff --git a/tests/auto/qcrmlparser/tst_qcrmlparser.cpp b/tests/auto/qcrmlparser/tst_qcrmlparser.cpp
index f8e46e6882..e64903ee57 100644
--- a/tests/auto/qcrmlparser/tst_qcrmlparser.cpp
+++ b/tests/auto/qcrmlparser/tst_qcrmlparser.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "../../../context/qcrmlparser_p.h"
+#include "../../../src/publishsubscribe/qcrmlparser_p.h"
 
 #include <QtTest/QTest>
 #include <QDebug>
diff --git a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
index 93a69112a0..0acd041dd9 100644
--- a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
+++ b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
@@ -4,7 +4,7 @@ TARGET=tst_qgeoareamonitor
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 
 # Input 
 HEADERS += ../qlocationtestutils_p.h
diff --git a/tests/auto/qgeocoordinate/qgeocoordinate.pro b/tests/auto/qgeocoordinate/qgeocoordinate.pro
index eac426b333..3136cf4986 100644
--- a/tests/auto/qgeocoordinate/qgeocoordinate.pro
+++ b/tests/auto/qgeocoordinate/qgeocoordinate.pro
@@ -4,7 +4,7 @@ TARGET=tst_qgeocoordinate
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 
 # Input 
 HEADERS += ../qlocationtestutils_p.h
diff --git a/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro b/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro
index 7bb20300a0..1ea2801bf8 100644
--- a/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro
+++ b/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro
@@ -4,7 +4,7 @@ TARGET=tst_qgeoinfosources_wince
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 DEPENDPATH += ../../../buid/Debug/bin
 
 # Input 
diff --git a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
index 356a6396cf..cfd695e675 100644
--- a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
+++ b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
@@ -4,7 +4,7 @@ TARGET=tst_qgeopositioninfo
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 
 # Input 
 SOURCES += tst_qgeopositioninfo.cpp
diff --git a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
index 0bd993f9f3..8d5fc92ec5 100644
--- a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
+++ b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
@@ -4,7 +4,7 @@ TARGET=tst_qgeopositioninfosource
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 DEPENDPATH += ../../../buid/Debug/bin
 
 # Input 
diff --git a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
index c70767301f..8cf1cf4e82 100644
--- a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
+++ b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
@@ -4,7 +4,7 @@ TARGET=tst_qgeosatelliteinfo
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 
 # Input 
 SOURCES += tst_qgeosatelliteinfo.cpp
diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
index 5b4d89ee8f..9c96f4b8a4 100644
--- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
+++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
@@ -4,7 +4,7 @@ TARGET=tst_qgeosatelliteinfosource
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
         
 # Input 
 SOURCES += tst_qgeosatelliteinfosource.cpp \
diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 1b0812ca3b..5eb9377685 100644
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qgraphicsvideoitem
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 SOURCES += tst_qgraphicsvideoitem.cpp
diff --git a/tests/auto/qlocationutils/qlocationutils.pro b/tests/auto/qlocationutils/qlocationutils.pro
index d08d8caed2..d6ea5219f5 100644
--- a/tests/auto/qlocationutils/qlocationutils.pro
+++ b/tests/auto/qlocationutils/qlocationutils.pro
@@ -4,7 +4,7 @@ TARGET=tst_qlocationutils
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 
 # Input 
 SOURCES += tst_qlocationutils.cpp
diff --git a/tests/auto/qlocationutils/tst_qlocationutils.cpp b/tests/auto/qlocationutils/tst_qlocationutils.cpp
index 3da635bfc5..e403bd848c 100644
--- a/tests/auto/qlocationutils/tst_qlocationutils.cpp
+++ b/tests/auto/qlocationutils/tst_qlocationutils.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../../location/qlocationutils_p.h"
+#include "../../../src/location/qlocationutils_p.h"
 #include "qgeopositioninfo.h"
 
 #include <QDebug>
diff --git a/tests/auto/qmallocpool/qmallocpool.pro b/tests/auto/qmallocpool/qmallocpool.pro
index 72906c0570..9984cc4a93 100644
--- a/tests/auto/qmallocpool/qmallocpool.pro
+++ b/tests/auto/qmallocpool/qmallocpool.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qmallocpool
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 CONFIG += testcase
 QT = core
 include(../../../common.pri)
diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro
index ef4b091820..e797189f45 100644
--- a/tests/auto/qmediacontent/qmediacontent.pro
+++ b/tests/auto/qmediacontent/qmediacontent.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediacontent
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 include (../../../common.pri)
diff --git a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
index 1a98552ecb..91cfc4e8d0 100644
--- a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
+++ b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qmediaimageviewer
 CONFIG += testcase
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 
 include (../../../common.pri)
 
diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro
index 1f3a1fdf30..e298e591c7 100644
--- a/tests/auto/qmediaobject/qmediaobject.pro
+++ b/tests/auto/qmediaobject/qmediaobject.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qmediaobject
 CONFIG += testcase
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 
 include (../../../common.pri)
 
diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro
index 8a89c185c1..a07ead1b61 100644
--- a/tests/auto/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/qmediaplayer/qmediaplayer.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediaplayer
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 SOURCES += tst_qmediaplayer.cpp
diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro
index 6346a79484..5209bcf78c 100644
--- a/tests/auto/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediaplaylist
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 include (../../../common.pri)
diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
index 4196996bda..0fb32ec67c 100644
--- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediaplaylistnavigator
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 SOURCES += tst_qmediaplaylistnavigator.cpp
diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro
index 0ac5ab1446..5d7863779e 100644
--- a/tests/auto/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediapluginloader
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 SOURCES += tst_qmediapluginloader.cpp
diff --git a/tests/auto/qmediarecorder/qmediarecorder.pro b/tests/auto/qmediarecorder/qmediarecorder.pro
index 33b982b600..9b6a8e21dd 100644
--- a/tests/auto/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/qmediarecorder/qmediarecorder.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediarecorder
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 SOURCES += tst_qmediarecorder.cpp
diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro
index dcbc231d4f..d8f5fd4c1c 100644
--- a/tests/auto/qmediaresource/qmediaresource.pro
+++ b/tests/auto/qmediaresource/qmediaresource.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qmediaresource
 CONFIG += testcase
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 
 include (../../../common.pri)
 
diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro
index ab64b2d4a7..ab71a13d24 100644
--- a/tests/auto/qmediaservice/qmediaservice.pro
+++ b/tests/auto/qmediaservice/qmediaservice.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediaservice
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 include (../../../common.pri)
diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
index 311200c188..d5bf5ea289 100644
--- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
+++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qmediaserviceprovider
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 SOURCES += tst_qmediaserviceprovider.cpp
diff --git a/tests/auto/qmessage/qmessage.pro b/tests/auto/qmessage/qmessage.pro
index 6db5caee07..1ca7715e30 100644
--- a/tests/auto/qmessage/qmessage.pro
+++ b/tests/auto/qmessage/qmessage.pro
@@ -8,7 +8,7 @@ include(../../../common.pri)
 include(../support/support.pri)
 
 qtAddLibrary(QtMessaging)
-INCLUDEPATH += ../../../messaging
+INCLUDEPATH += ../../../src/messaging
 
 symbian|wince*|maemo|win32 {
 } else {
diff --git a/tests/auto/qmessagestore/qmessagestore.pro b/tests/auto/qmessagestore/qmessagestore.pro
index 412f6c3cea..ca016abee8 100644
--- a/tests/auto/qmessagestore/qmessagestore.pro
+++ b/tests/auto/qmessagestore/qmessagestore.pro
@@ -8,7 +8,7 @@ include(../../../common.pri)
 include(../support/support.pri)
 
 qtAddLibrary(QtMessaging)
-INCLUDEPATH += ../../../messaging
+INCLUDEPATH += ../../../src/messaging
 
 symbian|wince*|maemo|win32 {
 } else {
diff --git a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
index 68711698f0..e8ffa19983 100644
--- a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
+++ b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
@@ -8,7 +8,7 @@ include(../../../common.pri)
 include(../support/support.pri)
 
 qtAddLibrary(QtMessaging)
-INCLUDEPATH += ../../../messaging
+INCLUDEPATH += ../../../src/messaging
 
 symbian|win32 {
 } else {
diff --git a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
index 831a56e82e..0b2ed1a5cb 100644
--- a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
+++ b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
@@ -5,7 +5,7 @@ CONFIG += testcase
 
 QT = core network
 
-INCLUDEPATH += ../../../bearer
+INCLUDEPATH += ../../../src/bearer
 
 include(../../../common.pri)
 qtAddLibrary(QtBearer)
diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
index f8804e4900..61e4097e2c 100644
--- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
+++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
@@ -5,7 +5,7 @@ CONFIG += testcase
 
 QT = core network
 
-INCLUDEPATH += ../../../bearer
+INCLUDEPATH += ../../../src/bearer
 
 include(../../../common.pri)
 qtAddLibrary(QtBearer)
diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro
index 5955fefb35..4cb8555c94 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/qnetworksession/lackey/lackey.pro
@@ -1,7 +1,7 @@
 SOURCES += main.cpp
 TARGET = qnetworksessionlackey
-INCLUDEPATH += ../../../../bearer
-DEPENDPATH += ../../../../bearer
+INCLUDEPATH += ../../../../src/bearer
+DEPENDPATH += ../../../../src/bearer
 
 QT = core network
 
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
index abe251067b..be6dd1feb9 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
@@ -5,7 +5,7 @@ CONFIG += testcase
 
 QT = core network
 
-INCLUDEPATH += ../../../../bearer
+INCLUDEPATH += ../../../../src/bearer
 
 include(../../../../common.pri)
 qtAddLibrary(QtBearer)
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
index 2139dcc548..3573487691 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
@@ -5,7 +5,7 @@ TARGET = tst_qnmeapositioninfosource
 
 include (../../../common.pri)
 
-INCLUDEPATH += ../../../location
+INCLUDEPATH += ../../../src/location
 
 HEADERS += ../qlocationtestutils_p.h \
            ../testqgeopositioninfosource_p.h \
diff --git a/tests/auto/qpacket/qpacket.pro b/tests/auto/qpacket/qpacket.pro
index 2ba87b7c4f..7613030633 100644
--- a/tests/auto/qpacket/qpacket.pro
+++ b/tests/auto/qpacket/qpacket.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qpacket
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 CONFIG += testcase
 QT = core
 include(../../../common.pri)
diff --git a/tests/auto/qpacketprotocol/qpacketprotocol.pro b/tests/auto/qpacketprotocol/qpacketprotocol.pro
index b00a8a3a98..4d3c761a07 100644
--- a/tests/auto/qpacketprotocol/qpacketprotocol.pro
+++ b/tests/auto/qpacketprotocol/qpacketprotocol.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qpacketprotocol
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 CONFIG += testcase
 QT = core network
 include(../../../common.pri)
diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
index 9d2d1770c0..1407b3ed96 100644
--- a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qpaintervideosurface
 CONFIG += testcase
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 
 contains(QT_CONFIG, opengl): QT += opengl
 
diff --git a/tests/auto/qradiotuner/qradiotuner.pro b/tests/auto/qradiotuner/qradiotuner.pro
index 3386212aa6..c984d48885 100644
--- a/tests/auto/qradiotuner/qradiotuner.pro
+++ b/tests/auto/qradiotuner/qradiotuner.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qradiotuner
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 
 CONFIG += testcase
 
diff --git a/tests/auto/qservicecontext/qservicecontext.pro b/tests/auto/qservicecontext/qservicecontext.pro
index f0a0d66f86..13ceece8e0 100644
--- a/tests/auto/qservicecontext/qservicecontext.pro
+++ b/tests/auto/qservicecontext/qservicecontext.pro
@@ -1,5 +1,5 @@
 TARGET=tst_qservicecontext
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qservicefilter/qservicefilter.pro b/tests/auto/qservicefilter/qservicefilter.pro
index 0b027c0cce..170377fa97 100644
--- a/tests/auto/qservicefilter/qservicefilter.pro
+++ b/tests/auto/qservicefilter/qservicefilter.pro
@@ -1,6 +1,6 @@
 TARGET=tst_qservicefilter
 SOURCES += tst_qservicefilter.cpp
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro b/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro
index 376a6f530f..f13894e228 100644
--- a/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro
+++ b/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qserviceinterfacedescriptor
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qservicemanager/qservicemanager.pro b/tests/auto/qservicemanager/qservicemanager.pro
index 63fa009679..1a38b90b58 100644
--- a/tests/auto/qservicemanager/qservicemanager.pro
+++ b/tests/auto/qservicemanager/qservicemanager.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qservicemanager
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro b/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro
index bdb72f9a7c..79b2c1e5ee 100644
--- a/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro
+++ b/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro
@@ -2,7 +2,7 @@ TARGET = tst_qsystemdeviceinfo
 CONFIG+=testcase
 QT = core network
 
-INCLUDEPATH += ../../../systeminfo
+INCLUDEPATH += ../../../src/systeminfo
 SOURCES  += tst_qsystemdeviceinfo.cpp
 
 include(../../../common.pri)
diff --git a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
index 3dfbf78534..835458f187 100644
--- a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
+++ b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
@@ -4,7 +4,7 @@ CONFIG+=testcase
 SOURCES  += tst_qsystemdisplayinfo.cpp
 QT = core network gui
 
-INCLUDEPATH += ../../../systeminfo
+INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
 qtAddLibrary(QtSystemInfo)
diff --git a/tests/auto/qsysteminfo/qsysteminfo.pro b/tests/auto/qsysteminfo/qsysteminfo.pro
index 1af12072eb..aff0fc4890 100644
--- a/tests/auto/qsysteminfo/qsysteminfo.pro
+++ b/tests/auto/qsysteminfo/qsysteminfo.pro
@@ -4,7 +4,7 @@ CONFIG+=testcase
 SOURCES  += tst_qsysteminfo.cpp
 QT = core network
 
-INCLUDEPATH += ../../../systeminfo
+INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
 qtAddLibrary(QtSystemInfo)
diff --git a/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro b/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro
index e19acc0848..78a2d08be6 100644
--- a/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro
+++ b/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro
@@ -4,7 +4,7 @@ CONFIG+=testcase
 QT = core network
 SOURCES  += tst_qsystemnetworkinfo.cpp
 
-INCLUDEPATH += ../../../systeminfo
+INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
 qtAddLibrary(QtSystemInfo)
diff --git a/tests/auto/qsystemreadwritelock/test/test.pro b/tests/auto/qsystemreadwritelock/test/test.pro
index b69b2dc046..9410fc5f5a 100644
--- a/tests/auto/qsystemreadwritelock/test/test.pro
+++ b/tests/auto/qsystemreadwritelock/test/test.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qsystemreadwritelock
-INCLUDEPATH += ../../../../context
-DEPENDPATH += ../../../../context
+INCLUDEPATH += ../../../../src/publishsubscribe
+DEPENDPATH += ../../../../src/publishsubscribe
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro b/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro
index 9932263baa..d3b726b5df 100644
--- a/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro
+++ b/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro
@@ -4,8 +4,8 @@
 
 SOURCES += main.cpp
 TARGET = lackey
-INCLUDEPATH += ../../../../context
-DEPENDPATH += ../../../../context
+INCLUDEPATH += ../../../../src/publishsubscribe
+DEPENDPATH += ../../../../src/publishsubscribe
 QT = core network
 
 CONFIG+= testcase
diff --git a/tests/auto/qsystemreadwritelock_oop/test/test.pro b/tests/auto/qsystemreadwritelock_oop/test/test.pro
index 7524f0b71f..639ec6da88 100644
--- a/tests/auto/qsystemreadwritelock_oop/test/test.pro
+++ b/tests/auto/qsystemreadwritelock_oop/test/test.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qsystemreadwritelock_oop
-INCLUDEPATH += ../../../../context
+INCLUDEPATH += ../../../../src/publishsubscribe
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qsystemscreensaver/qsystemscreensaver.pro b/tests/auto/qsystemscreensaver/qsystemscreensaver.pro
index ce8160c695..408198b371 100644
--- a/tests/auto/qsystemscreensaver/qsystemscreensaver.pro
+++ b/tests/auto/qsystemscreensaver/qsystemscreensaver.pro
@@ -2,7 +2,7 @@ TARGET = tst_qsystemscreensaver
 CONFIG+=testcase
 QT = gui core network
 
-INCLUDEPATH += ../../../systeminfo
+INCLUDEPATH += ../../../src/systeminfo
 SOURCES  += tst_qsystemscreensaver.cpp
 
 include(../../../common.pri)
diff --git a/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro b/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro
index 36ce74ee7f..56afab3a4f 100644
--- a/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro
+++ b/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro
@@ -5,7 +5,7 @@ CONFIG+=testcase
 QT = core network
 
 SOURCES  += tst_qsystemstorageinfo.cpp
-INCLUDEPATH += ../../../systeminfo
+INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
 qtAddLibrary(QtSystemInfo)
diff --git a/tests/auto/qvaluespace/qvaluespace.pro b/tests/auto/qvaluespace/qvaluespace.pro
index f3469aabdd..acd645855a 100644
--- a/tests/auto/qvaluespace/qvaluespace.pro
+++ b/tests/auto/qvaluespace/qvaluespace.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qvaluespace
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro b/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro
index 74a06aea91..0a2cdf3f3b 100644
--- a/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro
+++ b/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qvaluespaceprovider
-INCLUDEPATH += ../../../context
-DEPENDPATH += ../../../context
+INCLUDEPATH += ../../../src/publishsubscribe
+DEPENDPATH += ../../../src/publishsubscribe
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qvaluespacesubscriber/lackey/lackey.pro b/tests/auto/qvaluespacesubscriber/lackey/lackey.pro
index 91c28a4af3..5e31c3a0b8 100644
--- a/tests/auto/qvaluespacesubscriber/lackey/lackey.pro
+++ b/tests/auto/qvaluespacesubscriber/lackey/lackey.pro
@@ -1,7 +1,7 @@
 SOURCES += main.cpp
 TARGET = vsiTestLackey
-INCLUDEPATH += ../../../../context
-DEPENDPATH += ../../../../context
+INCLUDEPATH += ../../../../src/publishsubscribe
+DEPENDPATH += ../../../../src/publishsubscribe
 
 QT = core
 
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
index 7c98cea82a..d8f867408d 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qvaluespacesubscriber
-INCLUDEPATH += ../../../../context
-DEPENDPATH += ../../../../context
+INCLUDEPATH += ../../../../src/publishsubscribe
+DEPENDPATH += ../../../../src/publishsubscribe
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
index a06767a629..da96031328 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qvaluespacesubscriber_oop
-INCLUDEPATH += ../../../../context
-DEPENDPATH += ../../../../context
+INCLUDEPATH += ../../../../src/publishsubscribe
+DEPENDPATH += ../../../../src/publishsubscribe
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro
index 114046324e..751a80008d 100644
--- a/tests/auto/qvideowidget/qvideowidget.pro
+++ b/tests/auto/qvideowidget/qvideowidget.pro
@@ -1,5 +1,5 @@
 TARGET = tst_qvideowidget
-INCLUDEPATH += ../../../multimedia
+INCLUDEPATH += ../../../src/multimedia
 CONFIG += testcase
 
 include (../../../common.pri)
diff --git a/tests/auto/servicedatabase/servicedatabase.pro b/tests/auto/servicedatabase/servicedatabase.pro
index cc36ba62c6..6c6b950240 100644
--- a/tests/auto/servicedatabase/servicedatabase.pro
+++ b/tests/auto/servicedatabase/servicedatabase.pro
@@ -1,7 +1,7 @@
 TARGET=tst_servicedatabase
 QT = core sql
-INCLUDEPATH += ../../../serviceframework
-DEPENDPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
+DEPENDPATH += ../../../src/serviceframework
 
 
 wince*|symbian*: {
diff --git a/tests/auto/servicemetadata/servicemetadata.pro b/tests/auto/servicemetadata/servicemetadata.pro
index 4a4b8dc7b9..24b088973a 100644
--- a/tests/auto/servicemetadata/servicemetadata.pro
+++ b/tests/auto/servicemetadata/servicemetadata.pro
@@ -1,5 +1,5 @@
 TARGET=tst_servicemetadata
-INCLUDEPATH += ../../../serviceframework
+INCLUDEPATH += ../../../src/serviceframework
 
 wince*|symbian*: {
     addFiles.sources = testdata/*
diff --git a/tests/auto/servicemetadata/tst_servicemetadata.cpp b/tests/auto/servicemetadata/tst_servicemetadata.cpp
index 8abaaadc19..520105bf1e 100644
--- a/tests/auto/servicemetadata/tst_servicemetadata.cpp
+++ b/tests/auto/servicemetadata/tst_servicemetadata.cpp
@@ -43,9 +43,9 @@
 #define private public
 #include <qserviceinterfacedescriptor.h>
 #include <qserviceinterfacedescriptor_p.h>
-#include "../../../serviceframework/qserviceinterfacedescriptor.cpp"
+#include "../../../src/serviceframework/qserviceinterfacedescriptor.cpp"
 #include "servicemetadata_p.h"
-#include "../../../serviceframework/servicemetadata.cpp"
+#include "../../../src/serviceframework/servicemetadata.cpp"
 
 #if defined(Q_OS_SYMBIAN)
 # define TESTDATA_DIR "."
diff --git a/tests/bearerex/bearerex.pro b/tests/bearerex/bearerex.pro
index dc7d909d36..f9f69baed1 100644
--- a/tests/bearerex/bearerex.pro
+++ b/tests/bearerex/bearerex.pro
@@ -14,7 +14,7 @@ CONFIG += testcase
 
 DEPENDPATH += .
 INCLUDEPATH += . \
-               ../../bearer
+               ../../src/bearer
 
 # Example headers and sources
 HEADERS += bearerex.h \
diff --git a/tests/networkmanager/networkmanager.pro b/tests/networkmanager/networkmanager.pro
index 98e476c73b..31b2af10f3 100644
--- a/tests/networkmanager/networkmanager.pro
+++ b/tests/networkmanager/networkmanager.pro
@@ -9,7 +9,7 @@ CONFIG += testcase
 
 requires(contains(QT_CONFIG,dbus))
 
-INCLUDEPATH += ../../bearer
+INCLUDEPATH += ../../src/bearer
 include(../../common.pri)
 
 qtAddLibrary(QtBearer)
diff --git a/tests/playlist/playlist.pro b/tests/playlist/playlist.pro
index 9be0941865..8f5fb79796 100644
--- a/tests/playlist/playlist.pro
+++ b/tests/playlist/playlist.pro
@@ -2,7 +2,7 @@ QT       += phonon
 TARGET = playlist
 TEMPLATE = app
 
-INCLUDEPATH += ../../multimedia
+INCLUDEPATH += ../../src/multimedia
 
 qtAddLibrary(QtMedia)
 
diff --git a/tests/sampleserviceplugin/sampleserviceplugin.pro b/tests/sampleserviceplugin/sampleserviceplugin.pro
index 6918f19452..ae1a1e89d3 100644
--- a/tests/sampleserviceplugin/sampleserviceplugin.pro
+++ b/tests/sampleserviceplugin/sampleserviceplugin.pro
@@ -1,6 +1,6 @@
 TEMPLATE      = lib
 CONFIG       += plugin testplugin
-INCLUDEPATH  += ../../serviceframework
+INCLUDEPATH  += ../../src/serviceframework
 HEADERS       = sampleserviceplugin.h
 SOURCES       = sampleserviceplugin.cpp
 TARGET        = tst_sfw_sampleserviceplugin
diff --git a/tests/sampleserviceplugin2/sampleserviceplugin2.pro b/tests/sampleserviceplugin2/sampleserviceplugin2.pro
index ed84f54f31..e557e8bdab 100644
--- a/tests/sampleserviceplugin2/sampleserviceplugin2.pro
+++ b/tests/sampleserviceplugin2/sampleserviceplugin2.pro
@@ -1,6 +1,6 @@
 TEMPLATE      = lib
 CONFIG       += plugin testplugin
-INCLUDEPATH  += ../../serviceframework
+INCLUDEPATH  += ../../src/serviceframework
 HEADERS       = sampleserviceplugin2.h
 SOURCES       = sampleserviceplugin2.cpp
 TARGET        = tst_sfw_sampleserviceplugin2
diff --git a/tests/testservice2/testservice2.pro b/tests/testservice2/testservice2.pro
index 900d5fd371..4cfe7adc1b 100644
--- a/tests/testservice2/testservice2.pro
+++ b/tests/testservice2/testservice2.pro
@@ -1,6 +1,6 @@
 TEMPLATE      = lib
 CONFIG       += plugin testplugin
-INCLUDEPATH  += ../../serviceframework
+INCLUDEPATH  += ../../src/serviceframework
 HEADERS       = testserviceplugin.h testservice.h testserviceinterface.h
 SOURCES       = testserviceplugin.cpp
 TARGET        = tst_sfw_testservice2plugin
diff --git a/tools/qcrmlgen/qcrmlgen.pro b/tools/qcrmlgen/qcrmlgen.pro
index bb49e4be97..7bb36aed4e 100644
--- a/tools/qcrmlgen/qcrmlgen.pro
+++ b/tools/qcrmlgen/qcrmlgen.pro
@@ -2,8 +2,8 @@ TEMPLATE=app
 TARGET=qcrmlgen
 CONFIG += core gui
 
-INCLUDEPATH += ../../context
-DEPENDPATH += ../../context
+INCLUDEPATH += ../../src/publishsubscribe
+DEPENDPATH += ../../src/publishsubscribe
 
 HEADERS = qcrmlgen.h \
           qcrmlparser_p.h
diff --git a/tools/servicefw/servicefw.pro b/tools/servicefw/servicefw.pro
index 10d4b623aa..92faad0c4f 100644
--- a/tools/servicefw/servicefw.pro
+++ b/tools/servicefw/servicefw.pro
@@ -2,7 +2,7 @@ TEMPLATE=app
 TARGET=servicefw
 CONFIG+=console
 
-INCLUDEPATH += ../../serviceframework
+INCLUDEPATH += ../../src/serviceframework
 
 SOURCES=servicefw.cpp
 
diff --git a/tools/servicexmlgen/servicexmlgen.pro b/tools/servicexmlgen/servicexmlgen.pro
index d33d1ae870..b76742562d 100644
--- a/tools/servicexmlgen/servicexmlgen.pro
+++ b/tools/servicexmlgen/servicexmlgen.pro
@@ -1,7 +1,7 @@
 TEMPLATE=app
 TARGET=servicexmlgen
 
-INCLUDEPATH += ../../serviceframework
+INCLUDEPATH += ../../src/serviceframework
 
 HEADERS = servicexmlgen.h \
           servicewidget.h \
diff --git a/tools/vsexplorer/vsexplorer.pro b/tools/vsexplorer/vsexplorer.pro
index 36b645876d..9850600e9d 100644
--- a/tools/vsexplorer/vsexplorer.pro
+++ b/tools/vsexplorer/vsexplorer.pro
@@ -2,8 +2,8 @@ TEMPLATE=app
 TARGET=vsexplorer
 CONFIG+=console
 
-INCLUDEPATH += ../../context
-DEPENDPATH += ../../context
+INCLUDEPATH += ../../src/publishsubscribe
+DEPENDPATH += ../../src/publishsubscribe
 
 #enable_readline {
 #    MODULES*=readline