fix Mobility when compiled with namespace (MOBILITY-404)

76 files changed, 180 insertions, 37 deletions

diff --git a/config.tests/qmf/main.cpp b/config.tests/qmf/main.cpp
index 6545b4994c..e5891db0be 100644
--- a/config.tests/qmf/main.cpp
+++ b/config.tests/qmf/main.cpp
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+#include <qglobal.h>
+
+QT_USE_NAMESPACE
+
 #include <qmailmessage.h>
 #include <qmailglobal.h>
 
diff --git a/config.tests/qmf/qmf.pro b/config.tests/qmf/qmf.pro
index 436ef86d98..d86bdc6da1 100644
--- a/config.tests/qmf/qmf.pro
+++ b/config.tests/qmf/qmf.pro
@@ -6,6 +6,8 @@ TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 
+message($$(QMF_INCLUDEDIR)  - $$(QMF_LIBDIR))
+
 # QMF headers must be located at $QMF_INCLUDEDIR
 INCLUDEPATH += $$(QMF_INCLUDEDIR) $$(QMF_INCLUDEDIR)/support
 
diff --git a/examples/audiorecorder/audiorecorder.h b/examples/audiorecorder/audiorecorder.h
index 3b996d1ad9..844507eaba 100644
--- a/examples/audiorecorder/audiorecorder.h
+++ b/examples/audiorecorder/audiorecorder.h
@@ -47,8 +47,10 @@
 
 #include <qmediarecorder.h>
 
+QT_BEGIN_NAMESPACE
 class QComboBox;
 class QLabel;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QAudioCaptureSource;
diff --git a/examples/bearercloud/cloud.h b/examples/bearercloud/cloud.h
index 4ce43df0d2..b542bf77c6 100644
--- a/examples/bearercloud/cloud.h
+++ b/examples/bearercloud/cloud.h
@@ -45,8 +45,10 @@
 #include <QGraphicsItem>
 QTM_USE_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 class QGraphicsTextItem;
 class QGraphicsSvgItem;
+QT_END_NAMESPACE
 
 class Cloud : public QObject, public QGraphicsItem
 {
diff --git a/examples/cameracapture/cameracapture.h b/examples/cameracapture/cameracapture.h
index 56d7daf7c5..e2e2a97d52 100644
--- a/examples/cameracapture/cameracapture.h
+++ b/examples/cameracapture/cameracapture.h
@@ -45,9 +45,12 @@
 #include <experimental/qcamera.h>
 #include <qmediarecorder.h>
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class CameraCapture;
 }
+QT_END_NAMESPACE
+
 
 #include <QMainWindow>
 #include <QDir>
diff --git a/examples/cameracapture/settings.cpp b/examples/cameracapture/settings.cpp
index 3bac4b37a9..de6890fe51 100644
--- a/examples/cameracapture/settings.cpp
+++ b/examples/cameracapture/settings.cpp
@@ -51,7 +51,7 @@
 
 Settings::Settings(QMediaRecorder *mediaRecorder, QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::Settings),
+    ui(new Ui::SettingsUi),
     mediaRecorder(mediaRecorder)
 {
     ui->setupUi(this);
diff --git a/examples/cameracapture/settings.h b/examples/cameracapture/settings.h
index 02f4c221b1..46766d9ee0 100644
--- a/examples/cameracapture/settings.h
+++ b/examples/cameracapture/settings.h
@@ -45,16 +45,19 @@
 #include <QtGui/QDialog>
 #include <qmediaencodersettings.h>
 
-class QComboBox;
 QTM_BEGIN_NAMESPACE
 class QMediaRecorder;
 QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
+QT_BEGIN_NAMESPACE
+class QComboBox;
 namespace Ui {
-    class Settings;
+    class SettingsUi;
 }
+QT_END_NAMESPACE
 
 class Settings : public QDialog {
     Q_OBJECT
@@ -78,7 +81,7 @@ private:
     QVariant boxValue(const QComboBox*) const;
     void selectComboBoxItem(QComboBox *box, const QVariant &value);
 
-    Ui::Settings *ui;
+    Ui::SettingsUi *ui;
     QMediaRecorder *mediaRecorder;
 };
 
diff --git a/examples/cameracapture/settings.ui b/examples/cameracapture/settings.ui
index bd13414cbc..0f410fb7a7 100644
--- a/examples/cameracapture/settings.ui
+++ b/examples/cameracapture/settings.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Settings</class>
- <widget class="QDialog" name="Settings">
+ <class>SettingsUi</class>
+ <widget class="QDialog" name="SettingsUi">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/examples/incomingcalls/filterdialog.h b/examples/incomingcalls/filterdialog.h
index 1b48dd25db..933104c4a5 100644
--- a/examples/incomingcalls/filterdialog.h
+++ b/examples/incomingcalls/filterdialog.h
@@ -58,6 +58,7 @@
 #include "qcontactfilter.h"
 #include "qcontactintersectionfilter.h"
 
+QT_BEGIN_NAMESPACE
 class QLabel;
 class QLineEdit;
 class QComboBox;
@@ -65,6 +66,7 @@ class QPushButton;
 class QFormLayout;
 class QVBoxLayout;
 class QHBoxLayout;
+QT_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 
diff --git a/examples/incomingcalls/testmodelui.h b/examples/incomingcalls/testmodelui.h
index e72246781f..b860b7eeee 100644
--- a/examples/incomingcalls/testmodelui.h
+++ b/examples/incomingcalls/testmodelui.h
@@ -60,10 +60,12 @@
 #include "qcontactlistmodel.h"
 #include "filterdialog.h"
 
+QT_BEGIN_NAMESPACE
 class QStackedWidget;
 class QTextEdit;
 class QLabel;
 class QPushButton;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QContactFetchRequest;
@@ -86,7 +88,6 @@ private:
     QContactListModel *model;
 };
 
