diff --git a/src/corelib/kernel/qeventdispatcher_blackberry.cpp b/src/corelib/kernel/qeventdispatcher_blackberry.cpp
index 047e3dff077..7a70f5cb58f 100644
--- a/src/corelib/kernel/qeventdispatcher_blackberry.cpp
+++ b/src/corelib/kernel/qeventdispatcher_blackberry.cpp
@@ -49,6 +49,8 @@
 #define qEventDispatcherDebug QT_NO_QDEBUG_MACRO()
 #endif
 
+QT_BEGIN_NAMESPACE
+
 class BpsChannelScopeSwitcher
 {
 public:
diff --git a/src/corelib/kernel/qppsattribute.cpp b/src/corelib/kernel/qppsattribute.cpp
index 09d8d1bb0cd..b77ea0b6431 100644
--- a/src/corelib/kernel/qppsattribute.cpp
+++ b/src/corelib/kernel/qppsattribute.cpp
@@ -37,6 +37,8 @@
 #include <QDebug>
 #include <QVariant>
 
+QT_BEGIN_NAMESPACE
+
 ///////////////////////////
 //
 // QPpsAttributePrivate
@@ -297,3 +299,5 @@ QDebug operator<<(QDebug dbg, const QPpsAttribute &attribute)
 
     return dbg;
 }
+
+QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qppsattribute_p.h b/src/corelib/kernel/qppsattribute_p.h
index 209a8c3101e..73beb7c96f8 100644
--- a/src/corelib/kernel/qppsattribute_p.h
+++ b/src/corelib/kernel/qppsattribute_p.h
@@ -57,8 +57,6 @@ class QPpsAttribute;
 
 typedef QList<QPpsAttribute> QPpsAttributeList;
 typedef QMap<QString, QPpsAttribute> QPpsAttributeMap;
-Q_DECLARE_METATYPE(QPpsAttributeList)
-Q_DECLARE_METATYPE(QPpsAttributeMap)
 
 class Q_CORE_EXPORT QPpsAttribute
 {
@@ -128,4 +126,7 @@ Q_CORE_EXPORT QDebug operator<<(QDebug dbg, const QPpsAttribute &attribute);
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QPpsAttributeList)
+Q_DECLARE_METATYPE(QPpsAttributeMap)
+
 #endif // QPPSATTRIBUTE_P_H
diff --git a/src/corelib/kernel/qppsobject.cpp b/src/corelib/kernel/qppsobject.cpp
index 9a5ae3c7a4a..612e7568816 100644
--- a/src/corelib/kernel/qppsobject.cpp
+++ b/src/corelib/kernel/qppsobject.cpp
@@ -50,6 +50,8 @@
 
 #include <sys/pps.h>
 
+QT_BEGIN_NAMESPACE
+
 ///////////////////////////////////////////////////////////////////////////////
 static inline void safeAssign(bool *pointer, bool value)
 {
@@ -954,3 +956,5 @@ int QPpsObject::sendMessage(const QString &path, const QByteArray &ppsData)
 
     return EOK;
 }
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 5be9f19b3e7..ec7a98571d1 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -584,6 +584,6 @@ void QClipboard::emitChanged(Mode mode)
     emit changed(mode);
 }
 
-#endif // QT_NO_CLIPBOARD
-
 QT_END_NAMESPACE
+
+#endif // QT_NO_CLIPBOARD
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
index 9362f9cd0b6..4853dce9d97 100644
--- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp
+++ b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
@@ -55,6 +55,8 @@
 #define qFilePickerDebug QT_NO_QDEBUG_MACRO
 #endif
 
+QT_BEGIN_NAMESPACE
+
 static const char s_filePickerTarget[] = "sys.filepicker.target";
 
 QQnxFilePicker::QQnxFilePicker(QObject *parent)
@@ -322,3 +324,5 @@ QString QQnxFilePicker::modeToString(QQnxFilePicker::Mode mode) const
 
     return QStringLiteral("Picker");
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.h b/src/plugins/platforms/qnx/qqnxfilepicker.h
index 82df1ea32de..63832633d8f 100644
--- a/src/plugins/platforms/qnx/qqnxfilepicker.h
+++ b/src/plugins/platforms/qnx/qqnxfilepicker.h
@@ -38,6 +38,8 @@
 #include <QObject>
 #include <QStringList>
 
+QT_BEGIN_NAMESPACE
+
 struct navigator_invoke_invocation_t;
 
 class QQnxFilePicker : public QObject, public QAbstractNativeEventFilter
@@ -100,4 +102,6 @@ private:
     QString m_title;
 };
 
+QT_END_NAMESPACE
+
 #endif // QQNXFILEPICKER_H
diff --git a/src/plugins/platforms/qnx/qqnxsystemsettings.h b/src/plugins/platforms/qnx/qqnxsystemsettings.h
index 34022435729..1f0e425f718 100644
--- a/src/plugins/platforms/qnx/qqnxsystemsettings.h
+++ b/src/plugins/platforms/qnx/qqnxsystemsettings.h
@@ -37,10 +37,10 @@
 #include <QtCore/qhash.h>
 #include <qpa/qplatformtheme.h>
 
-class QPlatformFontDatabase;
-
 QT_BEGIN_NAMESPACE
 
+class QPlatformFontDatabase;
+
 QHash<QPlatformTheme::Font, QFont *> qt_qnx_createRoleFonts(QPlatformFontDatabase *fontDatabase);
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h
index faba3409d96..0ced2340b0d 100644
--- a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h
+++ b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h
@@ -86,4 +86,6 @@ private:
     static const size_t ms_bufferSize;
 };
 
+QT_END_NAMESPACE
+
 #endif // VIRTUALKEYBOARDPPS_H