diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h
index 77d15485b6f..909203dc64b 100644
--- a/src/corelib/thread/qthreadstorage.h
+++ b/src/corelib/thread/qthreadstorage.h
@@ -6,6 +6,10 @@
 
 #include <QtCore/qglobal.h>
 
+#if !QT_CONFIG(thread)
+#include <memory>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 #if QT_CONFIG(thread)
@@ -115,9 +119,6 @@ public:
 
 #else // !QT_CONFIG(thread)
 
-#include <memory>
-#include <type_traits>
-
 template <typename T, typename U>
 inline bool qThreadStorage_hasLocalData(const std::unique_ptr<T, U> &data)
 {