diff --git a/core/include/thread.h b/core/include/thread.h
index 233f7a07fe..8e0dcca5a7 100644
--- a/core/include/thread.h
+++ b/core/include/thread.h
@@ -122,7 +122,6 @@
 #include "clist.h"
 #include "cib.h"
 #include "msg.h"
-#include "cpu_conf.h"
 #include "sched.h"
 #include "thread_config.h"
 
@@ -207,9 +206,6 @@ struct _thread {
 #ifdef PICOLIBC_TLS
     void *tls;                      /**< thread local storage ptr */
 #endif
-#ifdef HAVE_THREAD_ARCH_T
-    thread_arch_t arch;             /**< architecture dependent part    */
-#endif
 };
 
 /**
diff --git a/cpu/cortexm_common/include/thread_arch.h b/cpu/cortexm_common/include/thread_arch.h
index 5a05e82724..84d67da0c4 100644
--- a/cpu/cortexm_common/include/thread_arch.h
+++ b/cpu/cortexm_common/include/thread_arch.h
@@ -20,6 +20,8 @@
 #ifndef THREAD_ARCH_H
 #define THREAD_ARCH_H
 
+#include "cpu_conf.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif