diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
deleted file mode 100644
index c9e54d1972..0000000000
--- a/src/corelib/arch/arch.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-HEADERS += \
-    arch/qatomic_bootstrap.h \
-    arch/qatomic_cxx11.h
-
-qtConfig(std-atomic64): QMAKE_USE += libatomic
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 3db2e2ceb8..7f62a6f1b0 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -32,7 +32,6 @@ ANDROID_PERMISSIONS = \
 freebsd|openbsd: QMAKE_LFLAGS_NOUNDEF =
 
 include(animation/animation.pri)
-include(arch/arch.pri)
 include(global/global.pri)
 include(thread/thread.pri)
 include(tools/tools.pri)
diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/thread/qatomic_bootstrap.h
similarity index 100%
rename from src/corelib/arch/qatomic_bootstrap.h
rename to src/corelib/thread/qatomic_bootstrap.h
diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/thread/qatomic_cxx11.h
similarity index 100%
rename from src/corelib/arch/qatomic_cxx11.h
rename to src/corelib/thread/qatomic_cxx11.h
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
index e4972a57b3..47775f3fde 100644
--- a/src/corelib/thread/thread.pri
+++ b/src/corelib/thread/thread.pri
@@ -10,6 +10,8 @@ HEADERS += thread/qmutex.h \
            thread/qthreadstorage.h \
            thread/qwaitcondition.h \
            thread/qatomic.h \
+           thread/qatomic_bootstrap.h \
+           thread/qatomic_cxx11.h \
            thread/qbasicatomic.h \
            thread/qgenericatomic.h
 
@@ -67,3 +69,5 @@ win32 {
         thread/qthread_unix.cpp \
         thread/qwaitcondition_unix.cpp
 }
+
+qtConfig(std-atomic64): QMAKE_USE += libatomic