diff --git a/arch/arm/include/aarch32/cortex_r/exc.h b/arch/arm/include/aarch32/cortex_r/exc.h
deleted file mode 100644
index 7c624faf379..00000000000
--- a/arch/arm/include/aarch32/cortex_r/exc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_EXC_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_EXC_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_a_r/exc.h> instead."
-#endif
-
-#include <aarch32/cortex_a_r/exc.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_EXC_H_ */
diff --git a/arch/arm/include/aarch32/cortex_r/stack.h b/arch/arm/include/aarch32/cortex_r/stack.h
deleted file mode 100644
index cf55110252a..00000000000
--- a/arch/arm/include/aarch32/cortex_r/stack.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_STACK_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_STACK_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_a_r/stack.h> instead."
-#endif
-
-#include <aarch32/cortex_a_r/stack.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_R_STACK_H_ */
diff --git a/arch/arm/include/cortex_m/cmse.h b/arch/arm/include/cortex_m/cmse.h
deleted file mode 100644
index 5810a2b5d17..00000000000
--- a/arch/arm/include/cortex_m/cmse.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_m/cmse.h> instead."
-#endif
-
-#include <aarch32/cortex_m/cmse.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ */
diff --git a/arch/arm/include/cortex_m/exc.h b/arch/arm/include/cortex_m/exc.h
deleted file mode 100644
index 9adbcee6ce9..00000000000
--- a/arch/arm/include/cortex_m/exc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_m/exc.h> instead."
-#endif
-
-#include <aarch32/cortex_m/exc.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ */
diff --git a/arch/arm/include/cortex_m/stack.h b/arch/arm/include/cortex_m/stack.h
deleted file mode 100644
index 71b0ec723d6..00000000000
--- a/arch/arm/include/cortex_m/stack.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_m/stack.h> instead."
-#endif
-
-#include <aarch32/cortex_m/stack.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ */
diff --git a/arch/arm/include/cortex_m/tz.h b/arch/arm/include/cortex_m/tz.h
deleted file mode 100644
index aaa96561beb..00000000000
--- a/arch/arm/include/cortex_m/tz.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_m/tz.h> instead."
-#endif
-
-#include <aarch32/cortex_m/tz.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ */
diff --git a/arch/arm/include/cortex_r/exc.h b/arch/arm/include/cortex_r/exc.h
deleted file mode 100644
index 36f01b9b17e..00000000000
--- a/arch/arm/include/cortex_r/exc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_a_r/exc.h> instead."
-#endif
-
-#include <aarch32/cortex_a_r/exc.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_EXC_H_ */
diff --git a/arch/arm/include/cortex_r/stack.h b/arch/arm/include/cortex_r/stack.h
deleted file mode 100644
index 312b5ce0f5f..00000000000
--- a/arch/arm/include/cortex_r/stack.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <aarch32/cortex_a_r/stack.h> instead."
-#endif
-
-#include <aarch32/cortex_a_r/stack.h>
-
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_R_STACK_H_ */
diff --git a/arch/arm/include/kernel_arch_data.h b/arch/arm/include/kernel_arch_data.h
index 7dab6758d95..d9aa83d8f13 100644
--- a/arch/arm/include/kernel_arch_data.h
+++ b/arch/arm/include/kernel_arch_data.h
@@ -28,8 +28,8 @@
 #include <aarch32/cortex_m/stack.h>
 #include <aarch32/cortex_m/exc.h>
 #elif defined(CONFIG_CPU_CORTEX_R)
-#include <aarch32/cortex_r/stack.h>
-#include <aarch32/cortex_r/exc.h>
+#include <aarch32/cortex_a_r/stack.h>
+#include <aarch32/cortex_a_r/exc.h>
 #elif defined(CONFIG_CPU_CORTEX_A)
 #include <aarch64/exc.h>
 #endif
diff --git a/include/arch/arm/aarch32/cortex_r/cmsis.h b/include/arch/arm/aarch32/cortex_r/cmsis.h
deleted file mode 100644
index 22e74409198..00000000000
--- a/include/arch/arm/aarch32/cortex_r/cmsis.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/cortex_a_r/cpu.h> instead."
-#endif
-
-#include <arch/arm/aarch32/cortex_a_r/cpu.h>
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CMSIS_H_ */
diff --git a/include/arch/arm/aarch32/cortex_r/cpu.h b/include/arch/arm/aarch32/cortex_r/cpu.h
deleted file mode 100644
index 7941a954fcd..00000000000
--- a/include/arch/arm/aarch32/cortex_r/cpu.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CPU_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/cortex_a_r/cpu.h> instead."
-#endif
-
-#include <arch/arm/aarch32/cortex_a_r/cpu.h>
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_CPU_H_ */
diff --git a/include/arch/arm/aarch32/cortex_r/sys_io.h b/include/arch/arm/aarch32/cortex_r/sys_io.h
deleted file mode 100644
index a2444d51476..00000000000
--- a/include/arch/arm/aarch32/cortex_r/sys_io.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/cortex_a_r/sys_io.h> instead."
-#endif
-
-#include <arch/arm/aarch32/cortex_a_r/sys_io.h>
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ */