diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h
index 1a8dacae0fd..d81c8d85d89 100644
--- a/src/corelib/thread/qthreadstorage.h
+++ b/src/corelib/thread/qthreadstorage.h
@@ -6,10 +6,9 @@
 
 #include <QtCore/qglobal.h>
 
-#if QT_CONFIG(thread)
-
 QT_BEGIN_NAMESPACE
 
+#if QT_CONFIG(thread)
 
 class Q_CORE_EXPORT QThreadStorageData
 {
@@ -114,16 +113,12 @@ public:
     { qThreadStorage_setLocalData(d, &t); }
 };
 
-QT_END_NAMESPACE
-
 #else // !QT_CONFIG(thread)
 
 #include <QtCore/qscopedpointer.h>
 
 #include <type_traits>
 
-QT_BEGIN_NAMESPACE
-
 template <typename T, typename U>
 inline bool qThreadStorage_hasLocalData(const QScopedPointer<T, U> &data)
 {
@@ -193,8 +188,8 @@ public:
     }
 };
 
-QT_END_NAMESPACE
-
 #endif // QT_CONFIG(thread)
 
+QT_END_NAMESPACE
+
 #endif // QTHREADSTORAGE_H