-class QPushButton;
 class TestModelUi : public QWidget
 {
     Q_OBJECT
diff --git a/examples/logfilepositionsource/clientapplication.h b/examples/logfilepositionsource/clientapplication.h
index 513531a76a..c6f8217cad 100644
--- a/examples/logfilepositionsource/clientapplication.h
+++ b/examples/logfilepositionsource/clientapplication.h
@@ -49,7 +49,9 @@ QTM_BEGIN_NAMESPACE
 class QGeoPositionInfo;
 QTM_END_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 class QTextEdit;
+QT_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 class ClientApplication : public QMainWindow
diff --git a/examples/logfilepositionsource/logfilepositionsource.h b/examples/logfilepositionsource/logfilepositionsource.h
index f40eaf10e1..068021b8aa 100644
--- a/examples/logfilepositionsource/logfilepositionsource.h
+++ b/examples/logfilepositionsource/logfilepositionsource.h
@@ -45,8 +45,10 @@
 
 QTM_USE_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 class QFile;
 class QTimer;
+QT_END_NAMESPACE
 
 class LogFilePositionSource : public QGeoPositionInfoSource
 {
diff --git a/examples/player/player.h b/examples/player/player.h
index 78205522ea..ef41ce9b45 100644
--- a/examples/player/player.h
+++ b/examples/player/player.h
@@ -48,10 +48,12 @@
 #include <qmediaplaylist.h>
 #include <qvideowidget.h>
 
+QT_BEGIN_NAMESPACE
 class QAbstractItemView;
 class QLabel;
 class QModelIndex;
 class QSlider;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QMediaPlayer;
diff --git a/examples/player/playercontrols.h b/examples/player/playercontrols.h
index 5e7d85965d..0bd303fe27 100644
--- a/examples/player/playercontrols.h
+++ b/examples/player/playercontrols.h
@@ -46,9 +46,11 @@
 
 #include <QtGui/qwidget.h>
 
+QT_BEGIN_NAMESPACE
 class QAbstractButton;
 class QAbstractSlider;
 class QComboBox;
+QT_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 
diff --git a/examples/publish-subscribe/publisherdialog.h b/examples/publish-subscribe/publisherdialog.h
index be3025f293..3edce0e5b3 100644
--- a/examples/publish-subscribe/publisherdialog.h
+++ b/examples/publish-subscribe/publisherdialog.h
@@ -51,9 +51,11 @@ QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class PublisherDialog;
 }
+QT_END_NAMESPACE
 
 class PublisherDialog : public QDialog
 {
diff --git a/examples/publish-subscribe/subscriberdialog.h b/examples/publish-subscribe/subscriberdialog.h
index ffc1f130b4..1f0b9a7bc4 100644
--- a/examples/publish-subscribe/subscriberdialog.h
+++ b/examples/publish-subscribe/subscriberdialog.h
@@ -51,9 +51,11 @@ QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class SubscriberDialog;
 }
+QT_END_NAMESPACE
 
 class SubscriberDialog : public QDialog
 {
diff --git a/examples/samplephonebook/filterpage.h b/examples/samplephonebook/filterpage.h
index ab98d5fa56..b0dbab11e9 100644
--- a/examples/samplephonebook/filterpage.h
+++ b/examples/samplephonebook/filterpage.h
@@ -54,7 +54,7 @@ class QComboBox;
 class QPushButton;
 class QLineEdit;
 class QLabel;
-QT_BEGIN_NAMESPACE
+QT_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 
diff --git a/examples/samplephonebook/phonebook.h b/examples/samplephonebook/phonebook.h
index a881f922fd..797a7f1fdb 100644
--- a/examples/samplephonebook/phonebook.h
+++ b/examples/samplephonebook/phonebook.h
@@ -61,6 +61,7 @@ class ContactListPage;
 class ContactEditor;
 class FilterPage;
 
+QT_USE_NAMESPACE
 QTM_USE_NAMESPACE
 
 class PhoneBook : public QWidget
diff --git a/examples/servicebrowser/servicebrowser.h b/examples/servicebrowser/servicebrowser.h
index c8df89b532..c598b6db7e 100644
--- a/examples/servicebrowser/servicebrowser.h
+++ b/examples/servicebrowser/servicebrowser.h
@@ -47,12 +47,14 @@
 
 #include <qmobilityglobal.h>
 
+QT_BEGIN_NAMESPACE
 class QAbstractButton;
 class QGroupBox;
 class QListWidget;
 class QListWidgetItem;
 class QPushButton;
 class QRadioButton;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QServiceManager;
diff --git a/examples/slideshow/slideshow.h b/examples/slideshow/slideshow.h
index e59d2ef824..51435d253f 100644
--- a/examples/slideshow/slideshow.h
+++ b/examples/slideshow/slideshow.h
@@ -45,8 +45,10 @@
 #include <QWidget>
 #include <qmediaimageviewer.h>
 
+QT_BEGIN_NAMESPACE
 class QAbstractButton;
 class QLabel;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QMediaPlaylist;
diff --git a/examples/streamplayer/streamplayer.h b/examples/streamplayer/streamplayer.h
index 89ae532434..2539f95bc4 100644
--- a/examples/streamplayer/streamplayer.h
+++ b/examples/streamplayer/streamplayer.h
@@ -46,7 +46,9 @@
 #include <QtCore/qfile.h>
 #include <QtGui/qwidget.h>
 
+QT_BEGIN_NAMESPACE
 class QProgressBar;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QMediaPlayer;
diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp
index c751f3a408..9ee73f4276 100644
--- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp
+++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp
@@ -56,11 +56,14 @@
 #include <sys/mman.h>
 #include <linux/videodev2.h>
 
+QT_BEGIN_NAMESPACE
 static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); }
