The qthreadstorage.h header contains two implementations controlled by the QT_CONFIG(thread) definition. Commit 8553ffd8d147ecf6a713d12a360027b477dd59c8 changed the positions of the namespace macros in the header, but didn't consider the fact that we now include std and Qt headers inside QT_NAMESPACE in the !QT_CONFIG(thread) case. Fix it by moving all the includes to the top, and wrapping them in the needed QT_CONFIG() checks. As a drive-by, drop the unused type_traits include. Found in Qt 6.9 API review, but picking down to 6.5, as that's what the original commit did. Note that 6.5 cherry-pick will require to replace <memory> with QtCore/qscopedpointer.h because 6da1f72311b844b2232da3067ad6e1e24614e67c was never picked to that branch. Pick-to: 6.9 6.8 6.5 Change-Id: Ic9c5fe82df38a3bd64829c016de8dcbd9f060315 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>