adding QtMobility namespace (#1)

231 files changed, 780 insertions, 309 deletions

diff --git a/doc/src/qtmobility.qdocconf b/doc/src/qtmobility.qdocconf
index 763f7a8e64..90bd4a1355 100644
--- a/doc/src/qtmobility.qdocconf
+++ b/doc/src/qtmobility.qdocconf
@@ -122,7 +122,9 @@ Cpp.ignoretokens        = QAXFACTORY_EXPORT \
                           QT_BEGIN_HEADER \
                           QT_END_HEADER \
                           QT_BEGIN_NAMESPACE \
-                          QT_END_NAMESPACE
+                          QT_END_NAMESPACE \
+                          QTM_BEGIN_NAMESPACE \
+                          QTM_END_NAMESPACE
 
 Cpp.ignoredirectives    = Q_DECLARE_INTERFACE \
                           Q_DECLARE_OPERATORS_FOR_FLAGS \
diff --git a/plugins/gstreamer/qgstvideobuffer.h b/plugins/gstreamer/qgstvideobuffer.h
index fb244b216b..a98f8c3848 100644
--- a/plugins/gstreamer/qgstvideobuffer.h
+++ b/plugins/gstreamer/qgstvideobuffer.h
@@ -48,7 +48,7 @@
 
 #include <gst/gst.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QGstVideoBuffer : public QAbstractVideoBuffer
 {
@@ -68,7 +68,7 @@ private:
 };
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
 
diff --git a/plugins/gstreamer/qvideosurfacegstsink.h b/plugins/gstreamer/qvideosurfacegstsink.h
index c2196b063c..241b3f7e41 100644
--- a/plugins/gstreamer/qvideosurfacegstsink.h
+++ b/plugins/gstreamer/qvideosurfacegstsink.h
@@ -53,7 +53,7 @@
 #include <QtMultimedia/qvideosurfaceformat.h>
 #include <QtMultimedia/qvideoframe.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
 
 class QVideoSurfaceGstDelegate : public QObject
@@ -133,7 +133,7 @@ public:
 };
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
 
diff --git a/plugins/m3u/main.cpp b/plugins/m3u/main.cpp
index 47574ccfcc..653b6d2520 100644
--- a/plugins/m3u/main.cpp
+++ b/plugins/m3u/main.cpp
@@ -42,9 +42,9 @@
 #include "qm3uhandler.h"
 #include <qstringlist.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 Q_EXPORT_STATIC_PLUGIN(QM3uPlaylistPlugin)
 Q_EXPORT_PLUGIN2(qm3u, QM3uPlaylistPlugin)
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/plugins/m3u/qm3uhandler.cpp b/plugins/m3u/qm3uhandler.cpp
index 822893a750..0a99d6aba4 100644
--- a/plugins/m3u/qm3uhandler.cpp
+++ b/plugins/m3u/qm3uhandler.cpp
@@ -47,7 +47,7 @@
 #include <QFile>
 #include <QUrl>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QM3uPlaylistReader : public QMediaPlaylistReader
 {
@@ -205,4 +205,4 @@ QMediaPlaylistWriter *QM3uPlaylistPlugin::createWriter(QIODevice *device, const
 }
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/plugins/m3u/qm3uhandler.h b/plugins/m3u/qm3uhandler.h
index 14a30c6ca0..13137395ff 100644
--- a/plugins/m3u/qm3uhandler.h
+++ b/plugins/m3u/qm3uhandler.h
@@ -45,7 +45,7 @@
 #include <qmediaplaylistioplugin.h>
 #include <QObject>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QM3uPlaylistPlugin : public QMediaPlaylistIOPlugin
 {
@@ -67,6 +67,6 @@ public:
     virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif // QM3UHANDLER_H
diff --git a/plugins/v4l/camera/v4lvideobuffer.h b/plugins/v4l/camera/v4lvideobuffer.h
index 9335d691d2..af17bb69f8 100644
--- a/plugins/v4l/camera/v4lvideobuffer.h
+++ b/plugins/v4l/camera/v4lvideobuffer.h
@@ -49,7 +49,7 @@
 #include <QtMultimedia/QAbstractVideoBuffer>
 #include <linux/videodev2.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class V4LVideoBuffer : public QAbstractVideoBuffer
 {
@@ -74,7 +74,7 @@ private:
 };
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
 
diff --git a/src/bearer/qcorewlanengine_mac.mm b/src/bearer/qcorewlanengine_mac.mm
index fea694b5d3..2aed517593 100644
--- a/src/bearer/qcorewlanengine_mac.mm
+++ b/src/bearer/qcorewlanengine_mac.mm
@@ -63,7 +63,7 @@
 #include <SystemConfiguration/SCNetworkConfiguration.h>
 QMap <QString, QString> networkInterfaces;
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QCoreWlanEngine, coreWlanEngine)
 
@@ -456,5 +456,5 @@ bool QCoreWlanEngine::getAllScInterfaces()
 }
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qcorewlanengine_mac_p.h b/src/bearer/qcorewlanengine_mac_p.h
index c6f0cd5df5..fc8e4b512c 100644
--- a/src/bearer/qcorewlanengine_mac_p.h
+++ b/src/bearer/qcorewlanengine_mac_p.h
@@ -56,7 +56,7 @@
 #include "qnetworksessionengine_p.h"
 #include <QMap>
 #include <QTimer>
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
 
@@ -94,7 +94,7 @@ private:
     bool isKnownSsid(const QString &interfaceName, const QString &ssid);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
 
diff --git a/src/bearer/qgenericengine.cpp b/src/bearer/qgenericengine.cpp
index 65ea57ff21..184a69c752 100644
--- a/src/bearer/qgenericengine.cpp
+++ b/src/bearer/qgenericengine.cpp
@@ -53,7 +53,7 @@
 #include "qnetworksessionengine_win_p.h"
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QGenericEngine, genericEngine)
 
@@ -229,5 +229,6 @@ QGenericEngine *QGenericEngine::instance()
     return genericEngine();
 }
 
-QT_END_NAMESPACE
+#include "moc_qgenericengine_p.cpp"
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qgenericengine_p.h b/src/bearer/qgenericengine_p.h
index 88de2a0306..976776e612 100644
--- a/src/bearer/qgenericengine_p.h
+++ b/src/bearer/qgenericengine_p.h
@@ -58,7 +58,7 @@
 #include <QMap>
 #include <QTimer>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
 
@@ -88,7 +88,7 @@ private:
     QTimer pollTimer;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
 
diff --git a/src/bearer/qnativewifiengine_win.cpp b/src/bearer/qnativewifiengine_win.cpp
index 128505f4b7..cb605dd793 100644
--- a/src/bearer/qnativewifiengine_win.cpp
+++ b/src/bearer/qnativewifiengine_win.cpp
@@ -52,7 +52,7 @@
 #include <wtypes.h>
 #undef interface
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QNativeWifiEngine, nativeWifiEngine)
 
@@ -721,4 +721,4 @@ QNativeWifiEngine *QNativeWifiEngine::instance()
     return engine;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnativewifiengine_win_p.h b/src/bearer/qnativewifiengine_win_p.h
index adc75e133a..0d5bcb039e 100644
--- a/src/bearer/qnativewifiengine_win_p.h
+++ b/src/bearer/qnativewifiengine_win_p.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qtimer.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
 
@@ -90,6 +90,6 @@ private:
     Qt::HANDLE handle;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
diff --git a/src/bearer/qnetworkconfigmanager.cpp b/src/bearer/qnetworkconfigmanager.cpp
index 8e8ab2d038..492806374e 100644
--- a/src/bearer/qnetworkconfigmanager.cpp
+++ b/src/bearer/qnetworkconfigmanager.cpp
@@ -47,7 +47,7 @@
 #include "qnetworkconfigmanager_p.h"
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QNetworkConfigurationManagerPrivate, connManager);
 
@@ -302,5 +302,7 @@ void QNetworkConfigurationManager::updateConfigurations()
     connManager()->performAsyncConfigurationUpdate();
 }
 
-QT_END_NAMESPACE
+#include "moc_qnetworkconfigmanager.cpp"
+
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qnetworkconfigmanager.h b/src/bearer/qnetworkconfigmanager.h
index 7e552af177..c774a6d1b8 100644
--- a/src/bearer/qnetworkconfigmanager.h
+++ b/src/bearer/qnetworkconfigmanager.h
@@ -49,9 +49,8 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Network)
+QTM_BEGIN_NAMESPACE
+//namespace QtMobility {
 
 class QNetworkConfigurationManagerPrivate;
 class Q_BEARER_EXPORT QNetworkConfigurationManager : public QObject
@@ -93,7 +92,8 @@ Q_SIGNALS:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkConfigurationManager::CapabilityFlags)
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
+//}
 
 QT_END_HEADER
 
diff --git a/src/bearer/qnetworkconfigmanager_maemo.cpp b/src/bearer/qnetworkconfigmanager_maemo.cpp
index 3fd9bd1a87..b499d5fd3e 100644
--- a/src/bearer/qnetworkconfigmanager_maemo.cpp
+++ b/src/bearer/qnetworkconfigmanager_maemo.cpp
@@ -53,7 +53,7 @@
 #include <iapconf.h>
 #include <iapmonitor.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #define IAP "/system/osso/connectivity/IAP"
 static int iap_prefix_len;
@@ -756,4 +756,4 @@ void QNetworkConfigurationManagerPrivate::configChanged(QNetworkConfigurationPri
 
 #include "qnetworkconfigmanager_maemo.moc"
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnetworkconfigmanager_maemo_p.h b/src/bearer/qnetworkconfigmanager_maemo_p.h
index b56aa9a757..b812822a1e 100644
--- a/src/bearer/qnetworkconfigmanager_maemo_p.h
+++ b/src/bearer/qnetworkconfigmanager_maemo_p.h
@@ -60,7 +60,7 @@
 #include <QHash>
 #include <QStringList>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 
 class QNetworkConfigurationManagerPrivate : public QObject
@@ -136,6 +136,6 @@ Q_SIGNALS:
     void onlineStateChanged(bool isOnline);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKCONFIGURATIONMANAGERPRIVATE_H
diff --git a/src/bearer/qnetworkconfigmanager_p.cpp b/src/bearer/qnetworkconfigmanager_p.cpp
index 17e15e4e6e..4265acf991 100644
--- a/src/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/bearer/qnetworkconfigmanager_p.cpp
@@ -59,7 +59,7 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qstringlist.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 void QNetworkConfigurationManagerPrivate::registerPlatformCapabilities()
 {
@@ -444,5 +444,7 @@ void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate()
 #endif
 }
 
-QT_END_NAMESPACE
+#include "moc_qnetworkconfigmanager_p.cpp"
+
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qnetworkconfigmanager_p.h b/src/bearer/qnetworkconfigmanager_p.h
index 9f47081c72..3dd4ba16ec 100644
--- a/src/bearer/qnetworkconfigmanager_p.h
+++ b/src/bearer/qnetworkconfigmanager_p.h
@@ -59,7 +59,7 @@
 #include <QHash>
 #include <QStringList>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #ifdef BEARER_ENGINE
 class QNetworkSessionEngine;
@@ -173,6 +173,6 @@ private Q_SLOTS:
 #endif
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKCONFIGURATIONMANAGERPRIVATE_H
diff --git a/src/bearer/qnetworkconfigmanager_s60_p.cpp b/src/bearer/qnetworkconfigmanager_s60_p.cpp
index e444acf97b..dd74cdf4d6 100644
--- a/src/bearer/qnetworkconfigmanager_s60_p.cpp
+++ b/src/bearer/qnetworkconfigmanager_s60_p.cpp
@@ -58,7 +58,7 @@
     #include <aputils.h> 
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 static const int KValueThatWillBeAddedToSNAPId = 1000;
 static const int KUserChoiceIAPId = 0;
@@ -971,4 +971,4 @@ void AccessPointsAvailabilityScanner::RunL()
     }
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnetworkconfigmanager_s60_p.h b/src/bearer/qnetworkconfigmanager_s60_p.h
index 0f9c4aa771..eb1e405b94 100644
--- a/src/bearer/qnetworkconfigmanager_s60_p.h
+++ b/src/bearer/qnetworkconfigmanager_s60_p.h
@@ -62,7 +62,7 @@
     #include <cmmanager.h>
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class CCommsDatabase;
 class QTimer;
@@ -176,6 +176,6 @@ private: // Data
     TConnMonIapInfoBuf iIapBuf;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKCONFIGURATIONMANAGERPRIVATE_H
diff --git a/src/bearer/qnetworkconfiguration.cpp b/src/bearer/qnetworkconfiguration.cpp
index f7e0434da6..2b815c2e24 100644
--- a/src/bearer/qnetworkconfiguration.cpp
+++ b/src/bearer/qnetworkconfiguration.cpp
@@ -47,7 +47,7 @@
 #include "qnetworkconfiguration_p.h"
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QNetworkConfiguration
@@ -345,5 +345,5 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
 }
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qnetworkconfiguration.h b/src/bearer/qnetworkconfiguration.h
index 0e02f9e175..3f738df22d 100644
--- a/src/bearer/qnetworkconfiguration.h
+++ b/src/bearer/qnetworkconfiguration.h
@@ -50,9 +50,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Network)
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
 class Q_BEARER_EXPORT QNetworkConfiguration
@@ -108,7 +106,7 @@ private:
     QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/bearer/qnetworkconfiguration_maemo_p.h b/src/bearer/qnetworkconfiguration_maemo_p.h
index 5a7fcd4c5b..5173d01b3c 100644
--- a/src/bearer/qnetworkconfiguration_maemo_p.h
+++ b/src/bearer/qnetworkconfiguration_maemo_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/qshareddata.h>
 #include <QNetworkInterface>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate : public QSharedData
 {
@@ -104,6 +104,6 @@ private:
     QNetworkConfigurationPrivate(const QNetworkConfigurationPrivate &other);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKCONFIGURATIONPRIVATE_H
diff --git a/src/bearer/qnetworkconfiguration_p.h b/src/bearer/qnetworkconfiguration_p.h
index 3b3e37d3a7..be763e3eef 100644
--- a/src/bearer/qnetworkconfiguration_p.h
+++ b/src/bearer/qnetworkconfiguration_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/qshareddata.h>
 #include <QNetworkInterface>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate : public QSharedData
 {
@@ -99,6 +99,6 @@ private:
     QNetworkConfigurationPrivate(const QNetworkConfigurationPrivate &other);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKCONFIGURATIONPRIVATE_H
diff --git a/src/bearer/qnetworkconfiguration_s60_p.cpp b/src/bearer/qnetworkconfiguration_s60_p.cpp
index 3d15a31167..8ce7f09ef1 100644
--- a/src/bearer/qnetworkconfiguration_s60_p.cpp
+++ b/src/bearer/qnetworkconfiguration_s60_p.cpp
@@ -41,7 +41,7 @@
 
 #include "qnetworkconfiguration_s60_p.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 QNetworkConfigurationPrivate::QNetworkConfigurationPrivate()
     : isValid(false), type(QNetworkConfiguration::Invalid),
@@ -57,4 +57,4 @@ QNetworkConfigurationPrivate::~QNetworkConfigurationPrivate()
     serviceNetworkMembers.clear(); 
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnetworkconfiguration_s60_p.h b/src/bearer/qnetworkconfiguration_s60_p.h
index bccad0c4a4..44f8f56d32 100644
--- a/src/bearer/qnetworkconfiguration_s60_p.h
+++ b/src/bearer/qnetworkconfiguration_s60_p.h
@@ -56,7 +56,7 @@
 #include <qnetworkconfiguration.h>
 #include <QtCore/qshareddata.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate : public QSharedData
 {
@@ -102,7 +102,7 @@ private:
     QNetworkConfigurationPrivate(const QNetworkConfigurationPrivate &other);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKCONFIGURATIONPRIVATE_H
 
diff --git a/src/bearer/qnetworkmanagerservice_p.cpp b/src/bearer/qnetworkmanagerservice_p.cpp
index 0d574f3c64..2f91af0560 100644
--- a/src/bearer/qnetworkmanagerservice_p.cpp
+++ b/src/bearer/qnetworkmanagerservice_p.cpp
@@ -57,6 +57,7 @@
 #include "qnetworkmanagerservice_p.h"
 
 //Q_DECLARE_METATYPE(QList<uint>)
+QTM_BEGIN_NAMESPACE
 
 static QDBusConnection dbusConnection = QDBusConnection::systemBus();
 //static QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbusConnection);
@@ -1004,3 +1005,7 @@ QStringList QNetworkManagerIp4Config::domains() const
 {
     return d->connectionInterface->property("Domains").toStringList();
 }
+
+#include "moc_qnetworkmanagerservice_p.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnetworkmanagerservice_p.h b/src/bearer/qnetworkmanagerservice_p.h
index d0b0129ed3..8569e71739 100644
--- a/src/bearer/qnetworkmanagerservice_p.h
+++ b/src/bearer/qnetworkmanagerservice_p.h
@@ -66,14 +66,17 @@
 #include <QDBusPendingCallWatcher>
 #include <qnmdbushelper_p.h>
 
-QT_BEGIN_NAMESPACE
 
+QTM_BEGIN_NAMESPACE
 typedef QMap< QString, QMap<QString,QVariant> > QNmSettingsMap;
-Q_DECLARE_METATYPE(QNmSettingsMap)
 typedef QList<quint32> ServerThing;
-Q_DECLARE_METATYPE(ServerThing)
+QTM_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QNmSettingsMap))
+Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(ServerThing))
 