+
 static bool operator<(const QSize &s1, const QSize s2)
 {
     return s1.width()*s1.height() < s2.width()*s2.height();
 }
+QT_END_NAMESPACE
 
 QGstreamerCameraControl::QGstreamerCameraControl(QGstreamerCaptureSession *session)
     :QCameraControl(session), m_session(session), m_state(QCamera::StoppedState)
diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.h b/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.h
index ab97f1d367..6b12724c95 100644
--- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.h
+++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.h
@@ -43,9 +43,12 @@
 #ifndef QGSTREAMERCAMERACONTROL_H
 #define QGSTREAMERCAMERACONTROL_H
 
+#include <QHash>
 #include <experimental/qcameracontrol.h>
 #include "qgstreamercapturesession.h"
+
 QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerCameraControl : public QCameraControl, public QGstreamerVideoInput
 {
diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h
index 6320b5fd6a..9abd867f1f 100644
--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h
+++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h
@@ -56,7 +56,10 @@ class QMediaPlaylist;
 class QGstreamerPlayerSession;
 class QGstreamerPlayerService;
 class QMediaPlaylistNavigator;
+
+QT_BEGIN_NAMESPACE
 class QSocketNotifier;
+QT_END_NAMESPACE
 
 class QGstreamerPlayerControl : public QMediaPlayerControl
 {
diff --git a/plugins/multimedia/gstreamer/qgstreamervideooverlay.h b/plugins/multimedia/gstreamer/qgstreamervideooverlay.h
index 001cf13c43..a73581f358 100644
--- a/plugins/multimedia/gstreamer/qgstreamervideooverlay.h
+++ b/plugins/multimedia/gstreamer/qgstreamervideooverlay.h
@@ -48,7 +48,9 @@
 
 QTM_USE_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
+QT_END_NAMESPACE
 class QX11VideoSurface;
 
 class QGstreamerVideoOverlay : public QVideoWindowControl, public QGstreamerVideoRendererInterface
diff --git a/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h b/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h
index fd7fba5cad..3ac49ac3e7 100644
--- a/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h
+++ b/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h
@@ -55,7 +55,8 @@ public:
 };
 
 #define QGstreamerVideoRendererInterface_iid "com.nokia.Qt.QGstreamerVideoRendererInterface/1.0"
-
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QGstreamerVideoRendererInterface, QGstreamerVideoRendererInterface_iid)
+QT_END_NAMESPACE
 
 #endif
diff --git a/plugins/multimedia/gstreamer/qvideosurfacegstsink.h b/plugins/multimedia/gstreamer/qvideosurfacegstsink.h
index be970b57f4..c4b7069f35 100644
--- a/plugins/multimedia/gstreamer/qvideosurfacegstsink.h
+++ b/plugins/multimedia/gstreamer/qvideosurfacegstsink.h
@@ -51,7 +51,9 @@
 #include <QtMultimedia/qvideosurfaceformat.h>
 #include <QtMultimedia/qvideoframe.h>
 
+QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
+QT_END_NAMESPACE
 
 class QVideoSurfaceGstDelegate : public QObject
 {
@@ -129,7 +131,4 @@ public:
     GstVideoSinkClass parent_class;
 };
 
-
-QT_END_NAMESPACE
-
 #endif
diff --git a/plugins/multimedia/gstreamer/qx11videosurface.h b/plugins/multimedia/gstreamer/qx11videosurface.h
index 0b6799c51b..ba4fb0a4da 100644
--- a/plugins/multimedia/gstreamer/qx11videosurface.h
+++ b/plugins/multimedia/gstreamer/qx11videosurface.h
@@ -49,6 +49,8 @@
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
 
+QT_USE_NAMESPACE
+
 class QX11VideoSurface : public QAbstractVideoSurface
 {
     Q_OBJECT
diff --git a/src/contacts/qcontactactionfactory.h b/src/contacts/qcontactactionfactory.h
index 63a2a9ee7c..8eb740056a 100644
--- a/src/contacts/qcontactactionfactory.h
+++ b/src/contacts/qcontactactionfactory.h
@@ -73,8 +73,10 @@ uint qHash(const QContactActionDescriptor& ad);
 
 QTM_END_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 #define QT_CONTACTS_ACTION_FACTORY_INTERFACE "com.nokia.qt.mobility.contacts.actionfactory/1.0"
 Q_DECLARE_INTERFACE(QtMobility::QContactActionFactory, QT_CONTACTS_ACTION_FACTORY_INTERFACE);
+QT_END_NAMESPACE
 
 
 #endif
diff --git a/src/contacts/qcontactfilter_p.h b/src/contacts/qcontactfilter_p.h
index 6a65f3aaa7..58e14ff89b 100644
--- a/src/contacts/qcontactfilter_p.h
+++ b/src/contacts/qcontactfilter_p.h
@@ -95,6 +95,7 @@ public:
 };
 QTM_END_NAMESPACE
 
+QT_BEGIN_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
@@ -106,6 +107,7 @@ template<> QTM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTM_
 #else
 template<> QTM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone();
 #endif
+QT_END_NAMESPACE
 
 
 #endif
diff --git a/src/contacts/qcontactmanagerenginefactory.h b/src/contacts/qcontactmanagerenginefactory.h
index ef7f52b537..843e5ad782 100644
--- a/src/contacts/qcontactmanagerenginefactory.h
+++ b/src/contacts/qcontactmanagerenginefactory.h
@@ -71,7 +71,9 @@ public:
 };
 QTM_END_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 #define QT_CONTACTS_BACKEND_INTERFACE "com.nokia.qt.mobility.contacts.enginefactory/1.0"
 Q_DECLARE_INTERFACE(QtMobility::QContactManagerEngineFactory, QT_CONTACTS_BACKEND_INTERFACE);
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/global/qmobilityglobal.h b/src/global/qmobilityglobal.h
index 26a906bfea..d5fbd5678e 100644
--- a/src/global/qmobilityglobal.h
+++ b/src/global/qmobilityglobal.h
@@ -174,4 +174,7 @@
 # define QTM_USE_NAMESPACE
 #endif
 
+//in case Qt is in namespace
+QT_USE_NAMESPACE
+
 #endif // QMOBILITYGLOBAL_H
diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h
index 3a9b1308f9..f289a409fa 100644
--- a/src/location/qgeocoordinate.h
+++ b/src/location/qgeocoordinate.h
@@ -45,8 +45,10 @@
 
 #include <QString>
 
+QT_BEGIN_NAMESPACE
 class QDebug;
 class QDataStream;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h
index dd20e04366..9078fba295 100644
--- a/src/location/qgeopositioninfo.h
+++ b/src/location/qgeopositioninfo.h
@@ -46,8 +46,10 @@
 
 #include <QDateTime>
 
+QT_BEGIN_NAMESPACE
 class QDebug;
 class QDataStream;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h
index bd616689c9..8b204b8541 100644
--- a/src/location/qgeosatelliteinfo.h
+++ b/src/location/qgeosatelliteinfo.h
@@ -43,7 +43,9 @@
 
 #include "qmobilityglobal.h"
 
+QT_BEGIN_NAMESPACE
 class QDebug;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/location/qlocationutils_p.h b/src/location/qlocationutils_p.h
index 4c8e6a477a..20c01d1554 100644
--- a/src/location/qlocationutils_p.h
+++ b/src/location/qlocationutils_p.h
@@ -54,8 +54,10 @@
 
 #include "qmobilityglobal.h"
 
+QT_BEGIN_NAMESPACE
 class QTime;
 class QByteArray;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h
index 2d18e97bd1..87254e9d8b 100644
--- a/src/location/qnmeapositioninfosource.h
+++ b/src/location/qnmeapositioninfosource.h
@@ -44,7 +44,9 @@
 #include "qmobilityglobal.h"
 #include "qgeopositioninfosource.h"
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h
index 29b1b10f35..83c732c7a3 100644
--- a/src/location/qnmeapositioninfosource_p.h
+++ b/src/location/qnmeapositioninfosource_p.h
@@ -59,9 +59,11 @@
 #include <QQueue>
 #include <QPointer>
 
+QT_BEGIN_NAMESPACE
 class QBasicTimer;
 class QTimerEvent;
 class QTimer;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/experimental/qimagecapturecontrol.h b/src/multimedia/experimental/qimagecapturecontrol.h
