diff --git a/arch/arm64/core/smp.c b/arch/arm64/core/smp.c
index 97fd60b4236..76ccd770908 100644
--- a/arch/arm64/core/smp.c
+++ b/arch/arm64/core/smp.c
@@ -21,7 +21,7 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/drivers/interrupt_controller/gic.h>
 #include <zephyr/drivers/pm_cpu_ops.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 #include <zephyr/sys/barrier.h>
 #include <zephyr/irq.h>
 #include "boot.h"
diff --git a/arch/riscv/core/pmp.c b/arch/riscv/core/pmp.c
index bfeb1c025cd..3807b3b103b 100644
--- a/arch/riscv/core/pmp.c
+++ b/arch/riscv/core/pmp.c
@@ -29,7 +29,7 @@
 #include <kernel_internal.h>
 #include <zephyr/linker/linker-defs.h>
 #include <pmp.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 #include <zephyr/arch/riscv/csr.h>
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
diff --git a/arch/xtensa/include/xtensa_internal.h b/arch/xtensa/include/xtensa_internal.h
index b97c109a994..60b512ab571 100644
--- a/arch/xtensa/include/xtensa_internal.h
+++ b/arch/xtensa/include/xtensa_internal.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 #include <zephyr/arch/xtensa/exception.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 /**
  * @ingroup xtensa_internal_apis
diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c
index 4313bbecfac..47e4940e139 100644
--- a/drivers/interrupt_controller/intc_cavs.c
+++ b/drivers/interrupt_controller/intc_cavs.c
@@ -10,7 +10,7 @@
 #include <zephyr/device.h>
 #include <zephyr/irq.h>
 #include <zephyr/irq_nextlevel.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 #include "intc_cavs.h"
 
 #if defined(CONFIG_SMP) && (CONFIG_MP_MAX_NUM_CPUS > 1)
diff --git a/drivers/sensor/qdec_nxp_s32/qdec_nxp_s32.c b/drivers/sensor/qdec_nxp_s32/qdec_nxp_s32.c
index 1b233d500e5..56e31f357f4 100644
--- a/drivers/sensor/qdec_nxp_s32/qdec_nxp_s32.c
+++ b/drivers/sensor/qdec_nxp_s32/qdec_nxp_s32.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/sensor.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
diff --git a/include/zephyr/sys/arch_interface.h b/include/zephyr/arch/arch_interface.h
similarity index 99%
rename from include/zephyr/sys/arch_interface.h
rename to include/zephyr/arch/arch_interface.h
index 0ffc95c663b..9faa9df005f 100644
--- a/include/zephyr/sys/arch_interface.h
+++ b/include/zephyr/arch/arch_interface.h
@@ -24,8 +24,8 @@
  * include/kernel.h and other public headers depend on definitions in this
  * header.
  */
-#ifndef ZEPHYR_INCLUDE_SYS_ARCH_INTERFACE_H_
-#define ZEPHYR_INCLUDE_SYS_ARCH_INTERFACE_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARCH_INTERFACE_H_
+#define ZEPHYR_INCLUDE_ARCH_ARCH_INTERFACE_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/toolchain.h>
@@ -1248,4 +1248,4 @@ void arch_spin_relax(void);
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_SYS_ARCH_INTERFACE_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARCH_INTERFACE_H_ */
diff --git a/include/zephyr/arch/cpu.h b/include/zephyr/arch/cpu.h
index 17ec125b395..11abe8df8c0 100644
--- a/include/zephyr/arch/cpu.h
+++ b/include/zephyr/arch/cpu.h
@@ -9,7 +9,7 @@
 #ifndef ZEPHYR_INCLUDE_ARCH_CPU_H_
 #define ZEPHYR_INCLUDE_ARCH_CPU_H_
 
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 #if defined(CONFIG_X86)
 #include <zephyr/arch/x86/arch.h>
diff --git a/include/zephyr/internal/syscall_handler.h b/include/zephyr/internal/syscall_handler.h
index a9b9a642c76..d3879621917 100644
--- a/include/zephyr/internal/syscall_handler.h
+++ b/include/zephyr/internal/syscall_handler.h
@@ -17,7 +17,7 @@
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/kernel.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 #include <zephyr/sys/math_extras.h>
 #include <stdbool.h>
 #include <zephyr/logging/log.h>
diff --git a/include/zephyr/kernel/thread.h b/include/zephyr/kernel/thread.h
index 91cf710e870..c319404f44f 100644
--- a/include/zephyr/kernel/thread.h
+++ b/include/zephyr/kernel/thread.h
@@ -12,7 +12,7 @@
 #endif
 
 #include <zephyr/kernel/stats.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 /**
  * @typedef k_thread_entry_t