+
+QTM_BEGIN_NAMESPACE
 class QNetworkManagerInterfacePrivate;
 class QNetworkManagerInterface : public QObject
 {
@@ -392,6 +395,6 @@ public:
 };
 ////
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKMANAGERSERVICE_H
diff --git a/src/bearer/qnetworksession.cpp b/src/bearer/qnetworksession.cpp
index 2e78a4ac78..e751e789ae 100644
--- a/src/bearer/qnetworksession.cpp
+++ b/src/bearer/qnetworksession.cpp
@@ -52,7 +52,7 @@
 #include "qnetworksession_p.h"
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QNetworkSession
@@ -686,4 +686,4 @@ void QNetworkSession::disconnectNotify(const char *signal)
 
 #include "moc_qnetworksession.cpp"
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnetworksession.h b/src/bearer/qnetworksession.h
index 9bc4749a6d..7677a04cdf 100644
--- a/src/bearer/qnetworksession.h
+++ b/src/bearer/qnetworksession.h
@@ -54,9 +54,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Network)
+QTM_BEGIN_NAMESPACE
 
 class QNetworkSessionPrivate;
 class Q_BEARER_EXPORT QNetworkSession : public QObject
@@ -130,7 +128,7 @@ private:
     friend class QNetworkSessionPrivate;
     };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/bearer/qnetworksession_maemo.cpp b/src/bearer/qnetworksession_maemo.cpp
index 8518936b9f..1c4c5e6738 100644
--- a/src/bearer/qnetworksession_maemo.cpp
+++ b/src/bearer/qnetworksession_maemo.cpp
@@ -54,7 +54,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 static QHash<QString, QVariant> properties;
 
@@ -1177,4 +1177,4 @@ QNetworkSession::SessionError QNetworkSessionPrivate::error() const
 
 #include "qnetworksession_maemo.moc"
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnetworksession_maemo_p.h b/src/bearer/qnetworksession_maemo_p.h
index efc5366205..e5adceb477 100644
--- a/src/bearer/qnetworksession_maemo_p.h
+++ b/src/bearer/qnetworksession_maemo_p.h
@@ -62,7 +62,7 @@
 
 #include <icd/dbus_api.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkSessionPrivate : public QObject
 {
@@ -161,7 +161,7 @@ private:
     void cleanupSession(void);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKSESSIONPRIVATE_H
 
diff --git a/src/bearer/qnetworksession_p.cpp b/src/bearer/qnetworksession_p.cpp
index dc33eb55ff..5118d50977 100644
--- a/src/bearer/qnetworksession_p.cpp
+++ b/src/bearer/qnetworksession_p.cpp
@@ -63,7 +63,7 @@
 #include "qnmwifiengine_unix_p.h"
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #if defined(BACKEND_NM)
 static bool NetworkManagerAvailable()
@@ -536,5 +536,7 @@ if(serviceName.isEmpty())
         startTime = QDateTime::currentDateTime();
 }
 #endif
-QT_END_NAMESPACE
+
+#include "moc_qnetworksession_p.cpp"
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qnetworksession_p.h b/src/bearer/qnetworksession_p.h
index c9fa8ac4f2..0db4172b05 100644
--- a/src/bearer/qnetworksession_p.h
+++ b/src/bearer/qnetworksession_p.h
@@ -63,7 +63,7 @@
 #include <QNetworkInterface>
 #include <QDateTime>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 #ifdef BEARER_ENGINE
 class QNetworkSessionEngine;
 #endif
@@ -161,7 +161,7 @@ private:
 #endif
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKSESSIONPRIVATE_H
 
diff --git a/src/bearer/qnetworksession_s60_p.h b/src/bearer/qnetworksession_s60_p.h
index 92708a9f1d..13f2b9ca40 100644
--- a/src/bearer/qnetworksession_s60_p.h
+++ b/src/bearer/qnetworksession_s60_p.h
@@ -67,7 +67,7 @@
 
 typedef int(*TOpenCSetdefaultifFunction)(const struct ifreq*);
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class ConnectionProgressNotifier;
 
@@ -207,7 +207,7 @@ private: // Data
     
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QNETWORKSESSIONPRIVATE_H
 
diff --git a/src/bearer/qnetworksessionengine.cpp b/src/bearer/qnetworksessionengine.cpp
index c7f5b1058d..55fc4f3934 100644
--- a/src/bearer/qnetworksessionengine.cpp
+++ b/src/bearer/qnetworksessionengine.cpp
@@ -41,7 +41,7 @@
 
 #include "qnetworksessionengine_p.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 QNetworkSessionEngine::QNetworkSessionEngine(QObject *parent)
 :   QObject(parent)
@@ -52,5 +52,6 @@ QNetworkSessionEngine::~QNetworkSessionEngine()
 {
 }
 
-QT_END_NAMESPACE
+#include "moc_qnetworksessionengine_p.cpp"
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qnetworksessionengine_p.h b/src/bearer/qnetworksessionengine_p.h
index 415fd94024..795a209d7c 100644
--- a/src/bearer/qnetworksessionengine_p.h
+++ b/src/bearer/qnetworksessionengine_p.h
@@ -53,15 +53,15 @@
 // We mean it.
 //
 
+#include <qmobilityglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qglobal.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qstring.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
-
 class QNetworkSessionEngine : public QObject
 {
     Q_OBJECT
@@ -93,6 +93,6 @@ Q_SIGNALS:
     void connectionError(const QString &id, QNetworkSessionEngine::ConnectionError error);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
diff --git a/src/bearer/qnlaengine_win.cpp b/src/bearer/qnlaengine_win.cpp
index 0cdc2b7c6f..c6ad228b0b 100644
--- a/src/bearer/qnlaengine_win.cpp
+++ b/src/bearer/qnlaengine_win.cpp
@@ -51,7 +51,7 @@
 
 #include "qnetworksessionengine_win_p.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QNlaEngine, nlaEngine)
 
@@ -584,7 +584,7 @@ QNlaEngine *QNlaEngine::instance()
     return nlaEngine();
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #include "qnlaengine_win.moc"
 
diff --git a/src/bearer/qnlaengine_win_p.h b/src/bearer/qnlaengine_win_p.h
index d9d752bef7..394b8cfdf2 100644
--- a/src/bearer/qnlaengine_win_p.h
+++ b/src/bearer/qnlaengine_win_p.h
@@ -57,7 +57,7 @@
 
 #include <QMap>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
 class QNlaThread;
@@ -99,6 +99,6 @@ private:
     QMap<uint, QString> configurationInterface;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
diff --git a/src/bearer/qnmdbushelper.cpp b/src/bearer/qnmdbushelper.cpp
index 418a821d1e..3b780f6e2d 100644
--- a/src/bearer/qnmdbushelper.cpp
+++ b/src/bearer/qnmdbushelper.cpp
@@ -54,6 +54,8 @@
 
 #include <QDebug>
 
+QTM_BEGIN_NAMESPACE
+
 void QNmDBusHelper::deviceStateChanged(quint32 state)
  {
     QDBusMessage msg = this->message();
@@ -111,4 +113,5 @@ void QNmDBusHelper::slotSettingsRemoved()
     emit pathForSettingsRemoved(msg.path());
 }
 
-
+#include "moc_qnmdbushelper_p.cpp"
+QTM_END_NAMESPACE
diff --git a/src/bearer/qnmdbushelper_p.h b/src/bearer/qnmdbushelper_p.h
index ebd4e63db5..f0248dcc0b 100644
--- a/src/bearer/qnmdbushelper_p.h
+++ b/src/bearer/qnmdbushelper_p.h
@@ -53,13 +53,14 @@
 // We mean it.
 //
 
+#include <qmobilityglobal.h>
 #if !defined(QT_NO_DBUS) && !defined(Q_OS_MAC)
 #include <QDBusObjectPath>
 #include <QDBusContext>
 #include <QMap>
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #if !defined(QT_NO_DBUS) && !defined(Q_OS_MAC)
 
@@ -84,6 +85,6 @@ Q_SIGNALS:
 };
 #endif
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif// QNMDBUSHELPERPRIVATE_H
diff --git a/src/bearer/qnmwifiengine_unix.cpp b/src/bearer/qnmwifiengine_unix.cpp
index 69242b9643..e7ffe48eab 100644
--- a/src/bearer/qnmwifiengine_unix.cpp
+++ b/src/bearer/qnmwifiengine_unix.cpp
@@ -52,12 +52,15 @@
 #include <QNetworkInterface>
 
 
+
+QTM_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC(QNmWifiEngine, nmWifiEngine)
+typedef  QList<QList<uint> > QNmSettingsAddressMap;
+QTM_END_NAMESPACE
 
-QT_BEGIN_NAMESPACE
+Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QNmSettingsAddressMap))
 
-typedef  QList<QList<uint> > QNmSettingsAddressMap;
-Q_DECLARE_METATYPE(QNmSettingsAddressMap)
+QTM_BEGIN_NAMESPACE
 
 QNmWifiEngine::QNmWifiEngine(QObject *parent)
 :   QNetworkSessionEngine(parent)
@@ -1124,7 +1127,7 @@ QStringList QNmWifiEngine::getConnectionPathForId(const QString &uuid)
     return QStringList();
 }
 
+#include "moc_qnmwifiengine_unix_p.cpp"
 
-
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
diff --git a/src/bearer/qnmwifiengine_unix_p.h b/src/bearer/qnmwifiengine_unix_p.h
index a1bdb7b70c..1287800ad7 100644
--- a/src/bearer/qnmwifiengine_unix_p.h
+++ b/src/bearer/qnmwifiengine_unix_p.h
@@ -67,7 +67,7 @@
 
 
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
 
@@ -157,7 +157,7 @@ private slots:
     void slotActivationFinished(QDBusPendingCallWatcher*);
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
 
diff --git a/src/contacts/details/qcontactaddress.h b/src/contacts/details/qcontactaddress.h
index 141a12b156..ad8a44d353 100644
--- a/src/contacts/details/qcontactaddress.h
+++ b/src/contacts/details/qcontactaddress.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactAddress : public QContactDetail
 {
@@ -99,5 +101,7 @@ public:
     QStringList subTypes() const {return value<QStringList>(FieldSubTypes);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactanniversary.h b/src/contacts/details/qcontactanniversary.h
index 3d57f5c3a8..77eb9972b9 100644
--- a/src/contacts/details/qcontactanniversary.h
+++ b/src/contacts/details/qcontactanniversary.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactAnniversary : public QContactDetail
 {
@@ -87,5 +89,7 @@ public:
     QString subType() const {return value(FieldSubType);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactavatar.h b/src/contacts/details/qcontactavatar.h
index 47f8782b11..67ece5047b 100644
--- a/src/contacts/details/qcontactavatar.h
+++ b/src/contacts/details/qcontactavatar.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactAvatar : public QContactDetail
 {
@@ -79,5 +81,7 @@ public:
     QString subType() const {return value(FieldSubType);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactbirthday.h b/src/contacts/details/qcontactbirthday.h
index 43181829ea..0c7c1b823f 100644
--- a/src/contacts/details/qcontactbirthday.h
+++ b/src/contacts/details/qcontactbirthday.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactBirthday : public QContactDetail
 {
@@ -64,5 +66,7 @@ public:
     QDate date() const {return value<QDate>(FieldBirthday);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactdetails.cpp b/src/contacts/details/qcontactdetails.cpp
index 52b70a138b..997d97b755 100644
--- a/src/contacts/details/qcontactdetails.cpp
+++ b/src/contacts/details/qcontactdetails.cpp
@@ -41,6 +41,8 @@
 
 #include "qcontactdetails.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactAddress
  * \brief An address of a contact
@@ -1690,3 +1692,4 @@ Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::SubTypeMemorial, "Memorial");
  * Commit SHA1: e70e29ae3d30288d793336a77829919d16171acb
  */
 
+QTM_END_NAMESPACE
diff --git a/src/contacts/details/qcontactdisplaylabel.h b/src/contacts/details/qcontactdisplaylabel.h
index f048ea109b..a76180103a 100644
--- a/src/contacts/details/qcontactdisplaylabel.h
+++ b/src/contacts/details/qcontactdisplaylabel.h
@@ -49,6 +49,8 @@
 #include "qtcontactsglobal.h"
 #include "qcontactdetail.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactDisplayLabel : public QContactDetail
 {
@@ -74,4 +76,6 @@ public:
     bool Q_DECL_DEPRECATED isSynthesized() const {qWarning("synthesized(): This function has been deprecated!  Display label is supposed to be READ-ONLY.  Support for mutable display labels will be removed in week 47!");return value<bool>(FieldSynthesized);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/details/qcontactemailaddress.h b/src/contacts/details/qcontactemailaddress.h
index d13ddd29ee..ad40af1260 100644
--- a/src/contacts/details/qcontactemailaddress.h
+++ b/src/contacts/details/qcontactemailaddress.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactEmailAddress : public QContactDetail
 {
@@ -65,5 +67,7 @@ public:
     QString emailAddress() const {return value(FieldEmailAddress);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactfamily.h b/src/contacts/details/qcontactfamily.h
index afa1939dce..5187e520e0 100644
--- a/src/contacts/details/qcontactfamily.h
+++ b/src/contacts/details/qcontactfamily.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactFamily : public QContactDetail
 {
@@ -69,5 +71,7 @@ public:
     QStringList children() const {return value<QStringList>(FieldChildren);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactgender.h b/src/contacts/details/qcontactgender.h
index 70a94ad6d3..3ee5c9930c 100644
--- a/src/contacts/details/qcontactgender.h
+++ b/src/contacts/details/qcontactgender.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactGender : public QContactDetail
 {
@@ -70,5 +72,7 @@ public:
     QString gender() const {return value(FieldGender);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactgeolocation.h b/src/contacts/details/qcontactgeolocation.h
index f49e0cf8f1..26553df59c 100644
--- a/src/contacts/details/qcontactgeolocation.h
+++ b/src/contacts/details/qcontactgeolocation.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactGeolocation : public QContactDetail
 {
@@ -97,5 +99,7 @@ public:
     QDateTime timestamp() const {return variantValue(FieldTimestamp).toDateTime();}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactguid.h b/src/contacts/details/qcontactguid.h
index 8c3be32eb3..91f07fdc6e 100644
--- a/src/contacts/details/qcontactguid.h
+++ b/src/contacts/details/qcontactguid.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactGuid : public QContactDetail
 {
@@ -65,5 +67,7 @@ public:
     QString guid() const {return value(FieldGuid);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactname.h b/src/contacts/details/qcontactname.h
index 24f5230ee4..b57a7bbea7 100644
--- a/src/contacts/details/qcontactname.h
+++ b/src/contacts/details/qcontactname.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 class Q_CONTACTS_EXPORT QContactName : public QContactDetail
 {
 public:
@@ -85,4 +87,6 @@ public:
     void setCustomLabel(const QString& customLabel) {setValue(FieldCustomLabel, customLabel);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/details/qcontactnickname.h b/src/contacts/details/qcontactnickname.h
index 07e842efd1..8ba7db4fac 100644
--- a/src/contacts/details/qcontactnickname.h
+++ b/src/contacts/details/qcontactnickname.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactNickname : public QContactDetail
 {
@@ -64,5 +66,7 @@ public:
     QString nickname() const {return value(FieldNickname);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactnote.h b/src/contacts/details/qcontactnote.h
index f391dcec56..9b9dad9842 100644
--- a/src/contacts/details/qcontactnote.h
+++ b/src/contacts/details/qcontactnote.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactNote : public QContactDetail
 {
@@ -64,5 +66,7 @@ public:
     QString note() const {return value(FieldNote);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactonlineaccount.h b/src/contacts/details/qcontactonlineaccount.h
index 1660803592..3b97869248 100644
--- a/src/contacts/details/qcontactonlineaccount.h
+++ b/src/contacts/details/qcontactonlineaccount.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactOnlineAccount : public QContactDetail
 {
@@ -109,5 +111,7 @@ public:
     QStringList subTypes() const {return value<QStringList>(FieldSubTypes);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactorganization.h b/src/contacts/details/qcontactorganization.h
index 9b19d23acd..3b9f9d1b0d 100644
--- a/src/contacts/details/qcontactorganization.h
+++ b/src/contacts/details/qcontactorganization.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactOrganization : public QContactDetail
 {
@@ -88,4 +90,6 @@ public:
     QString assistantName() const {return value(FieldAssistantName);} 
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/details/qcontactphonenumber.h b/src/contacts/details/qcontactphonenumber.h
index 0f0a48cdee..ea6044f680 100644
--- a/src/contacts/details/qcontactphonenumber.h
+++ b/src/contacts/details/qcontactphonenumber.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 //! [0]
 class Q_CONTACTS_EXPORT QContactPhoneNumber : public QContactDetail
@@ -97,5 +99,7 @@ public:
 };
 //! [0]
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactpresence.h b/src/contacts/details/qcontactpresence.h
index 6a84f72f09..3c066acbe7 100644
--- a/src/contacts/details/qcontactpresence.h
+++ b/src/contacts/details/qcontactpresence.h
@@ -50,6 +50,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactPresence : public QContactDetail
 {
@@ -92,5 +94,7 @@ public:
     QString Q_DECL_DEPRECATED statusMessage() const {qWarning("This class has been deprecated!  Please use QContactOnlineAccount and Read-Only Field Constraints!"); return value(FieldStatusMessage);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontactsynctarget.h b/src/contacts/details/qcontactsynctarget.h
index 9b232cf1f7..e05f10eb83 100644
--- a/src/contacts/details/qcontactsynctarget.h
+++ b/src/contacts/details/qcontactsynctarget.h
@@ -49,6 +49,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactSyncTarget : public QContactDetail
 {
@@ -65,5 +67,7 @@ public:
     QString syncTarget() const {return value(FieldSyncTarget);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontacttimestamp.h b/src/contacts/details/qcontacttimestamp.h
index e89453a877..be57b55435 100644
--- a/src/contacts/details/qcontacttimestamp.h
+++ b/src/contacts/details/qcontacttimestamp.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactTimestamp : public QContactDetail
 {
@@ -68,4 +70,6 @@ public:
     QDateTime created() const {return value<QDateTime>(FieldCreationTimestamp);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/details/qcontacttype.h b/src/contacts/details/qcontacttype.h
index 059dfc04a8..edef269372 100644
--- a/src/contacts/details/qcontacttype.h
+++ b/src/contacts/details/qcontacttype.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactType : public QContactDetail
 {
@@ -68,5 +70,7 @@ public:
     QString type() const {return value(FieldType);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/details/qcontacturl.h b/src/contacts/details/qcontacturl.h
index 47f1bcf41c..12b3d567eb 100644
--- a/src/contacts/details/qcontacturl.h
+++ b/src/contacts/details/qcontacturl.h
@@ -48,6 +48,8 @@
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Leaf class */
 class Q_CONTACTS_EXPORT QContactUrl : public QContactDetail
 {
@@ -74,5 +76,7 @@ public:
     QString subType() const {return value(FieldSubType);}
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/engines/qcontactinvalidbackend.cpp b/src/contacts/engines/qcontactinvalidbackend.cpp
index 9384fad4e6..770feb8819 100644
--- a/src/contacts/engines/qcontactinvalidbackend.cpp
+++ b/src/contacts/engines/qcontactinvalidbackend.cpp
@@ -49,6 +49,8 @@
  * The invalid engine may be used as a reference or test engine, but does nothing.
  */
 
+QTM_BEGIN_NAMESPACE
+
 /*! Constructs a new invalid contacts backend. */
 QContactInvalidEngine::QContactInvalidEngine()
 {
@@ -73,3 +75,5 @@ QString QContactInvalidEngine::synthesizeDisplayLabel(const QContact& contact, Q
     error = QContactManager::NotSupportedError;
     return QString();
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/engines/qcontactinvalidbackend_p.h b/src/contacts/engines/qcontactinvalidbackend_p.h
index 46ae93001c..db9796088d 100644
--- a/src/contacts/engines/qcontactinvalidbackend_p.h
+++ b/src/contacts/engines/qcontactinvalidbackend_p.h
@@ -60,6 +60,8 @@
 #include <QMap>
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactInvalidEngine : public QContactManagerEngine
 {
 public:
@@ -69,5 +71,7 @@ public:
     QString synthesizeDisplayLabel(const QContact& contact, QContactManager::Error& error) const;
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/engines/qcontactmemorybackend.cpp b/src/contacts/engines/qcontactmemorybackend.cpp
index 9f0e1bf8ed..13d509f6a7 100644
--- a/src/contacts/engines/qcontactmemorybackend.cpp
+++ b/src/contacts/engines/qcontactmemorybackend.cpp
@@ -54,6 +54,8 @@
 #include <QUuid>
 #include <QSharedData>
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactMemoryEngine
  * \brief This class provides an in-memory implementation of a contacts backend.
@@ -1121,3 +1123,7 @@ bool QContactMemoryEngine::filterSupported(const QContactFilter& filter) const
     return false;
 }
 
+#include "moc_qcontactmemorybackend_p.cpp"
+
+QTM_END_NAMESPACE
+
diff --git a/src/contacts/engines/qcontactmemorybackend_p.h b/src/contacts/engines/qcontactmemorybackend_p.h
index 72905313eb..d532c14076 100644
--- a/src/contacts/engines/qcontactmemorybackend_p.h
+++ b/src/contacts/engines/qcontactmemorybackend_p.h
@@ -72,6 +72,8 @@
 #include "qcontactabstractrequest.h"
 #include "qcontactchangeset.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactAbstractRequest;
 class QContactMemoryEngineData : public QSharedData
 {
@@ -185,5 +187,7 @@ private:
     static QMap<QString, QContactMemoryEngine*> engines;
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/filters/qcontactactionfilter.cpp b/src/contacts/filters/qcontactactionfilter.cpp
index bad14884b4..e488ce654a 100644
--- a/src/contacts/filters/qcontactactionfilter.cpp
+++ b/src/contacts/filters/qcontactactionfilter.cpp
@@ -44,6 +44,8 @@
 #include "qcontactfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactActionFilter
  * \brief The QContactActionFilter class provides a filter based around an action availability criterion
@@ -142,3 +144,5 @@ int QContactActionFilter::implementationVersion() const
     Q_D(const QContactActionFilter);
     return d->m_implementationVersion;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactactionfilter.h b/src/contacts/filters/qcontactactionfilter.h
index 4e0af4e021..ac2c069566 100644
--- a/src/contacts/filters/qcontactactionfilter.h
+++ b/src/contacts/filters/qcontactactionfilter.h
@@ -44,6 +44,8 @@
 
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactActionFilterPrivate;
 class Q_CONTACTS_EXPORT QContactActionFilter : public QContactFilter
 {
@@ -65,4 +67,6 @@ private:
     Q_DECLARE_CONTACTFILTER_PRIVATE(QContactActionFilter)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactactionfilter_p.h b/src/contacts/filters/qcontactactionfilter_p.h
index 44adfcfa01..2cfbffd12a 100644
--- a/src/contacts/filters/qcontactactionfilter_p.h
+++ b/src/contacts/filters/qcontactactionfilter_p.h
@@ -59,6 +59,8 @@
 #include <QString>
 #include <QVariant>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactActionFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -99,4 +101,6 @@ public:
     int m_implementationVersion;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactchangelogfilter.cpp b/src/contacts/filters/qcontactchangelogfilter.cpp
index e9eb0394f2..93487f914c 100644
--- a/src/contacts/filters/qcontactchangelogfilter.cpp
+++ b/src/contacts/filters/qcontactchangelogfilter.cpp
@@ -44,6 +44,8 @@
 #include "qcontactfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactChangeLogFilter
   \brief The QContactChangeLogFilter class provides a filter based around a contact timestamp criterion.
@@ -114,3 +116,5 @@ QContactChangeLogFilter::EventType QContactChangeLogFilter::eventType() const
     Q_D(const QContactChangeLogFilter);
     return d->m_eventType;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactchangelogfilter.h b/src/contacts/filters/qcontactchangelogfilter.h
index cd779ee75d..53d92f9f42 100644
--- a/src/contacts/filters/qcontactchangelogfilter.h
+++ b/src/contacts/filters/qcontactchangelogfilter.h
@@ -46,6 +46,8 @@
 
 #include <QDateTime>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactChangeLogFilterPrivate;
 class Q_CONTACTS_EXPORT QContactChangeLogFilter: public QContactFilter
 {
@@ -69,4 +71,6 @@ private:
     Q_DECLARE_CONTACTFILTER_PRIVATE(QContactChangeLogFilter)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactchangelogfilter_p.h b/src/contacts/filters/qcontactchangelogfilter_p.h
index c380ea474f..4b28aad1fa 100644
--- a/src/contacts/filters/qcontactchangelogfilter_p.h
+++ b/src/contacts/filters/qcontactchangelogfilter_p.h
@@ -58,6 +58,8 @@
 
 #include <QDateTime>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactChangeLogFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -92,4 +94,6 @@ public:
     QDateTime m_since;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactdetailfilter.cpp b/src/contacts/filters/qcontactdetailfilter.cpp
index 8af3602244..d1410bb1b4 100644
--- a/src/contacts/filters/qcontactdetailfilter.cpp
+++ b/src/contacts/filters/qcontactdetailfilter.cpp
@@ -44,6 +44,8 @@
 #include "qcontactfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactDetailFilter
  * \brief The QContactDetailFilter class provides a filter based around a detail value criterion
@@ -137,3 +139,5 @@ QVariant QContactDetailFilter::value() const
     Q_D(const QContactDetailFilter);
     return d->m_exactValue;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactdetailfilter.h b/src/contacts/filters/qcontactdetailfilter.h
index fafd55223c..64a6c8185c 100644
--- a/src/contacts/filters/qcontactdetailfilter.h
+++ b/src/contacts/filters/qcontactdetailfilter.h
@@ -44,6 +44,8 @@
 
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailFilterPrivate;
 class Q_CONTACTS_EXPORT QContactDetailFilter : public QContactFilter
 {
@@ -69,4 +71,6 @@ private:
     Q_DECLARE_CONTACTFILTER_PRIVATE(QContactDetailFilter)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactdetailfilter_p.h b/src/contacts/filters/qcontactdetailfilter_p.h
index 710bc5bc51..725183016d 100644
--- a/src/contacts/filters/qcontactdetailfilter_p.h
+++ b/src/contacts/filters/qcontactdetailfilter_p.h
@@ -59,6 +59,8 @@
 #include <QString>
 #include <QVariant>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -99,4 +101,6 @@ public:
     QContactFilter::MatchFlags m_flags;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactdetailrangefilter.cpp b/src/contacts/filters/qcontactdetailrangefilter.cpp
index 78e4ca4a21..3a4ae467b7 100644
--- a/src/contacts/filters/qcontactdetailrangefilter.cpp
+++ b/src/contacts/filters/qcontactdetailrangefilter.cpp
@@ -44,6 +44,8 @@
 #include "qcontactfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactDetailRangeFilter
  * \brief The QContactDetailRageFilter class provides a filter based around a detail value range criterion
@@ -168,3 +170,5 @@ QContactDetailRangeFilter::RangeFlags QContactDetailRangeFilter::rangeFlags() co
     Q_D(const QContactDetailRangeFilter);
     return d->m_rangeflags;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactdetailrangefilter.h b/src/contacts/filters/qcontactdetailrangefilter.h
index f0229487fb..2101c5ea7b 100644
--- a/src/contacts/filters/qcontactdetailrangefilter.h
+++ b/src/contacts/filters/qcontactdetailrangefilter.h
@@ -44,6 +44,8 @@
 
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailRangeFilterPrivate;
 class Q_CONTACTS_EXPORT QContactDetailRangeFilter : public QContactFilter
 {
@@ -80,4 +82,6 @@ private:
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QContactDetailRangeFilter::RangeFlags)
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactdetailrangefilter_p.h b/src/contacts/filters/qcontactdetailrangefilter_p.h
index a4468735dc..b582844b98 100644
--- a/src/contacts/filters/qcontactdetailrangefilter_p.h
+++ b/src/contacts/filters/qcontactdetailrangefilter_p.h
@@ -61,6 +61,7 @@
 #include <QString>
 #include <QVariant>
 
+QTM_BEGIN_NAMESPACE
 
 class QContactDetailRangeFilterPrivate : public QContactFilterPrivate
 {
@@ -111,4 +112,6 @@ public:
     QContactDetailRangeFilter::RangeFlags m_rangeflags;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactintersectionfilter.cpp b/src/contacts/filters/qcontactintersectionfilter.cpp
index 58e4863675..67dccd5c7a 100644
--- a/src/contacts/filters/qcontactintersectionfilter.cpp
+++ b/src/contacts/filters/qcontactintersectionfilter.cpp
@@ -44,6 +44,8 @@
 #include "qcontactfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactIntersectionFilter
   \brief The QContactIntersectionFilter class provides a filter which intersects the results of other filters.
@@ -127,3 +129,5 @@ QList<QContactFilter> QContactIntersectionFilter::filters() const
     Q_D(const QContactIntersectionFilter);
     return d->m_filters;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactintersectionfilter.h b/src/contacts/filters/qcontactintersectionfilter.h
index 11207243ed..b53d7a4f54 100644
--- a/src/contacts/filters/qcontactintersectionfilter.h
+++ b/src/contacts/filters/qcontactintersectionfilter.h
@@ -44,6 +44,8 @@
 
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactIntersectionFilterPrivate;
 class Q_CONTACTS_EXPORT QContactIntersectionFilter : public QContactFilter
 {
@@ -67,4 +69,6 @@ private:
     Q_DECLARE_CONTACTFILTER_PRIVATE(QContactIntersectionFilter)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactintersectionfilter_p.h b/src/contacts/filters/qcontactintersectionfilter_p.h
index 8882dea58d..c27b3197b6 100644
--- a/src/contacts/filters/qcontactintersectionfilter_p.h
+++ b/src/contacts/filters/qcontactintersectionfilter_p.h
@@ -58,6 +58,8 @@
 
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactIntersectionFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -87,4 +89,6 @@ public:
     QList<QContactFilter> m_filters;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactinvalidfilter.cpp b/src/contacts/filters/qcontactinvalidfilter.cpp
index eae06ecd00..3216b48053 100644
--- a/src/contacts/filters/qcontactinvalidfilter.cpp
+++ b/src/contacts/filters/qcontactinvalidfilter.cpp
@@ -50,6 +50,8 @@
   This class provides a filter which will never match any contacts
  */
 
+QTM_BEGIN_NAMESPACE
+
 class QContactInvalidFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -94,3 +96,5 @@ QContactInvalidFilter::QContactInvalidFilter(const QContactFilter& other)
     // Initializing a QCIF from anything is the same as just constructing a QCIF
     Q_UNUSED(other);
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactinvalidfilter.h b/src/contacts/filters/qcontactinvalidfilter.h
index 3608dcca79..899c3c89c7 100644
--- a/src/contacts/filters/qcontactinvalidfilter.h
+++ b/src/contacts/filters/qcontactinvalidfilter.h
@@ -44,6 +44,8 @@
 
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactInvalidFilterPrivate;
 class Q_CONTACTS_EXPORT QContactInvalidFilter : public QContactFilter
 {
@@ -52,4 +54,6 @@ public:
     QContactInvalidFilter(const QContactFilter& other);
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactlocalidfilter.cpp b/src/contacts/filters/qcontactlocalidfilter.cpp
index 34bcd89b80..ff3799668c 100644
--- a/src/contacts/filters/qcontactlocalidfilter.cpp
+++ b/src/contacts/filters/qcontactlocalidfilter.cpp
@@ -44,6 +44,8 @@
 #include "qcontactfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactLocalIdFilter
  * \brief The QContactLocalIdFilter class provides a filter based around a list of contact ids
@@ -85,3 +87,5 @@ QList<QContactLocalId> QContactLocalIdFilter::ids() const
     Q_D(const QContactLocalIdFilter);
     return d->m_ids;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactlocalidfilter.h b/src/contacts/filters/qcontactlocalidfilter.h
index 2f9d93d088..7ce04e279b 100644
--- a/src/contacts/filters/qcontactlocalidfilter.h
+++ b/src/contacts/filters/qcontactlocalidfilter.h
@@ -44,6 +44,8 @@
 
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactLocalIdFilterPrivate;
 class Q_CONTACTS_EXPORT QContactLocalIdFilter : public QContactFilter
 {
@@ -61,4 +63,6 @@ private:
     Q_DECLARE_CONTACTFILTER_PRIVATE(QContactLocalIdFilter)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactlocalidfilter_p.h b/src/contacts/filters/qcontactlocalidfilter_p.h
index 5228f055ca..25ea7c15e7 100644
--- a/src/contacts/filters/qcontactlocalidfilter_p.h
+++ b/src/contacts/filters/qcontactlocalidfilter_p.h
@@ -59,6 +59,8 @@
 #include <QString>
 #include <QVariant>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactLocalIdFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -86,4 +88,6 @@ public:
     QList<QContactLocalId> m_ids;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactrelationshipfilter.cpp b/src/contacts/filters/qcontactrelationshipfilter.cpp
index 8d8c7d1857..984e233b6a 100644
--- a/src/contacts/filters/qcontactrelationshipfilter.cpp
+++ b/src/contacts/filters/qcontactrelationshipfilter.cpp
@@ -43,6 +43,8 @@
 #include "qcontactrelationshipfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactRelationshipFilter
  * \brief The QContactRelationshipFilter class provides a filter based around relationship criteria
@@ -127,3 +129,5 @@ QContactId QContactRelationshipFilter::otherParticipantId() const
     Q_D(const QContactRelationshipFilter);
     return d->m_otherParticipantId;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactrelationshipfilter.h b/src/contacts/filters/qcontactrelationshipfilter.h
index 6f065458e3..3148e5ebc3 100644
--- a/src/contacts/filters/qcontactrelationshipfilter.h
+++ b/src/contacts/filters/qcontactrelationshipfilter.h
@@ -51,6 +51,8 @@
 #include <QList>
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRelationshipFilterPrivate;
 class Q_CONTACTS_EXPORT QContactRelationshipFilter : public QContactFilter
 {
@@ -76,4 +78,6 @@ private:
     Q_DECLARE_CONTACTFILTER_PRIVATE(QContactRelationshipFilter)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactrelationshipfilter_p.h b/src/contacts/filters/qcontactrelationshipfilter_p.h
index 8c34738de7..913fd25b65 100644
--- a/src/contacts/filters/qcontactrelationshipfilter_p.h
+++ b/src/contacts/filters/qcontactrelationshipfilter_p.h
@@ -63,6 +63,8 @@
 #include <QStringList>
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRelationshipFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -99,4 +101,6 @@ public:
     QString m_relationshipType;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactunionfilter.cpp b/src/contacts/filters/qcontactunionfilter.cpp
index 4aa1c7277c..6e75388991 100644
--- a/src/contacts/filters/qcontactunionfilter.cpp
+++ b/src/contacts/filters/qcontactunionfilter.cpp
@@ -44,6 +44,8 @@
 #include "qcontactfilter_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
    \class QContactUnionFilter
    \brief The QContactUnionFilter class provides a filter which unions the
@@ -128,3 +130,5 @@ QList<QContactFilter> QContactUnionFilter::filters() const
     Q_D(const QContactUnionFilter);
     return d->m_filters;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/filters/qcontactunionfilter.h b/src/contacts/filters/qcontactunionfilter.h
index 787cf102e9..f69e4fb313 100644
--- a/src/contacts/filters/qcontactunionfilter.h
+++ b/src/contacts/filters/qcontactunionfilter.h
@@ -44,6 +44,8 @@
 
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactUnionFilterPrivate;
 class Q_CONTACTS_EXPORT QContactUnionFilter : public QContactFilter
 {
@@ -67,4 +69,6 @@ private:
     Q_DECLARE_CONTACTFILTER_PRIVATE(QContactUnionFilter)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/filters/qcontactunionfilter_p.h b/src/contacts/filters/qcontactunionfilter_p.h
index a1a5432026..c412d51dcb 100644
--- a/src/contacts/filters/qcontactunionfilter_p.h
+++ b/src/contacts/filters/qcontactunionfilter_p.h
@@ -58,6 +58,8 @@
 
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactUnionFilterPrivate : public QContactFilterPrivate
 {
 public:
@@ -87,4 +89,6 @@ public:
     QList<QContactFilter> m_filters;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontact.cpp b/src/contacts/qcontact.cpp
index df53588520..0ed2d5d405 100644
--- a/src/contacts/qcontact.cpp
+++ b/src/contacts/qcontact.cpp
@@ -47,6 +47,8 @@
 #include "qcontactmanager_p.h"
 #include "qcontactaction.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContact
  *
@@ -674,3 +676,5 @@ QContactDetail QContact::preferredDetail(const QString& actionName) const
 
     return retn;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontact.h b/src/contacts/qcontact.h
index a60ccccc93..a19f2ee75b 100644
--- a/src/contacts/qcontact.h
+++ b/src/contacts/qcontact.h
@@ -59,6 +59,8 @@
 #include "qcontactrelationshipfilter.h"
 #include "qcontacttype.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactManager;
 class QContactData;
 class QContactName;
@@ -158,5 +160,7 @@ private:
     QSharedDataPointer<QContactData> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/qcontact_p.h b/src/contacts/qcontact_p.h
index 7650b94e06..f2a413c397 100644
--- a/src/contacts/qcontact_p.h
+++ b/src/contacts/qcontact_p.h
@@ -61,6 +61,8 @@
 
 #include "qtcontacts.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactData : public QSharedData
 {
 public:
@@ -91,5 +93,7 @@ public:
     quint32 m_nextDetailId;
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/qcontactabstractrequest.cpp b/src/contacts/qcontactabstractrequest.cpp
index 9925499746..5e434389d7 100644
--- a/src/contacts/qcontactabstractrequest.cpp
+++ b/src/contacts/qcontactabstractrequest.cpp
@@ -45,6 +45,8 @@
 #include "qcontactmanager_p.h"
 #include "qcontactmanagerengine.h"
 
+
+QTM_BEGIN_NAMESPACE
 /*!
   \class QContactAbstractRequest
   \brief The QContactAbstractRequest allows a client to asynchronously
@@ -216,3 +218,7 @@ bool QContactAbstractRequest::waitForProgress(int msecs)
 
     return false; // unable to wait for operation; not in progress or no engine.
 }
+
+#include "moc_qcontactabstractrequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactabstractrequest.h b/src/contacts/qcontactabstractrequest.h
index c201f7bb55..79c99f57c6 100644
--- a/src/contacts/qcontactabstractrequest.h
+++ b/src/contacts/qcontactabstractrequest.h
@@ -45,6 +45,8 @@
 #include "qcontactmanager.h"
 #include <QObject>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactManagerEngine;
 class QContactAbstractRequestPrivate;
 class Q_CONTACTS_EXPORT QContactAbstractRequest : public QObject
@@ -107,4 +109,6 @@ private:
     friend class QContactManagerEngine;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactabstractrequest_p.h b/src/contacts/qcontactabstractrequest_p.h
index 388ad702ac..4737a3de73 100644
--- a/src/contacts/qcontactabstractrequest_p.h
+++ b/src/contacts/qcontactabstractrequest_p.h
@@ -59,6 +59,8 @@
 #include <QList>
 #include <QPointer>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactAbstractRequestPrivate
 {
 public:
@@ -84,4 +86,6 @@ public:
     QList<QContactManager::Error> m_errors;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp
index c029e710c8..7a347fe091 100644
--- a/src/contacts/qcontactaction.cpp
+++ b/src/contacts/qcontactaction.cpp
@@ -46,6 +46,8 @@
 #include <QSet>
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 QContactAction::~QContactAction()
 {
 }
@@ -203,3 +205,7 @@ QContactAction* QContactAction::action(const QContactActionDescriptor& descripto
     QContactManagerData::loadFactories();
     return QContactManagerData::action(descriptor);
 }
+
+#include "moc_qcontactaction.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactaction.h b/src/contacts/qcontactaction.h
index 0e4bbb2ad8..285d725eb8 100644
--- a/src/contacts/qcontactaction.h
+++ b/src/contacts/qcontactaction.h
@@ -51,6 +51,8 @@
 
 #include <QObject>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactActionDescriptor;
 class QContactActionData;
 class Q_CONTACTS_EXPORT QContactAction : public QObject
@@ -96,4 +98,6 @@ signals:
     void progress(QContactAction::Status status, const QVariantMap& result);
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactactiondescriptor.cpp b/src/contacts/qcontactactiondescriptor.cpp
index 42ac4a34ea..19aaa620f3 100644
--- a/src/contacts/qcontactactiondescriptor.cpp
+++ b/src/contacts/qcontactactiondescriptor.cpp
@@ -42,6 +42,8 @@
 #include "qcontactactiondescriptor.h"
 #include "qcontactactiondescriptor_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactActionDescriptor
   \brief The QContactActionDescriptor class contains information that
@@ -163,3 +165,5 @@ bool QContactActionDescriptor::operator!=(const QContactActionDescriptor& other)
 {
     return !(*this == other);
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactactiondescriptor.h b/src/contacts/qcontactactiondescriptor.h
index 2069422cc9..3b72dd28a0 100644
--- a/src/contacts/qcontactactiondescriptor.h
+++ b/src/contacts/qcontactactiondescriptor.h
@@ -47,6 +47,8 @@
 #include <QString>
 #include <QSharedDataPointer>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactActionDescriptorPrivate;
 class Q_CONTACTS_EXPORT QContactActionDescriptor
 {
@@ -72,4 +74,6 @@ private:
     QSharedDataPointer<QContactActionDescriptorPrivate> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactactiondescriptor_p.h b/src/contacts/qcontactactiondescriptor_p.h
index f640cd38e5..6cc8a1a141 100644
--- a/src/contacts/qcontactactiondescriptor_p.h
+++ b/src/contacts/qcontactactiondescriptor_p.h
@@ -56,6 +56,8 @@
 #include <QSharedData>
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactActionDescriptorPrivate : public QSharedData
 {
 public:
@@ -95,4 +97,6 @@ public:
     int m_implementationVersion;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactactionfactory.cpp b/src/contacts/qcontactactionfactory.cpp
index 76ba3f1448..9931fbaf8d 100644
--- a/src/contacts/qcontactactionfactory.cpp
+++ b/src/contacts/qcontactactionfactory.cpp
@@ -41,6 +41,8 @@
 
 #include "qcontactactionfactory.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactActionFactory
   \brief The QContactActionfactory class provides an interface for clients
@@ -85,3 +87,6 @@ uint qHash(const QContactActionDescriptor& ad)
  * Returns the metadata associated with the action identified by the given \a descriptor
  */
 
+#include "moc_qcontactactionfactory.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactactionfactory.h b/src/contacts/qcontactactionfactory.h
index 5b720da801..63a2a9ee7c 100644
--- a/src/contacts/qcontactactionfactory.h
+++ b/src/contacts/qcontactactionfactory.h
@@ -54,6 +54,8 @@
 #include <QStringList>
 #include <QHash>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactAction;
 class Q_CONTACTS_EXPORT QContactActionFactory : public QObject
 {
@@ -69,7 +71,10 @@ public:
 
 uint qHash(const QContactActionDescriptor& ad);
 
+QTM_END_NAMESPACE
+
 #define QT_CONTACTS_ACTION_FACTORY_INTERFACE "com.nokia.qt.mobility.contacts.actionfactory/1.0"
-Q_DECLARE_INTERFACE(QContactActionFactory, QT_CONTACTS_ACTION_FACTORY_INTERFACE);
+Q_DECLARE_INTERFACE(QtMobility::QContactActionFactory, QT_CONTACTS_ACTION_FACTORY_INTERFACE);
+
 
 #endif
diff --git a/src/contacts/qcontactchangeset.cpp b/src/contacts/qcontactchangeset.cpp
index 92ac9df09d..1f23c73510 100644
--- a/src/contacts/qcontactchangeset.cpp
+++ b/src/contacts/qcontactchangeset.cpp
@@ -44,6 +44,8 @@
 #include "qcontactchangeset_p.h"
 #include "qcontactmanagerengine.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactChangeSet
  *
@@ -201,3 +203,5 @@ void QContactChangeSet::emitSignals(QContactManagerEngine *engine)
             emit engine->selfContactIdChanged(d->m_oldAndNewSelfContactId.first, d->m_oldAndNewSelfContactId.second);
     }
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactchangeset.h b/src/contacts/qcontactchangeset.h
index 9966000563..01de942272 100644
--- a/src/contacts/qcontactchangeset.h
+++ b/src/contacts/qcontactchangeset.h
@@ -49,6 +49,8 @@
 #include <QPair>
 #include <QSharedDataPointer>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactManagerEngine;
 class QContactChangeSetData;
 class Q_CONTACTS_EXPORT QContactChangeSet
@@ -78,4 +80,6 @@ private:
     QSharedDataPointer<QContactChangeSetData> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactchangeset_p.h b/src/contacts/qcontactchangeset_p.h
index 473a318060..08ecc79950 100644
--- a/src/contacts/qcontactchangeset_p.h
+++ b/src/contacts/qcontactchangeset_p.h
@@ -59,6 +59,8 @@
 #include <QSet>
 #include <QPair>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactChangeSetData : public QSharedData
 {
 public:
@@ -93,4 +95,6 @@ public:
     QPair<QContactLocalId, QContactLocalId> m_oldAndNewSelfContactId;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactdetail.cpp b/src/contacts/qcontactdetail.cpp
index c01e8396a9..033e639c07 100644
--- a/src/contacts/qcontactdetail.cpp
+++ b/src/contacts/qcontactdetail.cpp
@@ -43,6 +43,8 @@
 #include "qcontactdetail_p.h"
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Definitions of predefined string constants */
 Q_DEFINE_LATIN1_LITERAL(QContactDetail::FieldContext, "Context");
 Q_DEFINE_LATIN1_LITERAL(QContactDetail::ContextOther, "Other");
@@ -331,3 +333,4 @@ QVariantMap QContactDetail::values() const
  * \sa value()
  */
 
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactdetail.h b/src/contacts/qcontactdetail.h
index 4bead12208..9a45798cca 100644
--- a/src/contacts/qcontactdetail.h
+++ b/src/contacts/qcontactdetail.h
@@ -50,6 +50,8 @@
 #include <QStringList>
 #include <QVariant>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailPrivate;
 class Q_CONTACTS_EXPORT QContactDetail
 {
@@ -130,5 +132,6 @@ private:
 #define Q_IMPLEMENT_CUSTOM_CONTACT_DETAIL(className, definitionNameString) \
     Q_DEFINE_LATIN1_LITERAL(className::DefinitionName, definitionNameString)
 
+QTM_END_NAMESPACE
 #endif
 
diff --git a/src/contacts/qcontactdetail_p.h b/src/contacts/qcontactdetail_p.h
index 3e6c4246d3..003fddf34b 100644
--- a/src/contacts/qcontactdetail_p.h
+++ b/src/contacts/qcontactdetail_p.h
@@ -60,6 +60,8 @@
 #include <QMap>
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailPrivate : public QSharedData
 {
 public:
@@ -86,4 +88,6 @@ public:
     QList<QContactActionDescriptor> m_preferredActions;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactdetaildefinition.cpp b/src/contacts/qcontactdetaildefinition.cpp
index 1cfa00ed41..7b44031f86 100644
--- a/src/contacts/qcontactdetaildefinition.cpp
+++ b/src/contacts/qcontactdetaildefinition.cpp
@@ -42,6 +42,8 @@
 #include "qcontactdetaildefinition.h"
 #include "qcontactdetaildefinition_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactDetailDefinition
  *
@@ -180,3 +182,4 @@ void QContactDetailDefinition::setAccessConstraint(const QContactDetailDefinitio
     d->m_constraint = constraint;
 }
 
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactdetaildefinition.h b/src/contacts/qcontactdetaildefinition.h
index 2bbea00f5b..6c20a640f4 100644
--- a/src/contacts/qcontactdetaildefinition.h
+++ b/src/contacts/qcontactdetaildefinition.h
@@ -51,6 +51,8 @@
 #include "qtcontactsglobal.h"
 #include "qcontactdetaildefinitionfield.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailDefinitionData;
 class Q_CONTACTS_EXPORT QContactDetailDefinition
 {
@@ -100,4 +102,6 @@ private:
     QSharedDataPointer<QContactDetailDefinitionData> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactdetaildefinition_p.h b/src/contacts/qcontactdetaildefinition_p.h
index a29ed40f4f..ac32456035 100644
--- a/src/contacts/qcontactdetaildefinition_p.h
+++ b/src/contacts/qcontactdetaildefinition_p.h
@@ -61,6 +61,8 @@
 #include <QString>
 #include <QVariant>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailDefinitionData : public QSharedData
 {
 public:
@@ -87,4 +89,6 @@ public:
     QMap<QString, QContactDetailDefinitionField> m_fields;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactdetaildefinitionfield.cpp b/src/contacts/qcontactdetaildefinitionfield.cpp
index 57f82efb40..20a4bac569 100644
--- a/src/contacts/qcontactdetaildefinitionfield.cpp
+++ b/src/contacts/qcontactdetaildefinitionfield.cpp
@@ -35,6 +35,8 @@
 #include "qcontactdetaildefinitionfield.h"
 #include "qcontactdetaildefinitionfield_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactDetailDefinitionField
  * \brief A field in a QContactDetail.
@@ -156,3 +158,5 @@ bool QContactDetailDefinitionField::operator!=(const QContactDetailDefinitionFie
 {
     return !(*this == other);
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactdetaildefinitionfield.h b/src/contacts/qcontactdetaildefinitionfield.h
index c498dc5b7b..5b87ba1184 100644
--- a/src/contacts/qcontactdetaildefinitionfield.h
+++ b/src/contacts/qcontactdetaildefinitionfield.h
@@ -40,6 +40,8 @@
 
 #include "qtcontactsglobal.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailDefinitionFieldPrivate;
 class Q_CONTACTS_EXPORT QContactDetailDefinitionField
 {
@@ -71,4 +73,6 @@ private:
     QSharedDataPointer<QContactDetailDefinitionFieldPrivate> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactdetaildefinitionfield_p.h b/src/contacts/qcontactdetaildefinitionfield_p.h
index ef7617c23c..18d4a3d30a 100644
--- a/src/contacts/qcontactdetaildefinitionfield_p.h
+++ b/src/contacts/qcontactdetaildefinitionfield_p.h
@@ -54,6 +54,8 @@
 #include <QVariant>
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailDefinitionFieldPrivate : public QSharedData
 {
 public:
@@ -81,4 +83,6 @@ public:
     QContactDetailDefinitionField::AccessConstraint m_accessConstraint;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactfilter.cpp b/src/contacts/qcontactfilter.cpp
index 4d8a0a2a8d..39a07027b1 100644
--- a/src/contacts/qcontactfilter.cpp
+++ b/src/contacts/qcontactfilter.cpp
@@ -47,6 +47,8 @@
 
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactFilter
  * \brief The QContactFilter class is used to select contacts made available through a QContactManager
@@ -197,4 +199,4 @@ const QContactFilter operator|(const QContactFilter& left, const QContactFilter&
     nif << left << right;
     return nif;
 }
-
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactfilter.h b/src/contacts/qcontactfilter.h
index cdb1395cd9..550ef3bf0a 100644
--- a/src/contacts/qcontactfilter.h
+++ b/src/contacts/qcontactfilter.h
@@ -49,6 +49,8 @@
 
 #include "qtcontactsglobal.h"
 
+QTM_BEGIN_NAMESPACE
+
 /* Manual Q_DECLARE_CONTACTFILTER_PRIVATE macro */
 
 #define Q_DECLARE_CONTACTFILTER_PRIVATE(Class) \
@@ -106,4 +108,6 @@ protected:
 const Q_CONTACTS_EXPORT QContactFilter operator&(const QContactFilter& left, const QContactFilter& right);
 const Q_CONTACTS_EXPORT QContactFilter operator|(const QContactFilter& left, const QContactFilter& right);
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactfilter_p.h b/src/contacts/qcontactfilter_p.h
index 59965a7d0d..6a65f3aaa7 100644
--- a/src/contacts/qcontactfilter_p.h
+++ b/src/contacts/qcontactfilter_p.h
@@ -56,6 +56,7 @@
 #include "qcontactfilter.h"
 #include <QSharedData>
 
+
 /* Boiler plate code */
 #define Q_IMPLEMENT_CONTACTFILTER_PRIVATE(Class) \
     Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \
@@ -73,6 +74,7 @@
             d_ptr = new Class##Private; \
     }
 
+QTM_BEGIN_NAMESPACE
 class QContactFilterPrivate : public QSharedData
 {
 public:
@@ -91,17 +93,19 @@ public:
     /* Helper functions for C++ protection rules */
     static const QSharedDataPointer<QContactFilterPrivate>& extract_d(const QContactFilter& other) {return other.d_ptr;}
 };
+QTM_END_NAMESPACE
 
 #if defined(Q_CC_MWERKS)
 // This results in multiple symbol definition errors on all other compilers
 // but not having a definition here results in an attempt to use the unspecialized
 // clone (which fails because of the pure virtuals above)
-template<> QContactFilterPrivate *QSharedDataPointer<QContactFilterPrivate>::clone()
+template<> QTM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone()
 {
     return d->clone();
 }
 #else
-template<> QContactFilterPrivate *QSharedDataPointer<QContactFilterPrivate>::clone();
+template<> QTM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone();
 #endif
 
+
 #endif
diff --git a/src/contacts/qcontactgroup.cpp b/src/contacts/qcontactgroup.cpp
index dd5923a821..a02cfbe893 100644
--- a/src/contacts/qcontactgroup.cpp
+++ b/src/contacts/qcontactgroup.cpp
@@ -42,6 +42,8 @@
 #include "qcontactgroup.h"
 #include "qcontactgroup_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*! \class QContactGroup
     \brief The QContactGroup class acts as a container for a list of contacts.
     \ingroup contacts-main
@@ -209,3 +211,5 @@ void QContactGroup::setMembers(const QList<QUniqueId>& members)
 //    d->m_error = QContactGroup::NoError;
 //    return true;
 //}
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactid.cpp b/src/contacts/qcontactid.cpp
index 88acbfb863..0275b2e1d6 100644
--- a/src/contacts/qcontactid.cpp
+++ b/src/contacts/qcontactid.cpp
@@ -42,6 +42,8 @@
 #include "qcontactid.h"
 #include "qcontactid_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactId
  * \brief A QContactId uniquely identifies a contact in a particular manager.
@@ -125,3 +127,5 @@ void QContactId::setLocalId(const QContactLocalId& id)
 {
     d->m_localId = id;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactid.h b/src/contacts/qcontactid.h
index 3f99647233..2f0e9bfa19 100644
--- a/src/contacts/qcontactid.h
+++ b/src/contacts/qcontactid.h
@@ -47,6 +47,8 @@
 
 #include "qtcontactsglobal.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactIdPrivate;
 class Q_CONTACTS_EXPORT QContactId
 {
@@ -70,5 +72,7 @@ private:
     QSharedDataPointer<QContactIdPrivate> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/qcontactid_p.h b/src/contacts/qcontactid_p.h
index b76f1eedad..b6a56c1c2c 100644
--- a/src/contacts/qcontactid_p.h
+++ b/src/contacts/qcontactid_p.h
@@ -58,6 +58,8 @@
 
 #include "qtcontactsglobal.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactIdPrivate : public QSharedData
 {
 public:
@@ -82,4 +84,6 @@ public:
     QContactLocalId m_localId;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactmanager.cpp b/src/contacts/qcontactmanager.cpp
index 0b84f7907c..73136df7f2 100644
--- a/src/contacts/qcontactmanager.cpp
+++ b/src/contacts/qcontactmanager.cpp
@@ -50,6 +50,7 @@
 #include <QPair>
 #include <QSet>
 
+QTM_BEGIN_NAMESPACE
 /*!
  * \class QContactManager
  *
@@ -680,3 +681,7 @@ QString QContactManager::managerUri() const
 {
     return d->m_engine->managerUri();
 }
+
+#include "moc_qcontactmanager.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactmanager.h b/src/contacts/qcontactmanager.h
index 8b35f68cea..d889d8c8f5 100644
--- a/src/contacts/qcontactmanager.h
+++ b/src/contacts/qcontactmanager.h
@@ -57,6 +57,8 @@
 #include "qcontactrelationship.h"
 #include "qcontactsortorder.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactFilter;
 class QContactAction;
 
@@ -180,4 +182,6 @@ private:
     QContactManagerData* d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp
index 764ae20dc0..88dd400b98 100644
--- a/src/contacts/qcontactmanager_p.cpp
+++ b/src/contacts/qcontactmanager_p.cpp
@@ -63,6 +63,7 @@
 #include "qcontactmemorybackend_p.h"
 #include "qcontactinvalidbackend_p.h"
 
+QTM_BEGIN_NAMESPACE
 
 /* Shared QContactManager stuff here, default engine stuff below */
 QList<QContactActionFactory*> QContactManagerData::m_actionfactories; // list of all factories
@@ -367,5 +368,5 @@ QContactManagerEngine* QContactManagerData::engine(const QContactManager* manage
     return 0;
 }
 
-
+QTM_END_NAMESPACE
 
diff --git a/src/contacts/qcontactmanager_p.h b/src/contacts/qcontactmanager_p.h
index bf47511f92..804e47d052 100644
--- a/src/contacts/qcontactmanager_p.h
+++ b/src/contacts/qcontactmanager_p.h
@@ -65,6 +65,8 @@
 #include "qcontactactiondescriptor.h"
 #include "qcontactactionfactory.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactManagerEngineFactory;
 
 /* Data and stuff that is shared amongst all backends */
@@ -156,4 +158,6 @@ private:
     QMap<QString, QList<QContact> > savedContacts;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp
index 1166927053..77df2b7e72 100644
--- a/src/contacts/qcontactmanagerengine.cpp
+++ b/src/contacts/qcontactmanagerengine.cpp
@@ -55,6 +55,8 @@
 
 #include "qcontact_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactManagerEngine
  * \preliminary
@@ -2090,3 +2092,7 @@ void QContactManagerEngine::updateRequest(QContactAbstractRequest* req, const QL
         emit r->progress(r, appendOnly);
     }
 }
+
+#include "moc_qcontactmanagerengine.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactmanagerengine.h b/src/contacts/qcontactmanagerengine.h
index de13b806fa..053b08fe1c 100644
--- a/src/contacts/qcontactmanagerengine.h
+++ b/src/contacts/qcontactmanagerengine.h
@@ -56,6 +56,8 @@
 #include "qcontactmanager.h"
 #include "qcontactabstractrequest.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactFilter;
 class QContactSortOrder;
 
@@ -162,4 +164,6 @@ private:
     friend class QContactChangeSet;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactmanagerenginefactory.h b/src/contacts/qcontactmanagerenginefactory.h
index 84019085e3..74844ed56f 100644
--- a/src/contacts/qcontactmanagerenginefactory.h
+++ b/src/contacts/qcontactmanagerenginefactory.h
@@ -49,6 +49,7 @@
 
 #include "qcontactmanager.h"
 
+QTM_BEGIN_NAMESPACE
 /* Backend plugin API interface, creates engines for us */
 class QContactManagerEngine;
 class Q_CONTACTS_EXPORT QContactManagerEngineFactory
@@ -68,7 +69,9 @@ public:
     virtual QContactManagerEngine* engine(const QMap<QString, QString>& parameters, QContactManager::Error& error) = 0;
     virtual QString managerName() const = 0;
 };
+QTM_END_NAMESPACE
+
 #define QT_CONTACTS_BACKEND_INTERFACE "com.nokia.qt.mobility.contacts.enginefactory/1.0"
-Q_DECLARE_INTERFACE(QContactManagerEngineFactory, QT_CONTACTS_BACKEND_INTERFACE);
+Q_DECLARE_INTERFACE(QTM_PREPEND_NAMESPACE(QContactManagerEngineFactory), QT_CONTACTS_BACKEND_INTERFACE);
 
 #endif
diff --git a/src/contacts/qcontactmanagerinfo.cpp b/src/contacts/qcontactmanagerinfo.cpp
index 6eeff6b79b..d1af6b2961 100644
--- a/src/contacts/qcontactmanagerinfo.cpp
+++ b/src/contacts/qcontactmanagerinfo.cpp
@@ -44,6 +44,8 @@
 #include "qcontactmanager_p.h"
 #include "qcontactfilter.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \deprecated
  * \class QContactManagerInfo
@@ -139,3 +141,5 @@ QStringList QContactManagerInfo::supportedRelationshipTypes(const QString& conta
     qWarning("This class is deprecated!  Please use QContactManager for reporting instead!  See commit SHA1: 948704fe9b83ef164f0c816897f67ef34654e510");
     return d->m_engine->supportedRelationshipTypes(contactType);
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactmanagerinfo.h b/src/contacts/qcontactmanagerinfo.h
index 356a2cbd6c..31d3b7fa4e 100644
--- a/src/contacts/qcontactmanagerinfo.h
+++ b/src/contacts/qcontactmanagerinfo.h
@@ -50,6 +50,8 @@
 #include "qtcontactsglobal.h"
 #include "qcontactdetails.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactFilter;
 
 class QContactManagerData;
@@ -88,4 +90,6 @@ private:
     QContactManagerData * d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactrelationship.cpp b/src/contacts/qcontactrelationship.cpp
index 589c3b1b73..24c88244dc 100644
--- a/src/contacts/qcontactrelationship.cpp
+++ b/src/contacts/qcontactrelationship.cpp
@@ -48,6 +48,8 @@
 #include <QPair>
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactRelationship
  * \brief Describes a one-to-one relationship between a locally-stored contact and another (possibly remote) contact.
@@ -207,3 +209,5 @@ void QContactRelationship::setRelationshipType(const QString& relationshipType)
 {
     d->m_relationshipType = relationshipType;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactrelationship.h b/src/contacts/qcontactrelationship.h
index f5131c7fe6..94f6065969 100644
--- a/src/contacts/qcontactrelationship.h
+++ b/src/contacts/qcontactrelationship.h
@@ -51,6 +51,8 @@
 #include "qtcontactsglobal.h"
 #include "qcontactid.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRelationshipPrivate;
 
 class Q_CONTACTS_EXPORT QContactRelationship
@@ -92,5 +94,7 @@ private:
     QSharedDataPointer<QContactRelationshipPrivate> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/qcontactrelationship_p.h b/src/contacts/qcontactrelationship_p.h
index f550efbe86..57d4136429 100644
--- a/src/contacts/qcontactrelationship_p.h
+++ b/src/contacts/qcontactrelationship_p.h
@@ -61,6 +61,8 @@
 #include "qtcontactsglobal.h"
 #include "qcontactid.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRelationshipPrivate : public QSharedData
 {
 public:
@@ -86,4 +88,6 @@ public:
     QString m_relationshipType;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactrequestworker.cpp b/src/contacts/qcontactrequestworker.cpp
index fbb17bd10e..ff75435a29 100644
--- a/src/contacts/qcontactrequestworker.cpp
+++ b/src/contacts/qcontactrequestworker.cpp
@@ -46,6 +46,8 @@
 #include "qcontactmanagerengine.h"
 #include "qcontactrequestworker_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactRequestWorker
  *
@@ -658,3 +660,7 @@ void QContactRequestWorkerData::cleanUpFinishedRequests(bool waitForAll)
         }
     }
 }
+
+#include "moc_qcontactrequestworker.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactrequestworker.h b/src/contacts/qcontactrequestworker.h
index c632988b18..568178e90b 100644
--- a/src/contacts/qcontactrequestworker.h
+++ b/src/contacts/qcontactrequestworker.h
@@ -48,6 +48,8 @@
 
 #include "qtcontactsglobal.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRequestWorkerData;
 class QContactAbstractRequest;
 class QContactFetchRequest;
@@ -105,5 +107,8 @@ protected:
 private:
     QSharedDataPointer<QContactRequestWorkerData> d;
 };
+
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/qcontactrequestworker_p.h b/src/contacts/qcontactrequestworker_p.h
index c849a94c83..c3a2db5ec0 100644
--- a/src/contacts/qcontactrequestworker_p.h
+++ b/src/contacts/qcontactrequestworker_p.h
@@ -61,6 +61,8 @@
 
 #include "qcontactrequestworker.h"
 
+QTM_BEGIN_NAMESPACE
+
 class QContactAbstractRequest;
 
 struct QContactRequestElement
@@ -100,5 +102,8 @@ public:
     QQueue<QContactRequestElement*> m_requestQueue; 
     QList<QContactRequestElement*> m_removedRequests; 
 };
+
+QTM_END_NAMESPACE
+
 #endif
 
diff --git a/src/contacts/qcontactsortorder.cpp b/src/contacts/qcontactsortorder.cpp
index 7c01e500ab..05834a83a2 100644
--- a/src/contacts/qcontactsortorder.cpp
+++ b/src/contacts/qcontactsortorder.cpp
@@ -42,6 +42,8 @@
 #include "qcontactsortorder.h"
 #include "qcontactsortorder_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactSortOrder
   \brief The QContactSortOrder class defines how a list of contacts should be ordered according to some criteria
@@ -215,3 +217,5 @@ void QContactSortOrder::setCaseSensitivity(Qt::CaseSensitivity sensitivity)
 {
     d->m_sensitivity = sensitivity;
 }
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/qcontactsortorder.h b/src/contacts/qcontactsortorder.h
index 09e9e2bf12..571175ae5d 100644
--- a/src/contacts/qcontactsortorder.h
+++ b/src/contacts/qcontactsortorder.h
@@ -48,6 +48,8 @@
 #include <QSharedData>
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactSortOrderPrivate;
 class Q_CONTACTS_EXPORT QContactSortOrder
 {
@@ -88,4 +90,6 @@ private:
     QSharedDataPointer<QContactSortOrderPrivate> d;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qcontactsortorder_p.h b/src/contacts/qcontactsortorder_p.h
index aed0bebcee..80a51762bc 100644
--- a/src/contacts/qcontactsortorder_p.h
+++ b/src/contacts/qcontactsortorder_p.h
@@ -57,6 +57,8 @@
 
 #include <QSharedData>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactSortOrderPrivate : public QSharedData
 {
 public:
@@ -79,4 +81,6 @@ public:
     QString m_fieldName;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/qtcontactsglobal.h b/src/contacts/qtcontactsglobal.h
index ea70e3b928..510036ca44 100644
--- a/src/contacts/qtcontactsglobal.h
+++ b/src/contacts/qtcontactsglobal.h
@@ -49,6 +49,8 @@
 #define QTCONTACTS_IMPLEMENTATION_VERSION_NAME "com.nokia.qt.mobility.contacts.implementation.version" 
 #define QTCONTACTS_VERSION 1 
 
+QTM_BEGIN_NAMESPACE
+
 typedef quint32 QContactLocalId; // XXX Put this else where
 
 /*
@@ -119,4 +121,6 @@ template<int N> bool operator!=(const QString& b, const Latin1Literal<N>& a)
 #define Q_DECLARE_LATIN1_LITERAL(varname, str) static const Latin1Literal<sizeof(str)> varname
 #define Q_DEFINE_LATIN1_LITERAL(varname, str) const Latin1Literal<sizeof(str)> varname = {str}
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp
index 013c58f7f8..b0f0797f05 100644
--- a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp
+++ b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactdetaildefinitionfetchrequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactDetailDefinitionFetchRequest
  * \brief Allows a client to asynchronously request detail definitions from a contacts store manager
@@ -100,3 +102,7 @@ QMap<QString, QContactDetailDefinition> QContactDetailDefinitionFetchRequest::de
     Q_D(const QContactDetailDefinitionFetchRequest);
     return d->m_definitions;
 }
+
+#include "moc_qcontactdetaildefinitionfetchrequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h
index 7ac08d0989..731441749e 100644
--- a/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h
+++ b/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h
@@ -49,6 +49,8 @@
 #include <QList>
 #include <QStringList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailDefinitionFetchRequestPrivate;
 class Q_CONTACTS_EXPORT QContactDetailDefinitionFetchRequest : public QContactAbstractRequest
 {
@@ -76,4 +78,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactDetailDefinitionFetchRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp b/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp
index 15f6d51218..aa058c1e3d 100644
--- a/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp
+++ b/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactdetaildefinitionremoverequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactDetailDefinitionRemoveRequest
  * \brief Allows a client to asynchronously request that certain detail definitions be removed from a contacts store
@@ -92,3 +94,7 @@ QString QContactDetailDefinitionRemoveRequest::contactType() const
     Q_D(const QContactDetailDefinitionRemoveRequest);
     return d->m_contactType;
 }
+
+#include "moc_qcontactdetaildefinitionremoverequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactdetaildefinitionremoverequest.h b/src/contacts/requests/qcontactdetaildefinitionremoverequest.h
index 21995484e6..4bbc4b5cee 100644
--- a/src/contacts/requests/qcontactdetaildefinitionremoverequest.h
+++ b/src/contacts/requests/qcontactdetaildefinitionremoverequest.h
@@ -47,6 +47,8 @@
 
 #include <QStringList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailDefinitionRemoveRequestPrivate;
 class Q_CONTACTS_EXPORT QContactDetailDefinitionRemoveRequest : public QContactAbstractRequest
 {
@@ -71,4 +73,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactDetailDefinitionRemoveRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp b/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp
index 1686ddb9cf..848f572f97 100644
--- a/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp
+++ b/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactdetaildefinitionsaverequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactDetailDefinitionSaveRequest
  * \brief Allows a client to asynchronously request that certain detail definitions be saved in a contacts store
@@ -93,3 +95,7 @@ QString QContactDetailDefinitionSaveRequest::contactType() const
     Q_D(const QContactDetailDefinitionSaveRequest);
     return d->m_contactType;
 }
+
+#include "moc_qcontactdetaildefinitionsaverequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactdetaildefinitionsaverequest.h b/src/contacts/requests/qcontactdetaildefinitionsaverequest.h
index 152ba7c105..1fcecfda31 100644
--- a/src/contacts/requests/qcontactdetaildefinitionsaverequest.h
+++ b/src/contacts/requests/qcontactdetaildefinitionsaverequest.h
@@ -49,6 +49,8 @@
 #include <QList>
 #include <QStringList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactDetailDefinitionSaveRequestPrivate;
 class Q_CONTACTS_EXPORT QContactDetailDefinitionSaveRequest : public QContactAbstractRequest
 {
@@ -75,4 +77,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactDetailDefinitionSaveRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactfetchrequest.cpp b/src/contacts/requests/qcontactfetchrequest.cpp
index c351bbf638..5135e79a4f 100644
--- a/src/contacts/requests/qcontactfetchrequest.cpp
+++ b/src/contacts/requests/qcontactfetchrequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactfetchrequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactFetchRequest
   \brief The QContactFetchRequest class allows a client to asynchronously
@@ -118,3 +120,7 @@ QList<QContact> QContactFetchRequest::contacts() const
     Q_D(const QContactFetchRequest);
     return d->m_contacts;
 }
+
+#include "moc_qcontactfetchrequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactfetchrequest.h b/src/contacts/requests/qcontactfetchrequest.h
index f85d433cfe..e3e1398337 100644
--- a/src/contacts/requests/qcontactfetchrequest.h
+++ b/src/contacts/requests/qcontactfetchrequest.h
@@ -51,6 +51,8 @@
 #include <QList>
 #include <QStringList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactFetchRequestPrivate;
 class Q_CONTACTS_EXPORT QContactFetchRequest : public QContactAbstractRequest
 {
@@ -80,4 +82,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactFetchRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactgroupfetchrequest.cpp b/src/contacts/requests/qcontactgroupfetchrequest.cpp
deleted file mode 100644
index c2e742d17f..0000000000
--- a/src/contacts/requests/qcontactgroupfetchrequest.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qcontactgroupfetchrequest.h"
-#include "qcontactrequests_p.h"
-
-/*!
-  \class QContactGroupFetchRequest
-  \brief The QContactGroupFetchRequest class allows a client to asynchronously
-    request groups from a contacts store manager.
-   \ingroup contacts-requests
- */
-
-/*!
- * \fn QContactGroupFetchRequest::progress(QContactGroupFetchRequest* self, bool appendOnly)
- * This signal is emitted when some progress has been made on the request, causing either a change of
- * status or an update of results, or both.  It identifies which request the signal originated from
- * by including a pointer to \a self, and contains an \a appendOnly flag which signifies whether or not the total
- * ordering of the results have been maintained since the last progress signal was emitted.
- */
-
-/*! Constructs a new group fetch request */
-QContactGroupFetchRequest::QContactGroupFetchRequest()
-    : QContactAbstractRequest(new QContactGroupFetchRequestPrivate)
-{
-}
-
-/*! Cleans up the memory used by this group fetch request */
-QContactGroupFetchRequest::~QContactGroupFetchRequest()
-{
-}
-
-/*! Sets the list of ids of the groups which will be retrieved to \a ids */
-void QContactGroupFetchRequest::setIds(const QList<QUniqueId>& ids)
-{
-    Q_D(QContactGroupFetchRequest);
-    d->m_ids = ids;
-}
-
-/*! Returns the list of ids of the groups which will be retrieved */
-QList<QUniqueId> QContactGroupFetchRequest::ids() const
-{
-    Q_D(const QContactGroupFetchRequest);
-    return d->m_ids;
-}
-
-/*! Returns the list of groups which were retrieved by this request */
-QList<QContactGroup> QContactGroupFetchRequest::groups() const
-{
-    Q_D(const QContactGroupFetchRequest);
-    return d->m_groups;
-}
diff --git a/src/contacts/requests/qcontactlocalidfetchrequest.cpp b/src/contacts/requests/qcontactlocalidfetchrequest.cpp
index 7d6d170ff9..bc05f85b9d 100644
--- a/src/contacts/requests/qcontactlocalidfetchrequest.cpp
+++ b/src/contacts/requests/qcontactlocalidfetchrequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactlocalidfetchrequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactIdFetchRequest
   \brief The QContactIdFetchRequest class allows a client to asynchronously
@@ -103,3 +105,7 @@ QList<QContactLocalId> QContactLocalIdFetchRequest::ids() const
     Q_D(const QContactLocalIdFetchRequest);
     return d->m_ids;
 }
+
+#include "moc_qcontactlocalidfetchrequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactlocalidfetchrequest.h b/src/contacts/requests/qcontactlocalidfetchrequest.h
index 6ceb67c69b..4a04cae9fc 100644
--- a/src/contacts/requests/qcontactlocalidfetchrequest.h
+++ b/src/contacts/requests/qcontactlocalidfetchrequest.h
@@ -50,6 +50,8 @@
 #include <QList>
 #include <QStringList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactLocalIdFetchRequestPrivate;
 class Q_CONTACTS_EXPORT QContactLocalIdFetchRequest : public QContactAbstractRequest
 {
@@ -77,4 +79,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactLocalIdFetchRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
index 22413e113c..bc1d6306a9 100644
--- a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
@@ -44,6 +44,8 @@
 #include "qcontactrelationshipfilter.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactRelationshipFetchRequest
  * \brief Allows a client to asynchronously request relationships from a contacts store manager
@@ -141,3 +143,7 @@ QList<QContactRelationship> QContactRelationshipFetchRequest::relationships() co
     Q_D(const QContactRelationshipFetchRequest);
     return d->m_relationships;
 }
+
+#include "moc_qcontactrelationshipfetchrequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactrelationshipfetchrequest.h b/src/contacts/requests/qcontactrelationshipfetchrequest.h
index c2f8d347d0..30b4aa0998 100644
--- a/src/contacts/requests/qcontactrelationshipfetchrequest.h
+++ b/src/contacts/requests/qcontactrelationshipfetchrequest.h
@@ -51,6 +51,8 @@
 #include <QPair>
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRelationshipFetchRequestPrivate;
 class Q_CONTACTS_EXPORT QContactRelationshipFetchRequest : public QContactAbstractRequest
 {
@@ -83,4 +85,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactRelationshipFetchRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.cpp b/src/contacts/requests/qcontactrelationshipremoverequest.cpp
index c43a02dafb..d7815583dd 100644
--- a/src/contacts/requests/qcontactrelationshipremoverequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipremoverequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactrelationshipremoverequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
  * \class QContactRelationshipRemoveRequest
  * \brief Allows a client to asynchronously request that certain relationships be removed from a contacts store
@@ -112,3 +114,7 @@ QContactId QContactRelationshipRemoveRequest::second() const
     Q_D(const QContactRelationshipRemoveRequest);
     return d->m_second;
 }
+
+#include "moc_qcontactrelationshipremoverequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.h b/src/contacts/requests/qcontactrelationshipremoverequest.h
index b0d57aa849..5a7cceae27 100644
--- a/src/contacts/requests/qcontactrelationshipremoverequest.h
+++ b/src/contacts/requests/qcontactrelationshipremoverequest.h
@@ -47,6 +47,8 @@
 
 #include <QString>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRelationshipRemoveRequestPrivate;
 class Q_CONTACTS_EXPORT QContactRelationshipRemoveRequest : public QContactAbstractRequest
 {
@@ -75,4 +77,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactRelationshipRemoveRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactrelationshipsaverequest.cpp b/src/contacts/requests/qcontactrelationshipsaverequest.cpp
index c7046bf707..cd7551c2a9 100644
--- a/src/contacts/requests/qcontactrelationshipsaverequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipsaverequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactrelationshipsaverequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactGroupSaveRequest
   \brief The QContactGroupSaveRequest class allows a client to asynchronously
@@ -81,3 +83,7 @@ QList<QContactRelationship> QContactRelationshipSaveRequest::relationships() con
     Q_D(const QContactRelationshipSaveRequest);
     return d->m_relationships;
 }
+
+#include "moc_qcontactrelationshipsaverequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactrelationshipsaverequest.h b/src/contacts/requests/qcontactrelationshipsaverequest.h
index 3db7be2d52..71416bea01 100644
--- a/src/contacts/requests/qcontactrelationshipsaverequest.h
+++ b/src/contacts/requests/qcontactrelationshipsaverequest.h
@@ -49,6 +49,8 @@
 #include <QList>
 #include <QStringList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRelationshipSaveRequestPrivate;
 class Q_CONTACTS_EXPORT QContactRelationshipSaveRequest : public QContactAbstractRequest
 {
@@ -73,4 +75,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactRelationshipSaveRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactremoverequest.cpp b/src/contacts/requests/qcontactremoverequest.cpp
index b11c0b4451..abf02971e1 100644
--- a/src/contacts/requests/qcontactremoverequest.cpp
+++ b/src/contacts/requests/qcontactremoverequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactremoverequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactRemoveRequest
   \brief The QContactRemoveRequest class allows a client to asynchronously
@@ -80,3 +82,7 @@ QContactFilter QContactRemoveRequest::filter() const
     Q_D(const QContactRemoveRequest);
     return d->m_filter;
 }
+
+#include "moc_qcontactremoverequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactremoverequest.h b/src/contacts/requests/qcontactremoverequest.h
index 329200ac43..2c16f632ca 100644
--- a/src/contacts/requests/qcontactremoverequest.h
+++ b/src/contacts/requests/qcontactremoverequest.h
@@ -48,6 +48,8 @@
 
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactRemoveRequestPrivate;
 class Q_CONTACTS_EXPORT QContactRemoveRequest : public QContactAbstractRequest
 {
@@ -70,4 +72,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactRemoveRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactrequests_p.h b/src/contacts/requests/qcontactrequests_p.h
index 2d7f2ffe8e..64e6f9ea0a 100644
--- a/src/contacts/requests/qcontactrequests_p.h
+++ b/src/contacts/requests/qcontactrequests_p.h
@@ -63,6 +63,8 @@
 #include <QStringList>
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactSaveRequestPrivate : public QContactAbstractRequestPrivate
 {
 public:
@@ -281,4 +283,6 @@ public:
     QString m_relationshipType;
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/contacts/requests/qcontactsaverequest.cpp b/src/contacts/requests/qcontactsaverequest.cpp
index d218f7786f..22510a16db 100644
--- a/src/contacts/requests/qcontactsaverequest.cpp
+++ b/src/contacts/requests/qcontactsaverequest.cpp
@@ -42,6 +42,8 @@
 #include "qcontactsaverequest.h"
 #include "qcontactrequests_p.h"
 
+QTM_BEGIN_NAMESPACE
+
 /*!
   \class QContactSaveRequest
   \brief The QContactSaveRequest class allows a client to asynchronously
@@ -81,3 +83,7 @@ QList<QContact> QContactSaveRequest::contacts() const
     Q_D(const QContactSaveRequest);
     return d->m_contacts;
 }
+
+#include "moc_qcontactsaverequest.cpp"
+
+QTM_END_NAMESPACE
diff --git a/src/contacts/requests/qcontactsaverequest.h b/src/contacts/requests/qcontactsaverequest.h
index b19d45153a..4232c4dbc2 100644
--- a/src/contacts/requests/qcontactsaverequest.h
+++ b/src/contacts/requests/qcontactsaverequest.h
@@ -48,6 +48,8 @@
 
 #include <QList>
 
+QTM_BEGIN_NAMESPACE
+
 class QContactSaveRequestPrivate;
 class Q_CONTACTS_EXPORT QContactSaveRequest : public QContactAbstractRequest
 {
@@ -72,4 +74,6 @@ private:
     Q_DECLARE_PRIVATE_D(d_ptr, QContactSaveRequest)
 };
 
+QTM_END_NAMESPACE
+
 #endif
diff --git a/src/global/qmobilityglobal.h b/src/global/qmobilityglobal.h
index 69b1a0e342..3ebe2063e5 100644
--- a/src/global/qmobilityglobal.h
+++ b/src/global/qmobilityglobal.h
@@ -134,4 +134,19 @@
 #    endif
 #  endif
 #endif
+
+#define QTM_NAMESPACE QtMobility
+
+#ifdef QTM_NAMESPACE
+# define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name
+# define QTM_BEGIN_NAMESPACE namespace QTM_NAMESPACE {
+# define QTM_END_NAMESPACE }
+# define QTM_USE_NAMESPACE using namespace QTM_NAMESPACE;
+#else
+# define QTM_PREPEND_NAMESPACE(name) ::name
+# define QTM_BEGIN_NAMESPACE
+# define QTM_END_NAMESPACE
+# define QTM_USE_NAMESPACE
+#endif
+
 #endif // QMOBILITYGLOBAL_H
diff --git a/src/location/notificationcallback_s60_p.h b/src/location/notificationcallback_s60_p.h
index 231775a201..5fcbbb9af0 100644
--- a/src/location/notificationcallback_s60_p.h
+++ b/src/location/notificationcallback_s60_p.h
@@ -43,10 +43,12 @@
 #ifndef NOTIFICATIONCALLBACK_H
 #define NOTIFICATIONCALLBACK_H
 
+#include <qmobilityglobal.h>
 #include <e32base.h>    // For CActive, link against: euser.lib
 #include <lbs.h>
 #include <lbscommon.h>
 
+QTM_BEGIN_NAMESPACE
 
 class INotificationCallback
 {
@@ -56,4 +58,7 @@ public:
 
     virtual void updatePosition(HPositionGenericInfo  *mPosInfo, int error) = 0 ;
 };
+
+QTM_END_NAMESPACE
+
 #endif // NOTIFICATIONCALLBACK_H
diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h
index 6161d7163d..61f5800b13 100644
--- a/src/location/qgeoareamonitor.h
+++ b/src/location/qgeoareamonitor.h
@@ -51,7 +51,7 @@ class QGeoAreaMonitorPrivate;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoAreaMonitor : public QObject
 {
@@ -80,7 +80,7 @@ private:
     QGeoAreaMonitorPrivate *d;
 }; 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h
index d05a6df3bf..45f848bce0 100644
--- a/src/location/qgeocoordinate.h
+++ b/src/location/qgeocoordinate.h
@@ -51,7 +51,7 @@ class QGeoCoordinatePrivate;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoCoordinate
 {
@@ -112,7 +112,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordin
 Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate);
 #endif
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h
index 518b715d15..3ffd381231 100644
--- a/src/location/qgeopositioninfo.h
+++ b/src/location/qgeopositioninfo.h
@@ -52,7 +52,7 @@ class QGeoPositionInfoPrivate;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoPositionInfo
 {
@@ -110,7 +110,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositio
 Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &update);
 #endif
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h
index e5c26d4cd5..e88c95bab5 100644
--- a/src/location/qgeopositioninfosource.h
+++ b/src/location/qgeopositioninfosource.h
@@ -50,7 +50,7 @@ class QGeoPositionInfoSourcePrivate;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 
 class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject
@@ -100,7 +100,7 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoPositionInfoSource::PositioningMethods)
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h
index 818a467cf5..ec6e2b13d4 100644
--- a/src/location/qgeosatelliteinfo.h
+++ b/src/location/qgeosatelliteinfo.h
@@ -48,7 +48,7 @@ class QGeoSatelliteInfoPrivate;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoSatelliteInfo
 {
@@ -90,7 +90,7 @@ private:
 Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info);
 #endif
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h
index 9950fdeaed..1a4c1cc55e 100644
--- a/src/location/qgeosatelliteinfosource.h
+++ b/src/location/qgeosatelliteinfosource.h
@@ -51,7 +51,7 @@ class QGeoSatelliteInfoSourcePrivate;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject
 {
@@ -77,7 +77,7 @@ private:
     QGeoSatelliteInfoSourcePrivate *d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h
index a945f9410b..c2ccb99916 100644
--- a/src/location/qnmeapositioninfosource.h
+++ b/src/location/qnmeapositioninfosource.h
@@ -49,7 +49,7 @@ class QIODevice;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource
 {
@@ -85,7 +85,7 @@ private:
     QNmeaPositionInfoSourcePrivate *d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h
index 9c72e99390..be4a6ce8d8 100644
--- a/src/location/qnmeapositioninfosource_p.h
+++ b/src/location/qnmeapositioninfosource_p.h
@@ -66,7 +66,7 @@ class QTimer;
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 struct QPendingGeoPositionInfo
 {
@@ -167,7 +167,7 @@ private:
 };
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/publishsubscribe/contextkitlayer.cpp b/src/publishsubscribe/contextkitlayer.cpp
index 66d115f033..8928de5fee 100644
--- a/src/publishsubscribe/contextkitlayer.cpp
+++ b/src/publishsubscribe/contextkitlayer.cpp
@@ -47,7 +47,7 @@
 #include <contextproperty.h>
 #include <contextregistryinfo.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 using namespace QValueSpace;
 
@@ -346,6 +346,6 @@ QSet<QString> ContextKitLayer::children (Handle handle)
     return h->children ();
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #include "contextkitlayer.moc"
diff --git a/src/publishsubscribe/qcontextglobal.h b/src/publishsubscribe/qcontextglobal.h
index 2daf347ff6..4979b31d92 100644
--- a/src/publishsubscribe/qcontextglobal.h
+++ b/src/publishsubscribe/qcontextglobal.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 #  if defined(QT_NODLL)
@@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE
 #  endif
 #endif
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/publishsubscribe/qmallocpool.cpp b/src/publishsubscribe/qmallocpool.cpp
index dd514fc647..4e75ec70ee 100644
--- a/src/publishsubscribe/qmallocpool.cpp
+++ b/src/publishsubscribe/qmallocpool.cpp
@@ -42,7 +42,7 @@
 #include "qmallocpool_p.h"
 #include <qglobal.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 static void* qmallocpool_sbrk(intptr_t increment);
 
@@ -322,4 +322,4 @@ QMallocPool::MemoryStats QMallocPool::memoryStatistics() const
     return rv;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/publishsubscribe/qmallocpool_p.h b/src/publishsubscribe/qmallocpool_p.h
index 72dcea994e..799354db33 100644
--- a/src/publishsubscribe/qmallocpool_p.h
+++ b/src/publishsubscribe/qmallocpool_p.h
@@ -45,7 +45,7 @@
 #include <cstdlib>
 #include <QString>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QMallocPoolPrivate;
 
@@ -80,6 +80,6 @@ private:
     QMallocPoolPrivate * d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
diff --git a/src/publishsubscribe/qpacketprotocol.cpp b/src/publishsubscribe/qpacketprotocol.cpp
index 1b03dcbf40..5a5aa2401c 100644
--- a/src/publishsubscribe/qpacketprotocol.cpp
+++ b/src/publishsubscribe/qpacketprotocol.cpp
@@ -42,7 +42,7 @@
 #include "qpacketprotocol_p.h"
 #include <QBuffer>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #define MAX_PACKET_SIZE 0x7FFFFFFF
 
@@ -481,6 +481,6 @@ QPacketAutoSend::~QPacketAutoSend()
         p->send(*this);
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #include "qpacketprotocol.moc"
diff --git a/src/publishsubscribe/qpacketprotocol_p.h b/src/publishsubscribe/qpacketprotocol_p.h
index 7176e80f33..448577dc7c 100644
--- a/src/publishsubscribe/qpacketprotocol_p.h
+++ b/src/publishsubscribe/qpacketprotocol_p.h
@@ -45,7 +45,7 @@
 #include <QObject>
 #include <QDataStream>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QIODevice;
 class QBuffer;
@@ -111,6 +111,6 @@ private:
     QPacketProtocol * p;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
diff --git a/src/publishsubscribe/qsystemreadwritelock.cpp b/src/publishsubscribe/qsystemreadwritelock.cpp
index 9d5557ff12..105e4a57c1 100644
--- a/src/publishsubscribe/qsystemreadwritelock.cpp
+++ b/src/publishsubscribe/qsystemreadwritelock.cpp
@@ -49,7 +49,7 @@
 #include <QDebug>
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QSystemReadWriteLockPrivate
 {
@@ -325,4 +325,4 @@ QString QSystemReadWriteLock::key() const
     return d->m_key;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/publishsubscribe/qsystemreadwritelock_p.h b/src/publishsubscribe/qsystemreadwritelock_p.h
index b2cba25e05..35e44a59f6 100644
--- a/src/publishsubscribe/qsystemreadwritelock_p.h
+++ b/src/publishsubscribe/qsystemreadwritelock_p.h
@@ -45,7 +45,7 @@
 #include "qcontextglobal.h"
 #include <QString>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QSystemReadWriteLockPrivate;
 class Q_AUTOTEST_EXPORT QSystemReadWriteLock
@@ -78,6 +78,6 @@ private:
     QSystemReadWriteLockPrivate *d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif
diff --git a/src/publishsubscribe/qvaluespace.cpp b/src/publishsubscribe/qvaluespace.cpp
index bbe9a2737c..c34bcebf07 100644
--- a/src/publishsubscribe/qvaluespace.cpp
+++ b/src/publishsubscribe/qvaluespace.cpp
@@ -55,7 +55,7 @@
 
 #include <QtCore/qdebug.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QAbstractValueSpaceLayer
@@ -480,4 +480,4 @@ QString qCanonicalPath(const QString &path)
     return result;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/publishsubscribe/qvaluespace.h b/src/publishsubscribe/qvaluespace.h
index 2861369ff2..2b0e791d57 100644
--- a/src/publishsubscribe/qvaluespace.h
+++ b/src/publishsubscribe/qvaluespace.h
@@ -49,7 +49,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 namespace QValueSpace {
     enum LayerOption {
@@ -81,7 +81,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QValueSpace::LayerOptions);
 #define QVALUESPACE_CONTEXTKIT_LAYER QUuid(0x2c769b9e, 0xd949, 0x4cd1, 0x84, 0x8f, \
                                            0xd3, 0x22, 0x41, 0xfe, 0x07, 0xff)
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/publishsubscribe/qvaluespace_p.h b/src/publishsubscribe/qvaluespace_p.h
index a8a9b2fc20..e154970205 100644
--- a/src/publishsubscribe/qvaluespace_p.h
+++ b/src/publishsubscribe/qvaluespace_p.h
@@ -48,7 +48,7 @@
 #include <QObject>
 #include <QUuid>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QValueSpaceProvider;
 
@@ -123,6 +123,6 @@ QAbstractValueSpaceLayer * _qvaluespaceauto_layercreate_ ## name() \
 } \
 static QValueSpace::AutoInstall _qvaluespaceauto_ ## name(_qvaluespaceauto_layercreate_ ## name);
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif // QVALUESPACE_P_H
diff --git a/src/publishsubscribe/qvaluespacemanager.cpp b/src/publishsubscribe/qvaluespacemanager.cpp
index ab7aad1354..82f3e4fd34 100644
--- a/src/publishsubscribe/qvaluespacemanager.cpp
+++ b/src/publishsubscribe/qvaluespacemanager.cpp
@@ -41,7 +41,7 @@
 
 #include "qvaluespacemanager_p.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QValueSpaceManager, valueSpaceManager);
 
@@ -143,4 +143,4 @@ bool QValueSpaceManager::initLayer(QAbstractValueSpaceLayer* layer)
                                          QAbstractValueSpaceLayer::Server);
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/publishsubscribe/qvaluespacemanager_p.h b/src/publishsubscribe/qvaluespacemanager_p.h
index d098afbb90..c9f941aace 100644
--- a/src/publishsubscribe/qvaluespacemanager_p.h
+++ b/src/publishsubscribe/qvaluespacemanager_p.h
@@ -55,7 +55,7 @@
 
 #include "qvaluespace_p.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_AUTOTEST_EXPORT QValueSpaceManager
 {
@@ -81,6 +81,6 @@ private:
     QList<QValueSpace::LayerCreateFunc> funcs;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif // QVALUESPACEMANAGER_P_H
diff --git a/src/publishsubscribe/qvaluespaceprovider.cpp b/src/publishsubscribe/qvaluespaceprovider.cpp
index 19ca887a6b..cc5d63b03c 100644
--- a/src/publishsubscribe/qvaluespaceprovider.cpp
+++ b/src/publishsubscribe/qvaluespaceprovider.cpp
@@ -48,7 +48,7 @@
 
 #include <QtCore/qdebug.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QValueSpaceProvider
@@ -475,4 +475,4 @@ void QValueSpaceProvider::connectNotify(const char *member)
     QObject::connectNotify(member);
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/publishsubscribe/qvaluespaceprovider.h b/src/publishsubscribe/qvaluespaceprovider.h
index 06b81d7f49..dc7e51bfbc 100644
--- a/src/publishsubscribe/qvaluespaceprovider.h
+++ b/src/publishsubscribe/qvaluespaceprovider.h
@@ -50,7 +50,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QValueSpaceProviderPrivate;
 class Q_CFW_EXPORT QValueSpaceProvider : public QObject
@@ -99,7 +99,7 @@ private:
     QValueSpaceProviderPrivate *d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/publishsubscribe/qvaluespacesubscriber.cpp b/src/publishsubscribe/qvaluespacesubscriber.cpp
index d746340f17..5465b0c60c 100644
--- a/src/publishsubscribe/qvaluespacesubscriber.cpp
+++ b/src/publishsubscribe/qvaluespacesubscriber.cpp
@@ -49,7 +49,7 @@
 #include <QSharedData>
 #include <QMutex>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QValueSpaceSubscriber
@@ -657,6 +657,6 @@ QStringList QValueSpaceSubscriber::subPaths() const
     return rvs;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #include "qvaluespacesubscriber.moc"
diff --git a/src/publishsubscribe/qvaluespacesubscriber.h b/src/publishsubscribe/qvaluespacesubscriber.h
index 76da02474d..2abd703fdb 100644
--- a/src/publishsubscribe/qvaluespacesubscriber.h
+++ b/src/publishsubscribe/qvaluespacesubscriber.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QValueSpaceSubscriberPrivate;
 
@@ -108,7 +108,7 @@ private:
     QExplicitlySharedDataPointer<QValueSpaceSubscriberPrivate> d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/publishsubscribe/registrylayer_win.cpp b/src/publishsubscribe/registrylayer_win.cpp
index 1a130367aa..b90fb870c7 100644
--- a/src/publishsubscribe/registrylayer_win.cpp
+++ b/src/publishsubscribe/registrylayer_win.cpp
@@ -66,7 +66,7 @@
 #define RegistryCallback WAITORTIMERCALLBACK
 #endif
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #ifdef Q_OS_WINCE
 class QWindowsCENotify : public QThread
@@ -1395,7 +1395,7 @@ bool RegistryLayer::notifyInterest(Handle, bool)
     return false;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #include <registrylayer_win.moc>
 
diff --git a/src/publishsubscribe/sharedmemorylayer.cpp b/src/publishsubscribe/sharedmemorylayer.cpp
index a0d7f31a53..ca8baf015e 100644
--- a/src/publishsubscribe/sharedmemorylayer.cpp
+++ b/src/publishsubscribe/sharedmemorylayer.cpp
@@ -57,7 +57,7 @@
 #include <QTime>
 #include <QThread>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #define VERSION_TABLE_ENTRIES 8191
 #define ROOT_VERSION_ENTRY 0
@@ -3393,6 +3393,6 @@ void SharedMemoryLayer::removeWatches(QValueSpaceProvider *creator, Handle paren
     remWatch(owner, readHandle->path);
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #include "sharedmemorylayer.moc"
diff --git a/src/serviceframework/databasemanager.cpp b/src/serviceframework/databasemanager.cpp
index e1a7bc5db8..14abf0c73f 100644
--- a/src/serviceframework/databasemanager.cpp
+++ b/src/serviceframework/databasemanager.cpp
@@ -44,7 +44,7 @@
 #include <QFileSystemWatcher>
 #include <QHash>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 DatabaseFileWatcher::DatabaseFileWatcher(DatabaseManager *parent)
     : QObject(parent),
@@ -795,4 +795,4 @@ void DatabaseManager::setChangeNotificationsEnabled(DbScope scope, bool enabled)
             m_systemDb : m_userDb, enabled);
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/databasemanager_p.h b/src/serviceframework/databasemanager_p.h
index 471a227ad7..0fea049050 100644
--- a/src/serviceframework/databasemanager_p.h
+++ b/src/serviceframework/databasemanager_p.h
@@ -58,7 +58,7 @@
 #include <QObject>
 
 QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class DatabaseFileWatcher;
 #if defined(Q_OS_SYMBIAN) && defined(DATABASEMANAGERSERVER_NO_LIBRARY)
@@ -136,7 +136,7 @@ private:
     QStringList m_monitoredDbPaths;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 QT_END_HEADER
 
 #endif
diff --git a/src/serviceframework/databasemanager_s60.cpp b/src/serviceframework/databasemanager_s60.cpp
index 3bd813e8b0..41e4f562c0 100644
--- a/src/serviceframework/databasemanager_s60.cpp
+++ b/src/serviceframework/databasemanager_s60.cpp
@@ -49,7 +49,7 @@
 #include <s32mem.h>
 
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*
     \class DatabaseManager
@@ -523,4 +523,4 @@ void RDatabaseManagerSession::CancelNotifyServiceSignal() const
         }
 #endif
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/databasemanager_s60_p.h b/src/serviceframework/databasemanager_s60_p.h
index 14cec6d4e2..97146dfad0 100644
--- a/src/serviceframework/databasemanager_s60_p.h
+++ b/src/serviceframework/databasemanager_s60_p.h
@@ -65,7 +65,7 @@ class QServiceFilter;
 typedef TPckgBuf<TInt> TError; 
 
 QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class CDatabaseManagerServerThread;
 
@@ -185,7 +185,7 @@ class DatabaseManagerSignalMonitor : public CActive
         RDatabaseManagerSession& iDatabaseManagerSession;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 QT_END_HEADER
 
 #endif
diff --git a/src/serviceframework/dberror.cpp b/src/serviceframework/dberror.cpp
index 4e7acf73d9..cfbf36699b 100644
--- a/src/serviceframework/dberror.cpp
+++ b/src/serviceframework/dberror.cpp
@@ -41,7 +41,7 @@
 
 #include "dberror_p.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 DBError::DBError()
 {
@@ -81,4 +81,4 @@ void DBError::setError(ErrorCode error, const QString &text)
             m_error = UnknownError;
     }
 }
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/dberror_p.h b/src/serviceframework/dberror_p.h
index 36b41763ad..9d116a7b52 100644
--- a/src/serviceframework/dberror_p.h
+++ b/src/serviceframework/dberror_p.h
@@ -56,7 +56,7 @@
 #include <QString>
 #include "qmobilityglobal.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #if defined(Q_OS_SYMBIAN) && defined(DATABASEMANAGERSERVER_NO_LIBRARY)
 class Q_SFW_EXPORT DBError
@@ -103,6 +103,6 @@ class Q_AUTOTEST_EXPORT DBError
         QString m_text;
         ErrorCode m_error;
 };
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif  //DBERROR_H
diff --git a/src/serviceframework/qabstractsecuritysession.cpp b/src/serviceframework/qabstractsecuritysession.cpp
index 3030a352bc..4510d498f4 100644
--- a/src/serviceframework/qabstractsecuritysession.cpp
+++ b/src/serviceframework/qabstractsecuritysession.cpp
@@ -41,7 +41,7 @@
 
 #include "qabstractsecuritysession.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QAbstractSecuritySession
@@ -99,4 +99,4 @@ QAbstractSecuritySession::~QAbstractSecuritySession()
     service \a capabilities. 
 */
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/qabstractsecuritysession.h b/src/serviceframework/qabstractsecuritysession.h
index fc8f76b76f..f72b8aae21 100644
--- a/src/serviceframework/qabstractsecuritysession.h
+++ b/src/serviceframework/qabstractsecuritysession.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_SFW_EXPORT QAbstractSecuritySession : public QObject
 {
@@ -59,7 +59,7 @@ public:
     virtual bool isAllowed(const QStringList& capabilityList) = 0;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/serviceframework/qservicecontext.cpp b/src/serviceframework/qservicecontext.cpp
index 669ff404a1..9df270b0f9 100644
--- a/src/serviceframework/qservicecontext.cpp
+++ b/src/serviceframework/qservicecontext.cpp
@@ -41,7 +41,7 @@
 
 #include "qservicecontext.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QServiceContext
@@ -132,4 +132,4 @@ void QServiceContext::setClientName(const QString& name)
     m_displayName = name;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/qservicecontext.h b/src/serviceframework/qservicecontext.h
index ae94875638..15a6389b13 100644
--- a/src/serviceframework/qservicecontext.h
+++ b/src/serviceframework/qservicecontext.h
@@ -50,7 +50,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class Q_SFW_EXPORT QServiceContext : public QObject
 {
@@ -81,7 +81,7 @@ private:
 
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 #endif //QSERVICECONTEXT_H
diff --git a/src/serviceframework/qservicefilter.cpp b/src/serviceframework/qservicefilter.cpp
index 591e8742dd..25fb6fd046 100644
--- a/src/serviceframework/qservicefilter.cpp
+++ b/src/serviceframework/qservicefilter.cpp
@@ -48,7 +48,7 @@
 
 #include "qservicefilter.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QServiceFilterPrivate
 {
@@ -498,5 +498,5 @@ QDataStream &operator>>(QDataStream &in, QServiceFilter &sf)
 #endif //QT_NO_DATASTREAM
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
diff --git a/src/serviceframework/qservicefilter.h b/src/serviceframework/qservicefilter.h
index 6c61cfe708..b73a772d26 100644
--- a/src/serviceframework/qservicefilter.h
+++ b/src/serviceframework/qservicefilter.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QDataStream;
 class QServiceFilterPrivate;
@@ -110,7 +110,7 @@ Q_SFW_EXPORT QDataStream &operator<<(QDataStream &, const QServiceFilter &);
 Q_SFW_EXPORT QDataStream &operator>>(QDataStream &, QServiceFilter &);
 #endif
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 #endif //QSERVICEFILTER_H
diff --git a/src/serviceframework/qserviceinterfacedescriptor.cpp b/src/serviceframework/qserviceinterfacedescriptor.cpp
index 211f3f6668..1eed5917a5 100644
--- a/src/serviceframework/qserviceinterfacedescriptor.cpp
+++ b/src/serviceframework/qserviceinterfacedescriptor.cpp
@@ -47,7 +47,7 @@
 #include <QDebug>
 #include <QStringList>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 /*!
     \class QServiceInterfaceDescriptor
@@ -389,5 +389,5 @@ QDataStream &operator>>(QDataStream &in, QServiceInterfaceDescriptor &dc)
 
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
diff --git a/src/serviceframework/qserviceinterfacedescriptor.h b/src/serviceframework/qserviceinterfacedescriptor.h
index 6ff97c5ff0..eacb38dcb3 100644
--- a/src/serviceframework/qserviceinterfacedescriptor.h
+++ b/src/serviceframework/qserviceinterfacedescriptor.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 
 class QDebug;
@@ -116,7 +116,7 @@ Q_SFW_EXPORT QDebug operator<<(QDebug, const QServiceInterfaceDescriptor &);
 #endif
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/serviceframework/qserviceinterfacedescriptor_p.h b/src/serviceframework/qserviceinterfacedescriptor_p.h
index 9e225b8931..2a8447c3e1 100644
--- a/src/serviceframework/qserviceinterfacedescriptor_p.h
+++ b/src/serviceframework/qserviceinterfacedescriptor_p.h
@@ -58,7 +58,7 @@
 #include <QString>
 #include <QHash>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QServiceInterfaceDescriptorPrivate
 {
@@ -119,6 +119,6 @@ public:
     int minor;
     bool systemScope;
 };
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif //QSERVICEINTERFACEDESCRIPTOR_P_H
diff --git a/src/serviceframework/qservicemanager.cpp b/src/serviceframework/qservicemanager.cpp
index fd9bb3f557..215639d76d 100644
--- a/src/serviceframework/qservicemanager.cpp
+++ b/src/serviceframework/qservicemanager.cpp
@@ -55,7 +55,7 @@
 #include <QCoreApplication>
 #include <QDir>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 
 static QString qservicemanager_resolveLibraryPath(const QString &libNameOrPath)
@@ -713,6 +713,6 @@ void QServiceManager::disconnectNotify(const char *signal)
     }
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #include "qservicemanager.moc"
diff --git a/src/serviceframework/qservicemanager.h b/src/serviceframework/qservicemanager.h
index e7d0292ea3..b9006c5bcc 100644
--- a/src/serviceframework/qservicemanager.h
+++ b/src/serviceframework/qservicemanager.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QServiceContext;
 class QAbstractSecuritySession;
@@ -154,7 +154,7 @@ private:
 };
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/serviceframework/qserviceplugininterface.cpp b/src/serviceframework/qserviceplugininterface.cpp
index e209fb3fe9..b08c50f75f 100644
--- a/src/serviceframework/qserviceplugininterface.cpp
+++ b/src/serviceframework/qserviceplugininterface.cpp
@@ -41,7 +41,7 @@
 
 #include "qserviceplugininterface.h"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 /*!
     \class QServicePluginInterface
     \ingroup servicefw
@@ -106,4 +106,4 @@ void QServicePluginInterface::uninstallService()
 {
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/qserviceplugininterface.h b/src/serviceframework/qserviceplugininterface.h
index 5e61419bee..34e428c38b 100644
--- a/src/serviceframework/qserviceplugininterface.h
+++ b/src/serviceframework/qserviceplugininterface.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QServiceInterfaceDescriptor;
 class QServiceContext;
@@ -69,7 +69,7 @@ public:
 
 Q_DECLARE_INTERFACE(QServicePluginInterface, "com.nokia.qt.QServicePluginInterface/1.0")
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 #endif
diff --git a/src/serviceframework/servicedatabase.cpp b/src/serviceframework/servicedatabase.cpp
index 14a235e698..f5110e1dcb 100644
--- a/src/serviceframework/servicedatabase.cpp
+++ b/src/serviceframework/servicedatabase.cpp
@@ -70,7 +70,7 @@
 #define INTERFACE_DESCRIPTION_KEY "DESCRIPTION"
 #define INTERFACE_CAPABILITY_KEY "CAPABILITIES"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 enum TBindIndexes
     {
@@ -2021,4 +2021,4 @@ bool ServiceDatabase::populateServiceProperties(QServiceInterfaceDescriptor *int
     return true;
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/servicedatabase_p.h b/src/serviceframework/servicedatabase_p.h
index fb2a206cb6..ce6cac9f51 100644
--- a/src/serviceframework/servicedatabase_p.h
+++ b/src/serviceframework/servicedatabase_p.h
@@ -62,7 +62,7 @@
 
 
 QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QServiceInterfaceDescriptor;
 
@@ -138,7 +138,7 @@ Q_SIGNALS:
         DBError m_lastError;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 QT_END_HEADER
 
 #endif /*QSERVICEDATABASE_H_*/
diff --git a/src/serviceframework/servicemetadata.cpp b/src/serviceframework/servicemetadata.cpp
index df17e94d55..823b0d354a 100644
--- a/src/serviceframework/servicemetadata.cpp
+++ b/src/serviceframework/servicemetadata.cpp
@@ -58,7 +58,7 @@
 #define INTERFACE_CAPABILITY "capabilities"
 #define INTERFACE_CUSTOM_PROPERTY "customproperty"
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 static const char  PATH_SEPARATOR[] = "\\";
 
@@ -537,4 +537,4 @@ void ServiceMetaData::clearMetadata()
     m_latestIndex.clear();
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/serviceframework/servicemetadata_p.h b/src/serviceframework/servicemetadata_p.h
index 271ec822df..320a1e05dc 100644
--- a/src/serviceframework/servicemetadata_p.h
+++ b/src/serviceframework/servicemetadata_p.h
@@ -67,7 +67,7 @@
 
 class QIODevice;
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 // FORWARD DECLARATIONS
 class QServiceInterfaceDescriptor;
@@ -168,6 +168,6 @@ private:
     QHash<QString, int> m_latestIndex;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 #endif // SERVICEMETADATA_H
diff --git a/src/systeminfo/qsysteminfo.cpp b/src/systeminfo/qsysteminfo.cpp
index 0e20a9ff9f..53f28f45b7 100644
--- a/src/systeminfo/qsysteminfo.cpp
+++ b/src/systeminfo/qsysteminfo.cpp
@@ -67,7 +67,7 @@
 
 #include <locale.h>
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
   /*!
     \class QSystemInfo
@@ -885,4 +885,4 @@ bool QSystemScreenSaver::isScreenLockOn()
     return dp.isScreenLockOn();
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/systeminfo/qsysteminfo.h b/src/systeminfo/qsysteminfo.h
index 99a9191ba8..669d19372a 100644
--- a/src/systeminfo/qsysteminfo.h
+++ b/src/systeminfo/qsysteminfo.h
@@ -50,7 +50,7 @@
 #include <QNetworkInterface>
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QStringList;
 
@@ -372,7 +372,7 @@ private:
     QSystemScreenSaverPrivate *d;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/systeminfo/qsysteminfo_linux.cpp b/src/systeminfo/qsysteminfo_linux.cpp
index a056607ecc..7016d39ef5 100644
--- a/src/systeminfo/qsysteminfo_linux.cpp
+++ b/src/systeminfo/qsysteminfo_linux.cpp
@@ -109,7 +109,7 @@
 
 
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 static bool halAvailable()
 {
@@ -2044,4 +2044,4 @@ void QSystemScreenSaverPrivate::whichWMRunning()
 }
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/systeminfo/qsysteminfo_linux_p.h b/src/systeminfo/qsysteminfo_linux_p.h
index ade3414128..163776c4f9 100644
--- a/src/systeminfo/qsysteminfo_linux_p.h
+++ b/src/systeminfo/qsysteminfo_linux_p.h
@@ -66,7 +66,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QStringList;
 class QSystemNetworkInfo;
@@ -275,7 +275,7 @@ private:
 
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/systeminfo/qsysteminfo_mac.mm b/src/systeminfo/qsysteminfo_mac.mm
index b6d3ba7674..ac3dd373df 100644
--- a/src/systeminfo/qsysteminfo_mac.mm
+++ b/src/systeminfo/qsysteminfo_mac.mm
@@ -926,4 +926,4 @@ void QSystemScreenSaverPrivate::activityTimeout()
 }
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/systeminfo/qsysteminfo_mac_p.h b/src/systeminfo/qsysteminfo_mac_p.h
index f31f61a859..b757644268 100644
--- a/src/systeminfo/qsysteminfo_mac_p.h
+++ b/src/systeminfo/qsysteminfo_mac_p.h
@@ -65,7 +65,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QStringList;
 class QSystemNetworkInfo;
@@ -242,7 +242,7 @@ private slots:
 
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/systeminfo/qsysteminfo_s60.cpp b/src/systeminfo/qsysteminfo_s60.cpp
index eb8d3d5c40..ddbd969024 100644
--- a/src/systeminfo/qsysteminfo_s60.cpp
+++ b/src/systeminfo/qsysteminfo_s60.cpp
@@ -1020,4 +1020,4 @@ void QSystemScreenSaverPrivate::resetInactivityTime()
     User::ResetInactivityTime();
 }
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/systeminfo/qsysteminfo_s60_p.h b/src/systeminfo/qsysteminfo_s60_p.h
index 84a396bcc2..39c8d982db 100644
--- a/src/systeminfo/qsysteminfo_s60_p.h
+++ b/src/systeminfo/qsysteminfo_s60_p.h
@@ -64,7 +64,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 #include "telephonyinfo_s60.h"
 
@@ -360,7 +360,7 @@ private:
     CCellSignalStrengthInfo *m_cellSignalStrengthInfo;
 };
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER
 
diff --git a/src/systeminfo/qsysteminfo_win.cpp b/src/systeminfo/qsysteminfo_win.cpp
index c175b9f7dc..09121932b2 100644
--- a/src/systeminfo/qsysteminfo_win.cpp
+++ b/src/systeminfo/qsysteminfo_win.cpp
@@ -1981,4 +1981,4 @@ bool QSystemScreenSaverPrivate::isScreenLockOn()
 }
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
diff --git a/src/systeminfo/qsysteminfo_win_p.h b/src/systeminfo/qsysteminfo_win_p.h
index 8e750cae47..4d9ea09c15 100644
--- a/src/systeminfo/qsysteminfo_win_p.h
+++ b/src/systeminfo/qsysteminfo_win_p.h
@@ -71,7 +71,7 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
+QTM_BEGIN_NAMESPACE
 
 class QStringList;
 class QSystemNetworkInfo;
@@ -262,7 +262,7 @@ private:
 
 
 
-QT_END_NAMESPACE
+QTM_END_NAMESPACE
 
 QT_END_HEADER