index 9f5627cb85..d13991132e 100644
--- a/src/multimedia/experimental/qimagecapturecontrol.h
+++ b/src/multimedia/experimental/qimagecapturecontrol.h
@@ -44,7 +44,9 @@
 
 #include <qmediacontrol.h>
 
+QT_BEGIN_NAMESPACE
 class QImage;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qaudioencodercontrol.h b/src/multimedia/qaudioencodercontrol.h
index c054237328..b3f7538e35 100644
--- a/src/multimedia/qaudioencodercontrol.h
+++ b/src/multimedia/qaudioencodercontrol.h
@@ -47,9 +47,10 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 
-
+QT_BEGIN_NAMESPACE
 class QStringList;
 class QAudioFormat;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qgraphicsvideoitem.h b/src/multimedia/qgraphicsvideoitem.h
index b461e0ff93..9f86d9218d 100644
--- a/src/multimedia/qgraphicsvideoitem.h
+++ b/src/multimedia/qgraphicsvideoitem.h
@@ -46,7 +46,9 @@
 
 #include <qvideowidget.h>
 
+QT_BEGIN_NAMESPACE
 class QVideoSurfaceFormat;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qimageencodercontrol.h b/src/multimedia/qimageencodercontrol.h
index 5c1bd267e9..0e6d6cc64d 100644
--- a/src/multimedia/qimageencodercontrol.h
+++ b/src/multimedia/qimageencodercontrol.h
@@ -48,8 +48,10 @@
 
 #include <QtCore/qsize.h>
 
+QT_BEGIN_NAMESPACE
 class QByteArray;
 class QStringList;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediaimageviewerservice_p.h b/src/multimedia/qmediaimageviewerservice_p.h
index 11720d51d7..3031a70a21 100644
--- a/src/multimedia/qmediaimageviewerservice_p.h
+++ b/src/multimedia/qmediaimageviewerservice_p.h
@@ -63,8 +63,10 @@
 
 #include <QtGui/qimage.h>
 
+QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
 class QNetworkAccessManager;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediaplaylistioplugin.h b/src/multimedia/qmediaplaylistioplugin.h
index 48fb7f7c8c..b26b622738 100644
--- a/src/multimedia/qmediaplaylistioplugin.h
+++ b/src/multimedia/qmediaplaylistioplugin.h
@@ -50,12 +50,13 @@
 
 #include <qmediacontent.h>
 
+QT_BEGIN_NAMESPACE
 class QString;
 class QUrl;
 class QByteArray;
 class QIODevice;
 class QStringList;
-
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
@@ -96,7 +97,9 @@ QTM_END_NAMESPACE
 #define QMediaPlaylistIOInterface_iid "com.nokia.Qt.QMediaPlaylistIOInterface"
 //MOC doesn't recognire paramitized macros
 //Q_DECLARE_INTERFACE(QTM_PREPEND_NAMESPACE(QMediaPlaylistIOInterface), QMediaPlaylistIOInterface_iid);
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QtMobility::QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid);
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediaplaylistprovider.h b/src/multimedia/qmediaplaylistprovider.h
index f8425785d1..354c2e9a14 100644
--- a/src/multimedia/qmediaplaylistprovider.h
+++ b/src/multimedia/qmediaplaylistprovider.h
@@ -47,7 +47,9 @@
 #include <qmediacontent.h>
 #include <qmediaplaylist.h>
 
+QT_BEGIN_NAMESPACE
 class QString;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediapluginloader_p.h b/src/multimedia/qmediapluginloader_p.h
index ac6191ed73..1bfa1d06df 100644
--- a/src/multimedia/qmediapluginloader_p.h
+++ b/src/multimedia/qmediapluginloader_p.h
@@ -58,7 +58,10 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qmap.h>
 
+QT_BEGIN_NAMESPACE
 class QObject;
+QT_END_NAMESPACE
+
 QTM_BEGIN_NAMESPACE
 
 class QMediaServiceProviderPlugin;
diff --git a/src/multimedia/qmediarecorder.h b/src/multimedia/qmediarecorder.h
index 8798efc021..d0786397e5 100644
--- a/src/multimedia/qmediarecorder.h
+++ b/src/multimedia/qmediarecorder.h
@@ -48,11 +48,11 @@
 
 #include <QtCore/qpair.h>
 
-
+QT_BEGIN_NAMESPACE
 class QUrl;
 class QSize;
-
 class QAudioFormat;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediarecordercontrol.h b/src/multimedia/qmediarecordercontrol.h
index 85995bb567..02ef2b610f 100644
--- a/src/multimedia/qmediarecordercontrol.h
+++ b/src/multimedia/qmediarecordercontrol.h
@@ -45,7 +45,9 @@
 #include <qmediacontrol.h>
 #include <qmediarecorder.h>
 
+QT_BEGIN_NAMESPACE
 class QUrl;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h