diff --git a/include/zephyr/timing/timing.h b/include/zephyr/timing/timing.h
index a0c4a644abb..d4191d10b3e 100644
--- a/include/zephyr/timing/timing.h
+++ b/include/zephyr/timing/timing.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_INCLUDE_TIMING_TIMING_H_
 #define ZEPHYR_INCLUDE_TIMING_TIMING_H_
 
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 #include <zephyr/timing/types.h>
 
 #ifdef __cplusplus
diff --git a/kernel/include/kernel_arch_interface.h b/kernel/include/kernel_arch_interface.h
index 73884463520..a20c7a706bb 100644
--- a/kernel/include/kernel_arch_interface.h
+++ b/kernel/include/kernel_arch_interface.h
@@ -9,7 +9,7 @@
  * @brief Internal kernel APIs implemented at the architecture layer.
  *
  * Not all architecture-specific defines are here, APIs that are used
- * by public functions and macros are defined in include/sys/arch_interface.h.
+ * by public functions and macros are defined in include/zephyr/arch/arch_interface.h.
  *
  * For all inline functions prototyped here, the implementation is expected
  * to be provided by arch/ARCH/include/kernel_arch_func.h
@@ -18,7 +18,7 @@
 #define ZEPHYR_KERNEL_INCLUDE_KERNEL_ARCH_INTERFACE_H_
 
 #include <zephyr/kernel.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 #ifndef _ASMLANGUAGE
 
diff --git a/samples/kernel/condition_variables/condvar/src/main.c b/samples/kernel/condition_variables/condvar/src/main.c
index 7f7278814ca..5eb064e4078 100644
--- a/samples/kernel/condition_variables/condvar/src/main.c
+++ b/samples/kernel/condition_variables/condvar/src/main.c
@@ -5,7 +5,6 @@
  */
 #include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
-#include <zephyr/sys/arch_interface.h>
 
 #define NUM_THREADS 3
 #define TCOUNT 10
diff --git a/samples/kernel/condition_variables/simple/src/main.c b/samples/kernel/condition_variables/simple/src/main.c
index d8aba186a3d..6fc2951b72e 100644
--- a/samples/kernel/condition_variables/simple/src/main.c
+++ b/samples/kernel/condition_variables/simple/src/main.c
@@ -6,7 +6,6 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/arch/cpu.h>
-#include <zephyr/sys/arch_interface.h>
 
 #define NUM_THREADS 20
 #define STACK_SIZE (1024)
diff --git a/subsys/shell/modules/device_service.c b/subsys/shell/modules/device_service.c
index c11c8b4a7b9..fec4b25f6b9 100644
--- a/subsys/shell/modules/device_service.c
+++ b/subsys/shell/modules/device_service.c
@@ -12,7 +12,7 @@
 #include <zephyr/device.h>
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 static const char *get_device_name(const struct device *dev,
 				   char *buf,
diff --git a/subsys/testsuite/include/zephyr/interrupt_util.h b/subsys/testsuite/include/zephyr/interrupt_util.h
index 61d1206d5f8..0bccd53cc51 100644
--- a/subsys/testsuite/include/zephyr/interrupt_util.h
+++ b/subsys/testsuite/include/zephyr/interrupt_util.h
@@ -109,7 +109,7 @@ static inline void trigger_irq(int irq)
 #include <zephyr/drivers/interrupt_controller/loapic.h>
 #define VECTOR_MASK 0xFF
 #else
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 #define LOAPIC_ICR_IPI_TEST  0x00004000U
 #endif
 
diff --git a/subsys/testsuite/ztest/include/zephyr/arch/cpu.h b/subsys/testsuite/ztest/include/zephyr/arch/cpu.h
index 5969b0ce109..db65632029e 100644
--- a/subsys/testsuite/ztest/include/zephyr/arch/cpu.h
+++ b/subsys/testsuite/ztest/include/zephyr/arch/cpu.h
@@ -61,7 +61,7 @@ static inline bool arch_irq_unlocked(unsigned int key)
 }
 #endif /* __cplusplus */
 
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 
 #endif /* ZEPHYR_SUBSYS_TESTSUITE_ZTEST_INCLUDE_ARCH_CPU_H */
diff --git a/tests/arch/common/timing/src/main.c b/tests/arch/common/timing/src/main.c
index 4beaee01f87..83ff500a114 100644
--- a/tests/arch/common/timing/src/main.c
+++ b/tests/arch/common/timing/src/main.c
@@ -5,7 +5,7 @@
  */
 #include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
-#include <zephyr/sys/arch_interface.h>
+#include <zephyr/arch/arch_interface.h>
 
 #if defined(CONFIG_SMP) && CONFIG_MP_MAX_NUM_CPUS > 1
 #define SMP_TEST