6 files changed, 29 insertions, 2 deletions
diff --git a/examples/qtmail/detailspage_p.h b/examples/qtmail/detailspage_p.h
index 93be97b5..ff2ca44e 100644
--- a/examples/qtmail/detailspage_p.h
+++ b/examples/qtmail/detailspage_p.h
@@ -50,12 +50,17 @@
 #include <qstringlist.h>
 #include <qmailmessage.h>
 
+QT_BEGIN_NAMESPACE
+
 class QLineEdit;
 class QHBoxLayout;
 class QComboBox;
 class QToolButton;
 class QLabel;
 class QCheckBox;
+
+QT_END_NAMESPACE
+
 class QMailAccount;
 class QMailAccountId;
 
diff --git a/examples/qtmail/statusbar.h b/examples/qtmail/statusbar.h
index 3e64afb4..51284c78 100644
--- a/examples/qtmail/statusbar.h
+++ b/examples/qtmail/statusbar.h
@@ -36,8 +36,13 @@
 
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
+
 class QProgressBar;
 class QLabel;
+
+QT_END_NAMESPACE
+
 class ArrowButton;
 
 class StatusBar : public QWidget
diff --git a/examples/serverobserver/serverobserver.h b/examples/serverobserver/serverobserver.h
index 1b89a9b7..52ba4d0e 100644
--- a/examples/serverobserver/serverobserver.h
+++ b/examples/serverobserver/serverobserver.h
@@ -42,10 +42,15 @@
 
 #include <qmailserviceaction.h>
 
+QT_BEGIN_NAMESPACE
+
 class QLabel;
 class QProgressBar;
 class QPushButton;
 class QLayout;
+
+QT_END_NAMESPACE
+
 class RowWidget;
 
 class ServerObserver : public QMainWindow
diff --git a/src/libraries/qmfclient/qprivateimplementation.h b/src/libraries/qmfclient/qprivateimplementation.h
index 053b793f..21c76d1b 100644
--- a/src/libraries/qmfclient/qprivateimplementation.h
+++ b/src/libraries/qmfclient/qprivateimplementation.h
@@ -238,8 +238,11 @@ template <class T>
 Q_INLINE_TEMPLATE void qSwap(QPrivateImplementationPointer<T> &p1, QPrivateImplementationPointer<T> &p2)
 { p1.swap(p2); }
 
+QT_BEGIN_NAMESPACE
+
 template<typename T> Q_DECLARE_TYPEINFO_BODY(QPrivateImplementationPointer<T>, Q_MOVABLE_TYPE);
 
+QT_END_NAMESPACE
 
 template<typename ImplementationType>
 class QMF_EXPORT QPrivatelyImplemented
diff --git a/src/plugins/messageservices/smtp/smtpclient.h b/src/plugins/messageservices/smtp/smtpclient.h
index abb54ddd..e8ac9519 100644
--- a/src/plugins/messageservices/smtp/smtpclient.h
+++ b/src/plugins/messageservices/smtp/smtpclient.h
@@ -43,8 +43,12 @@
 #include <qmailmessageserver.h>
 #include <qmailtransport.h>
 
+QT_BEGIN_NAMESPACE
+
 class QTemporaryFile;
 
+QT_END_NAMESPACE
+
 struct RawEmail
 {
     QString from;
diff --git a/src/plugins/messageservices/smtp/smtpservice.h b/src/plugins/messageservices/smtp/smtpservice.h
index dd097441..25424509 100644
--- a/src/plugins/messageservices/smtp/smtpservice.h
+++ b/src/plugins/messageservices/smtp/smtpservice.h
@@ -39,6 +39,12 @@
 
 #include <QPointer>
 
+QT_BEGIN_NAMESPACE
+
+class QNetworkConfigurationManager;
+
+QT_END_NAMESPACE
+
 class SmtpService : public QMailMessageService
 {
     Q_OBJECT
@@ -80,10 +86,9 @@ private:
     Sink *_sink;
     QMailTransmitAction *_capabilityFetchAction;
     QTimer *_capabilityFetchTimeout;
-    class QNetworkConfigurationManager *_networkManager;
+    QNetworkConfigurationManager *_networkManager;
 };
 
-
 class SmtpServicePlugin : public QMailMessageServicePlugin
 {
     Q_OBJECT