index 5f5e222cc6..4fff96dfb7 100644
--- a/src/multimedia/qmediaserviceproviderplugin.h
+++ b/src/multimedia/qmediaserviceproviderplugin.h
@@ -67,7 +67,9 @@ QTM_END_NAMESPACE
 
 #define QMediaServiceProviderFactoryInterface_iid \
     "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0"
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QtMobility::QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid)
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
@@ -81,7 +83,9 @@ QTM_END_NAMESPACE
 
 #define QMediaServiceSupportedFormatsInterface_iid \
     "com.nokia.Qt.QMediaServiceSupportedFormatsInterface/1.0"
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QtMobility::QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid)
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
@@ -96,7 +100,9 @@ QTM_END_NAMESPACE
 
 #define QMediaServiceSupportedDevicesInterface_iid \
     "com.nokia.Qt.QMediaServiceSupportedDevicesInterface/1.0"
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QtMobility::QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid)
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
@@ -111,7 +117,9 @@ QTM_END_NAMESPACE
 //MOC doesn't recognire paramitized macros
 #define QMediaServiceFeaturesInterface_iid \
     "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0"
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QtMobility::QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid)
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qpaintervideosurface_p.h b/src/multimedia/qpaintervideosurface_p.h
index 3b4acaa8fd..457bcf1a36 100644
--- a/src/multimedia/qpaintervideosurface_p.h
+++ b/src/multimedia/qpaintervideosurface_p.h
@@ -61,7 +61,9 @@
 #include <QtMultimedia/qabstractvideosurface.h>
 #include <QtMultimedia/qvideoframe.h>
 
+QT_BEGIN_NAMESPACE
 class QGLContext;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qvideoencodercontrol.h b/src/multimedia/qvideoencodercontrol.h
index 50ec44ae89..701d8c3f82 100644
--- a/src/multimedia/qvideoencodercontrol.h
+++ b/src/multimedia/qvideoencodercontrol.h
@@ -48,9 +48,10 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qsize.h>
 
-
+QT_BEGIN_NAMESPACE
 class QByteArray;
 class QStringList;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qvideorenderercontrol.h b/src/multimedia/qvideorenderercontrol.h
index 81b3089687..6ec1b35ebb 100644
--- a/src/multimedia/qvideorenderercontrol.h
+++ b/src/multimedia/qvideorenderercontrol.h
@@ -43,7 +43,10 @@
 #define QVIDEORENDERERCONTROL_H
 
 #include <qmediacontrol.h>
+
+QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/publishsubscribe/qpacketprotocol_p.h b/src/publishsubscribe/qpacketprotocol_p.h
index 7a0fcca2cd..91de8937d9 100644
--- a/src/publishsubscribe/qpacketprotocol_p.h
+++ b/src/publishsubscribe/qpacketprotocol_p.h
@@ -46,8 +46,10 @@
 #include <QObject>
 #include <QDataStream>
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
 class QBuffer;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/serviceframework/qservicefilter.h b/src/serviceframework/qservicefilter.h
index 51c00a5ef0..de1940b51a 100644
--- a/src/serviceframework/qservicefilter.h
+++ b/src/serviceframework/qservicefilter.h
@@ -46,7 +46,9 @@
 
 #include "qmobilityglobal.h"
 
+QT_BEGIN_NAMESPACE
 class QDataStream;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/serviceframework/qserviceinterfacedescriptor.h b/src/serviceframework/qserviceinterfacedescriptor.h
index a11a384c21..3c463576ea 100644
--- a/src/serviceframework/qserviceinterfacedescriptor.h
+++ b/src/serviceframework/qserviceinterfacedescriptor.h
@@ -46,14 +46,18 @@
 #include <QVariant>
 #include "qmobilityglobal.h"
 
+QT_USE_NAMESPACE
+
 #ifdef SERVICE_XML_GENERATOR
 #undef Q_SFW_EXPORT
 #define Q_SFW_EXPORT
 #endif
 
+QT_BEGIN_NAMESPACE
 class QDebug;
 class QStringList;
 class QDataStream;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/serviceframework/qserviceplugininterface.h b/src/serviceframework/qserviceplugininterface.h
index 568aa22c37..0762c06a55 100644
--- a/src/serviceframework/qserviceplugininterface.h
+++ b/src/serviceframework/qserviceplugininterface.h
@@ -68,9 +68,11 @@ public:
 };
 QTM_END_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 //moc doesn't understand QTM_PREPEND_NAMESPACE() macro. we have to be explicit
 //Q_DECLARE_INTERFACE(QTM_PREPEND_NAMESPACE(QServicePluginInterface), "com.nokia.qt.QServicePluginInterface/1.0")
 Q_DECLARE_INTERFACE(QtMobility::QServicePluginInterface, "com.nokia.qt.QServicePluginInterface/1.0")
+QT_END_NAMESPACE
 
 QT_END_HEADER
 #endif
diff --git a/src/serviceframework/servicemetadata_p.h b/src/serviceframework/servicemetadata_p.h
index 320a1e05dc..81a374f97f 100644
--- a/src/serviceframework/servicemetadata_p.h
+++ b/src/serviceframework/servicemetadata_p.h
@@ -65,7 +65,9 @@
 #define Q_AUTOTEST_EXPORT
 #endif
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/systeminfo/qsysteminfo_linux_p.h b/src/systeminfo/qsysteminfo_linux_p.h
index 2102612629..c8f526d2d8 100644
--- a/src/systeminfo/qsysteminfo_linux_p.h
+++ b/src/systeminfo/qsysteminfo_linux_p.h
@@ -66,8 +66,10 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
 class QStringList;
 class QTimer;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/systeminfo/qsysteminfo_mac_p.h b/src/systeminfo/qsysteminfo_mac_p.h
index 111df14912..daf7b09edb 100644
--- a/src/systeminfo/qsysteminfo_mac_p.h
+++ b/src/systeminfo/qsysteminfo_mac_p.h
@@ -65,8 +65,10 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
 class QStringList;
 class QTimer;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/systeminfo/qsysteminfo_maemo_p.h b/src/systeminfo/qsysteminfo_maemo_p.h
index 5c3e24455c..c86c1fd9a1 100644
--- a/src/systeminfo/qsysteminfo_maemo_p.h
+++ b/src/systeminfo/qsysteminfo_maemo_p.h
@@ -66,8 +66,10 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
 class QStringList;
 class QTimer;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/systeminfo/qsysteminfo_win_p.h b/src/systeminfo/qsysteminfo_win_p.h
index 8edf39abb4..2640003b5b 100644
--- a/src/systeminfo/qsysteminfo_win_p.h
+++ b/src/systeminfo/qsysteminfo_win_p.h
@@ -68,8 +68,10 @@
 
 #include <QBasicTimer>
 
+QT_BEGIN_NAMESPACE
 class QStringList;
 class QTimer;
+QT_END_NAMESPACE
 
 QT_BEGIN_HEADER
 
diff --git a/src/versit/qversitcontactexporter_p.h b/src/versit/qversitcontactexporter_p.h
index d7ba186699..c9c1f537d6 100644
--- a/src/versit/qversitcontactexporter_p.h
+++ b/src/versit/qversitcontactexporter_p.h
@@ -52,9 +52,6 @@
 QTM_BEGIN_NAMESPACE
 class QContact;
 class QContactDetail;
-QTM_END_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
 
 class Q_AUTOTEST_EXPORT QVersitContactExporterPrivate : public QObject
 {
diff --git a/src/versit/qversitcontactimporter_p.h b/src/versit/qversitcontactimporter_p.h
index 07f63911b4..ec05b516dc 100644
--- a/src/versit/qversitcontactimporter_p.h
+++ b/src/versit/qversitcontactimporter_p.h
@@ -65,9 +65,6 @@ QTM_BEGIN_NAMESPACE
 class QContact;
 class QContactDetail;
 class QContactOrganization;
-QTM_END_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
 
 class QVersitProperty;
 class QVersitDocument;
diff --git a/src/versit/qversitreader.h b/src/versit/qversitreader.h
index 23c722c75e..846c991b9c 100644
--- a/src/versit/qversitreader.h
+++ b/src/versit/qversitreader.h
@@ -47,7 +47,9 @@
 
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp b/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp
index e2ec81f251..519e266fd9 100644
--- a/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp
+++ b/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp
@@ -49,7 +49,9 @@ class BoringInterface
         void doNothing() {}
 };
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(BoringInterface, "REALLYBORING!");
+QT_END_NAMESPACE
 
 class BoringFactory : public QObject, public BoringInterface
 {
diff --git a/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp b/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp
index 92c13865a5..7f97c37879 100644
--- a/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp
+++ b/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp
@@ -142,7 +142,9 @@ class BoringInterface
 
 };
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(BoringInterface, "REALLYBORING!")
+QT_END_NAMESPACE
 
 class BoringFactory : public QObject, public BoringInterface
 {
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
index b17d2ec025..8e286f017a 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
@@ -45,8 +45,10 @@
 
 #include <qnmeapositioninfosource.h>
 
+QT_BEGIN_NAMESPACE
 class QTcpServer;
 class QIODevice;
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QNmeaPositionInfoSource;
diff --git a/tests/bearerex/bearerex.h b/tests/bearerex/bearerex.h
index f18180e874..b8a2393d83 100644
--- a/tests/bearerex/bearerex.h
+++ b/tests/bearerex/bearerex.h
@@ -51,7 +51,10 @@
 #include "qnetworksession.h"
 #include "xqlistwidget.h"
 
+QT_BEGIN_NAMESPACE
 class QHttp;
+QT_END_NAMESPACE
+
 class SessionTab;
 
 QTM_USE_NAMESPACE
diff --git a/tests/messagingex/messagingex.cpp b/tests/messagingex/messagingex.cpp
index 913d5db62a..b3dde8ca52 100644
--- a/tests/messagingex/messagingex.cpp
+++ b/tests/messagingex/messagingex.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include "messagingex.h"
-#include "QMessageStore.h"
-#include "QMessageFilter.h"
+#include "qmessagestore.h"
+#include "qmessagefilter.h"
 #include <QFileDialog>
 
 MessagingEx::MessagingEx(QWidget* parent)
diff --git a/tests/messagingex/messagingex.h b/tests/messagingex/messagingex.h
index 45b6e8261d..720297afa9 100644
--- a/tests/messagingex/messagingex.h
+++ b/tests/messagingex/messagingex.h
@@ -48,9 +48,9 @@
 #include "ui_accountdialog.h"
 #include "ui_mmsreceiveddialog.h"
 
-#include "QMessageServiceAction.h"
-#include "QMessage.h"
-#include "QMessageAccount.h"
+#include "qmessageserviceaction.h"
+#include "qmessage.h"
+#include "qmessageaccount.h"
 
 QTM_USE_NAMESPACE
 
diff --git a/tests/publishsubscribeex/publishsubscribemainwindow.h b/tests/publishsubscribeex/publishsubscribemainwindow.h
index 49cfe7c7c0..3af115419a 100644
--- a/tests/publishsubscribeex/publishsubscribemainwindow.h
+++ b/tests/publishsubscribeex/publishsubscribemainwindow.h
@@ -45,9 +45,11 @@
 #include <QMainWindow>
 #include <qmobilityglobal.h>
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
     class PublishSubscribeMainWindow;
 }
+QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 class QValueSpaceSubscriber;
diff --git a/tools/qcrmlgen/qcrmlgen.h b/tools/qcrmlgen/qcrmlgen.h
index 10717bde92..bbd5454ee1 100644
--- a/tools/qcrmlgen/qcrmlgen.h
+++ b/tools/qcrmlgen/qcrmlgen.h
@@ -41,7 +41,16 @@
 #include <QMainWindow>
 #include <QItemDelegate>
 
+QT_BEGIN_NAMESPACE
 class QTableWidget;
+class QLabel;
+class QLineEdit;
+class QTableWidget;
+class QPushButton;
+class QAbstractButton;
+class QRadioButton;
+QT_END_NAMESPACE
+
 class EditorWidget;
 class QCrmlGenerator : public QMainWindow
 {
@@ -70,12 +79,6 @@ private:
     QString m_saveFile;
 };
 
-class QLabel;
-class QLineEdit;
-class QTableWidget;
-class QPushButton;
-class QAbstractButton;
-class QRadioButton;
 
 //#define INCL_TYPE 1
 
diff --git a/tools/servicexmlgen/errorcollector.h b/tools/servicexmlgen/errorcollector.h
index 3bf45bc527..ad78df20d3 100644
--- a/tools/servicexmlgen/errorcollector.h
+++ b/tools/servicexmlgen/errorcollector.h
@@ -43,6 +43,8 @@
 
 #include <QStringList>
 
+QT_USE_NAMESPACE
+
 class ErrorCollector
 {
 public:
diff --git a/tools/servicexmlgen/interfacewidget.h b/tools/servicexmlgen/interfacewidget.h
index c31c6b0a8b..e0f7b3bbeb 100644
--- a/tools/servicexmlgen/interfacewidget.h
+++ b/tools/servicexmlgen/interfacewidget.h
@@ -45,8 +45,11 @@
 #include <QWidget>
 #include <QXmlStreamWriter>
 
+QT_BEGIN_NAMESPACE
 class QLineEdit;
 class QSpinBox;
+QT_END_NAMESPACE
+
 class CapabilitiesWidget;
 class CustomPropertiesWidget;
 
diff --git a/tools/servicexmlgen/servicewidget.h b/tools/servicexmlgen/servicewidget.h
index 61933a0047..dbbeee0127 100644
--- a/tools/servicexmlgen/servicewidget.h
+++ b/tools/servicexmlgen/servicewidget.h
@@ -47,8 +47,10 @@
 
 #include <qmobilityglobal.h>
 
-
+QT_BEGIN_NAMESPACE
 class QLabel;
+QT_END_NAMESPACE
+
 QTM_BEGIN_NAMESPACE
 class ServiceMetaDataResults;
 QTM_END_NAMESPACE
diff --git a/tools/servicexmlgen/servicexmlgen.h b/tools/servicexmlgen/servicexmlgen.h
index 87ef59e392..b916420aae 100644
--- a/tools/servicexmlgen/servicexmlgen.h
+++ b/tools/servicexmlgen/servicexmlgen.h
@@ -44,13 +44,14 @@
 #include <qmobilityglobal.h>
 #include <QMainWindow>
 
-
+QT_BEGIN_NAMESPACE
 class QWidget;
 class QIODevice;
 class QPushButton;
-class ServiceWidget;
 class QPlainTextEdit;
+QT_END_NAMESPACE
 
+class ServiceWidget;
 
 class ServiceXmlGenerator : public QMainWindow
 {