diff --git a/arch/arm/src/a1x/a1x_boot.c b/arch/arm/src/a1x/a1x_boot.c
index bd42d483590..d6effb2173a 100644
--- a/arch/arm/src/a1x/a1x_boot.c
+++ b/arch/arm/src/a1x/a1x_boot.c
@@ -36,8 +36,6 @@
 #include "mmu.h"
 #include "fpu.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "a1x_lowputc.h"
 #include "a1x_boot.h"
 
diff --git a/arch/arm/src/a1x/a1x_irq.c b/arch/arm/src/a1x/a1x_irq.c
index dc34aca9178..11d5f013b8f 100644
--- a/arch/arm/src/a1x/a1x_irq.c
+++ b/arch/arm/src/a1x/a1x_irq.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sctlr.h"
 
diff --git a/arch/arm/src/a1x/a1x_lowputc.c b/arch/arm/src/a1x/a1x_lowputc.c
index b8de18069ad..4c4c3d203ef 100644
--- a/arch/arm/src/a1x/a1x_lowputc.c
+++ b/arch/arm/src/a1x/a1x_lowputc.c
@@ -30,8 +30,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "a1x_config.h"
 #include "hardware/a1x_uart.h"
 #include "a1x_pio.h"
diff --git a/arch/arm/src/a1x/a1x_pio.c b/arch/arm/src/a1x/a1x_pio.c
index ccfcd69f921..0cfd9ea64cb 100644
--- a/arch/arm/src/a1x/a1x_pio.c
+++ b/arch/arm/src/a1x/a1x_pio.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "a1x_pio.h"
 #include "hardware/a1x_pio.h"
diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c
index 6a6723c5a5f..2ac2c00185e 100644
--- a/arch/arm/src/a1x/a1x_serial.c
+++ b/arch/arm/src/a1x/a1x_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/a1x_uart.h"
 #include "a1x_pio.h"
diff --git a/arch/arm/src/a1x/a1x_timerisr.c b/arch/arm/src/a1x/a1x_timerisr.c
index 5b8f560fe49..4d70093c817 100644
--- a/arch/arm/src/a1x/a1x_timerisr.c
+++ b/arch/arm/src/a1x/a1x_timerisr.c
@@ -33,7 +33,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/a1x_timer.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/am335x/am335x_boot.c b/arch/arm/src/am335x/am335x_boot.c
index e917b57056b..43223174a83 100644
--- a/arch/arm/src/am335x/am335x_boot.c
+++ b/arch/arm/src/am335x/am335x_boot.c
@@ -40,8 +40,6 @@
 #include "mmu.h"
 #include "fpu.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "am335x_clockconfig.h"
 #include "am335x_wdog.h"
 #include "am335x_lowputc.h"
diff --git a/arch/arm/src/am335x/am335x_can.c b/arch/arm/src/am335x/am335x_can.c
index 859b12e3f65..906968b0257 100644
--- a/arch/arm/src/am335x/am335x_can.c
+++ b/arch/arm/src/am335x/am335x_can.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/can/can.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/am335x_pinmux.h"
 #include "hardware/am335x_prcm.h"
 #include "hardware/am335x_dcan.h"
diff --git a/arch/arm/src/am335x/am335x_clockconfig.c b/arch/arm/src/am335x/am335x_clockconfig.c
index 023ff5cef68..b4b08882361 100644
--- a/arch/arm/src/am335x/am335x_clockconfig.c
+++ b/arch/arm/src/am335x/am335x_clockconfig.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/am335x_prcm.h"
 #include "am335x_config.h"
 #include "am335x_clockconfig.h"
diff --git a/arch/arm/src/am335x/am335x_gpio.c b/arch/arm/src/am335x/am335x_gpio.c
index b96601fb016..ff47c9062e2 100644
--- a/arch/arm/src/am335x/am335x_gpio.c
+++ b/arch/arm/src/am335x/am335x_gpio.c
@@ -31,7 +31,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "am335x_pinmux.h"
 #include "am335x_gpio.h"
 
diff --git a/arch/arm/src/am335x/am335x_gpioirq.c b/arch/arm/src/am335x/am335x_gpioirq.c
index 049250089ad..ea05319fc67 100644
--- a/arch/arm/src/am335x/am335x_gpioirq.c
+++ b/arch/arm/src/am335x/am335x_gpioirq.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "am335x_gpio.h"
 
 #ifdef CONFIG_AM335X_GPIO_IRQ
diff --git a/arch/arm/src/am335x/am335x_i2c.c b/arch/arm/src/am335x/am335x_i2c.c
index 5a04f00a1d5..6aed9159e5d 100644
--- a/arch/arm/src/am335x/am335x_i2c.c
+++ b/arch/arm/src/am335x/am335x_i2c.c
@@ -41,7 +41,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/am335x_pinmux.h"
 #include "hardware/am335x_prcm.h"
 #include "hardware/am335x_i2c.h"
diff --git a/arch/arm/src/am335x/am335x_irq.c b/arch/arm/src/am335x/am335x_irq.c
index 7111c7d5178..cbe9af5d6bd 100644
--- a/arch/arm/src/am335x/am335x_irq.c
+++ b/arch/arm/src/am335x/am335x_irq.c
@@ -28,7 +28,6 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sctlr.h"
 
diff --git a/arch/arm/src/am335x/am335x_lcdc.c b/arch/arm/src/am335x/am335x_lcdc.c
index 14892521380..1d8f8b41f8d 100644
--- a/arch/arm/src/am335x/am335x_lcdc.c
+++ b/arch/arm/src/am335x/am335x_lcdc.c
@@ -56,7 +56,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/video/fb.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/am335x_prcm.h"
 #include "am335x_pinmux.h"
 #include "am335x_config.h"
diff --git a/arch/arm/src/am335x/am335x_lowputc.c b/arch/arm/src/am335x/am335x_lowputc.c
index e0dfa27077a..d434388f99c 100644
--- a/arch/arm/src/am335x/am335x_lowputc.c
+++ b/arch/arm/src/am335x/am335x_lowputc.c
@@ -30,8 +30,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "am335x_config.h"
 #include "am335x_gpio.h"
 #include "am335x_pinmux.h"
diff --git a/arch/arm/src/am335x/am335x_pinmux.c b/arch/arm/src/am335x/am335x_pinmux.c
index 23714bae5b3..02b87e45088 100644
--- a/arch/arm/src/am335x/am335x_pinmux.c
+++ b/arch/arm/src/am335x/am335x_pinmux.c
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "am335x_pinmux.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/am335x/am335x_serial.c b/arch/arm/src/am335x/am335x_serial.c
index 47e0d55dfd2..577bf673c6c 100644
--- a/arch/arm/src/am335x/am335x_serial.c
+++ b/arch/arm/src/am335x/am335x_serial.c
@@ -43,9 +43,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/am335x_uart.h"
 #include "am335x_gpio.h"
diff --git a/arch/arm/src/am335x/am335x_sysclk.c b/arch/arm/src/am335x/am335x_sysclk.c
index 618683f4163..698fcb7bff1 100644
--- a/arch/arm/src/am335x/am335x_sysclk.c
+++ b/arch/arm/src/am335x/am335x_sysclk.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/am335x_scm.h"
 #include "am335x_sysclk.h"
 
diff --git a/arch/arm/src/am335x/am335x_timerisr.c b/arch/arm/src/am335x/am335x_timerisr.c
index c96584e8e4e..b7cdb24fdb5 100644
--- a/arch/arm/src/am335x/am335x_timerisr.c
+++ b/arch/arm/src/am335x/am335x_timerisr.c
@@ -33,7 +33,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/am335x_timer.h"
 
 #include "am335x_sysclk.h"
diff --git a/arch/arm/src/am335x/am335x_wdog.c b/arch/arm/src/am335x/am335x_wdog.c
index ba71eaea674..2d51d9d45db 100644
--- a/arch/arm/src/am335x/am335x_wdog.c
+++ b/arch/arm/src/am335x/am335x_wdog.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/am335x_wdog.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/arm/arm_doirq.c b/arch/arm/src/arm/arm_doirq.c
index b0916660efa..03d58ec743b 100644
--- a/arch/arm/src/arm/arm_doirq.c
+++ b/arch/arm/src/arm/arm_doirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/arm/arm_initialstate.c b/arch/arm/src/arm/arm_initialstate.c
index eff64ecdfe1..be42f9bca38 100644
--- a/arch/arm/src/arm/arm_initialstate.c
+++ b/arch/arm/src/arm/arm_initialstate.c
@@ -31,7 +31,6 @@
 
 #include "arm.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/arm/arm_schedulesigaction.c b/arch/arm/src/arm/arm_schedulesigaction.c
index 031bab66c58..ac3ed172b92 100644
--- a/arch/arm/src/arm/arm_schedulesigaction.c
+++ b/arch/arm/src/arm/arm_schedulesigaction.c
@@ -34,7 +34,6 @@
 #include "arm.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/arm/arm_sigdeliver.c b/arch/arm/src/arm/arm_sigdeliver.c
index 7c51c14209b..153e4cb733f 100644
--- a/arch/arm/src/arm/arm_sigdeliver.c
+++ b/arch/arm/src/arm/arm_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/arm/arm_syscall.c b/arch/arm/src/arm/arm_syscall.c
index 5d13d177d69..e4b9c9857ae 100644
--- a/arch/arm/src/arm/arm_syscall.c
+++ b/arch/arm/src/arm/arm_syscall.c
@@ -31,7 +31,6 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv6-m/arm_doirq.c b/arch/arm/src/armv6-m/arm_doirq.c
index 6fce4d0a7d0..ce1967c62f5 100644
--- a/arch/arm/src/armv6-m/arm_doirq.c
+++ b/arch/arm/src/armv6-m/arm_doirq.c
@@ -32,7 +32,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv6-m/arm_dumpnvic.c b/arch/arm/src/armv6-m/arm_dumpnvic.c
index 505a93274a4..de8522c1d4a 100644
--- a/arch/arm/src/armv6-m/arm_dumpnvic.c
+++ b/arch/arm/src/armv6-m/arm_dumpnvic.c
@@ -29,8 +29,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nvic.h"
 
 #ifdef CONFIG_DEBUG_FEATURES
diff --git a/arch/arm/src/armv6-m/arm_hardfault.c b/arch/arm/src/armv6-m/arm_hardfault.c
index 15bfa0fe3fe..6684d0b08fb 100644
--- a/arch/arm/src/armv6-m/arm_hardfault.c
+++ b/arch/arm/src/armv6-m/arm_hardfault.c
@@ -31,7 +31,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv6-m/arm_initialstate.c b/arch/arm/src/armv6-m/arm_initialstate.c
index afa764a3e96..9f9683990e9 100644
--- a/arch/arm/src/armv6-m/arm_initialstate.c
+++ b/arch/arm/src/armv6-m/arm_initialstate.c
@@ -31,8 +31,6 @@
 #include <nuttx/arch.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "psr.h"
 #include "exc_return.h"
 
diff --git a/arch/arm/src/armv6-m/arm_ramvec_initialize.c b/arch/arm/src/armv6-m/arm_ramvec_initialize.c
index 1abdffc9f40..2fe0b02a0aa 100644
--- a/arch/arm/src/armv6-m/arm_ramvec_initialize.c
+++ b/arch/arm/src/armv6-m/arm_ramvec_initialize.c
@@ -35,7 +35,6 @@
 #include "ram_vectors.h"
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_ARCH_RAMVECTORS
diff --git a/arch/arm/src/armv6-m/arm_schedulesigaction.c b/arch/arm/src/armv6-m/arm_schedulesigaction.c
index 31376bf8206..41d7614dc6e 100644
--- a/arch/arm/src/armv6-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv6-m/arm_schedulesigaction.c
@@ -36,8 +36,6 @@
 #include "exc_return.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "irq/irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv6-m/arm_sigdeliver.c b/arch/arm/src/armv6-m/arm_sigdeliver.c
index b5049c7fdec..fd683e0e7ed 100644
--- a/arch/arm/src/armv6-m/arm_sigdeliver.c
+++ b/arch/arm/src/armv6-m/arm_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv6-m/arm_systemreset.c b/arch/arm/src/armv6-m/arm_systemreset.c
index c5ea3dd19ee..fd63b4bdce4 100644
--- a/arch/arm/src/armv6-m/arm_systemreset.c
+++ b/arch/arm/src/armv6-m/arm_systemreset.c
@@ -29,7 +29,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c
index 21dc09e4768..b4a0b5b3ea7 100644
--- a/arch/arm/src/armv7-a/arm_doirq.c
+++ b/arch/arm/src/armv7-a/arm_doirq.c
@@ -33,9 +33,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "group/group.h"
 #include "gic.h"
 
diff --git a/arch/arm/src/armv7-a/arm_gicv2.c b/arch/arm/src/armv7-a/arm_gicv2.c
index 34938c7c86b..acb12e5f209 100644
--- a/arch/arm/src/armv7-a/arm_gicv2.c
+++ b/arch/arm/src/armv7-a/arm_gicv2.c
@@ -32,7 +32,6 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "gic.h"
 
diff --git a/arch/arm/src/armv7-a/arm_gicv2_dump.c b/arch/arm/src/armv7-a/arm_gicv2_dump.c
index 8fc476f3f98..148fa74aab4 100644
--- a/arch/arm/src/armv7-a/arm_gicv2_dump.c
+++ b/arch/arm/src/armv7-a/arm_gicv2_dump.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "gic.h"
 
 #if defined(CONFIG_ARMV7A_HAVE_GICv2) && defined(CONFIG_DEBUG_IRQ_INFO)
diff --git a/arch/arm/src/armv7-a/arm_initialstate.c b/arch/arm/src/armv7-a/arm_initialstate.c
index 5cf5f929735..bc1bb0ef240 100644
--- a/arch/arm/src/armv7-a/arm_initialstate.c
+++ b/arch/arm/src/armv7-a/arm_initialstate.c
@@ -31,7 +31,6 @@
 
 #include "arm.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-a/arm_l2cc_pl310.c b/arch/arm/src/armv7-a/arm_l2cc_pl310.c
index 819a0246a96..9d9058077f7 100644
--- a/arch/arm/src/armv7-a/arm_l2cc_pl310.c
+++ b/arch/arm/src/armv7-a/arm_l2cc_pl310.c
@@ -36,7 +36,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "l2cc.h"
 #include "l2cc_pl310.h"
 
diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c b/arch/arm/src/armv7-a/arm_schedulesigaction.c
index 9aa8c78026d..efa730303ce 100644
--- a/arch/arm/src/armv7-a/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-a/arm_schedulesigaction.c
@@ -35,8 +35,6 @@
 #include "arm.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "irq/irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-a/arm_scu.c b/arch/arm/src/armv7-a/arm_scu.c
index 4fd63c9a828..8f0c6cac4d3 100644
--- a/arch/arm/src/armv7-a/arm_scu.c
+++ b/arch/arm/src/armv7-a/arm_scu.c
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cp15_cacheops.h"
 #include "barriers.h"
 #include "sctlr.h"
diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c
index 9f1684cb7a5..aeea069ae67 100644
--- a/arch/arm/src/armv7-a/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-a/arm_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h
index 761f3200272..7317c9f1ad1 100644
--- a/arch/arm/src/armv7-a/gic.h
+++ b/arch/arm/src/armv7-a/gic.h
@@ -41,7 +41,7 @@
 #endif
 
 #include "mpcore.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #ifdef CONFIG_ARMV7A_HAVE_GICv2
 
diff --git a/arch/arm/src/armv7-m/arm_busfault.c b/arch/arm/src/armv7-m/arm_busfault.c
index 81b07fce8c9..3be6ea11753 100644
--- a/arch/arm/src/armv7-m/arm_busfault.c
+++ b/arch/arm/src/armv7-m/arm_busfault.c
@@ -31,7 +31,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv7-m/arm_cache.c b/arch/arm/src/armv7-m/arm_cache.c
index f4153ea1d4a..86fb901cbde 100644
--- a/arch/arm/src/armv7-m/arm_cache.c
+++ b/arch/arm/src/armv7-m/arm_cache.c
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 #include <nuttx/cache.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "barriers.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/armv7-m/arm_doirq.c b/arch/arm/src/armv7-m/arm_doirq.c
index abea2e687ed..1aeda39faaa 100644
--- a/arch/arm/src/armv7-m/arm_doirq.c
+++ b/arch/arm/src/armv7-m/arm_doirq.c
@@ -32,7 +32,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_hardfault.c b/arch/arm/src/armv7-m/arm_hardfault.c
index 8b89dfd2bb6..bcd0ab08ac0 100644
--- a/arch/arm/src/armv7-m/arm_hardfault.c
+++ b/arch/arm/src/armv7-m/arm_hardfault.c
@@ -33,7 +33,6 @@
 #include <nuttx/userspace.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv7-m/arm_initialstate.c b/arch/arm/src/armv7-m/arm_initialstate.c
index 8e95a5d5486..7380ce0e86d 100644
--- a/arch/arm/src/armv7-m/arm_initialstate.c
+++ b/arch/arm/src/armv7-m/arm_initialstate.c
@@ -32,8 +32,6 @@
 #include <arch/armv7-m/nvicpri.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "psr.h"
 #include "exc_return.h"
 
diff --git a/arch/arm/src/armv7-m/arm_itm.c b/arch/arm/src/armv7-m/arm_itm.c
index 2349aea762d..f029f5520be 100644
--- a/arch/arm/src/armv7-m/arm_itm.c
+++ b/arch/arm/src/armv7-m/arm_itm.c
@@ -71,7 +71,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "itm.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_itm_syslog.c b/arch/arm/src/armv7-m/arm_itm_syslog.c
index 28c604963b0..2d3513129df 100644
--- a/arch/arm/src/armv7-m/arm_itm_syslog.c
+++ b/arch/arm/src/armv7-m/arm_itm_syslog.c
@@ -33,7 +33,7 @@
 #include "itm.h"
 #include "tpi.h"
 #include "dwt.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "itm_syslog.h"
 
 #ifdef CONFIG_ARMV7M_ITMSYSLOG
diff --git a/arch/arm/src/armv7-m/arm_memfault.c b/arch/arm/src/armv7-m/arm_memfault.c
index 0e4a7177d69..e1fec9341a9 100644
--- a/arch/arm/src/armv7-m/arm_memfault.c
+++ b/arch/arm/src/armv7-m/arm_memfault.c
@@ -30,7 +30,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv7-m/arm_ramvec_initialize.c b/arch/arm/src/armv7-m/arm_ramvec_initialize.c
index d4ba3fcb7f1..54f33746d05 100644
--- a/arch/arm/src/armv7-m/arm_ramvec_initialize.c
+++ b/arch/arm/src/armv7-m/arm_ramvec_initialize.c
@@ -35,7 +35,6 @@
 #include "ram_vectors.h"
 
 #include "chip.h"             /* May redefine VECTAB fields */
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_ARCH_RAMVECTORS
diff --git a/arch/arm/src/armv7-m/arm_schedulesigaction.c b/arch/arm/src/armv7-m/arm_schedulesigaction.c
index 25e81742445..fc27a7b7f76 100644
--- a/arch/arm/src/armv7-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-m/arm_schedulesigaction.c
@@ -37,8 +37,6 @@
 #include "exc_return.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "irq/irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_sigdeliver.c b/arch/arm/src/armv7-m/arm_sigdeliver.c
index e371224dd04..d98e68c81ed 100644
--- a/arch/arm/src/armv7-m/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-m/arm_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-m/arm_stackcheck.c b/arch/arm/src/armv7-m/arm_stackcheck.c
index 99e25c7a555..968a190c267 100644
--- a/arch/arm/src/armv7-m/arm_stackcheck.c
+++ b/arch/arm/src/armv7-m/arm_stackcheck.c
@@ -48,7 +48,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_systemreset.c b/arch/arm/src/armv7-m/arm_systemreset.c
index 0710744bc78..5ced78d93fc 100644
--- a/arch/arm/src/armv7-m/arm_systemreset.c
+++ b/arch/arm/src/armv7-m/arm_systemreset.c
@@ -29,7 +29,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_systick.c b/arch/arm/src/armv7-m/arm_systick.c
index d1b827e5dfc..7af6842e2ca 100644
--- a/arch/arm/src/armv7-m/arm_systick.c
+++ b/arch/arm/src/armv7-m/arm_systick.c
@@ -31,7 +31,7 @@
 
 #include "nvic.h"
 #include "systick.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #ifdef CONFIG_ARMV7M_SYSTICK
 
diff --git a/arch/arm/src/armv7-m/arm_trigger_irq.c b/arch/arm/src/armv7-m/arm_trigger_irq.c
index eadc04e4cdc..048053339f3 100644
--- a/arch/arm/src/armv7-m/arm_trigger_irq.c
+++ b/arch/arm/src/armv7-m/arm_trigger_irq.c
@@ -30,7 +30,7 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 #ifdef CONFIG_ARCH_HAVE_IRQTRIGGER
diff --git a/arch/arm/src/armv7-m/arm_usagefault.c b/arch/arm/src/armv7-m/arm_usagefault.c
index 9a759ccdb32..310ecc2196b 100644
--- a/arch/arm/src/armv7-m/arm_usagefault.c
+++ b/arch/arm/src/armv7-m/arm_usagefault.c
@@ -31,7 +31,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv7-m/dwt.h b/arch/arm/src/armv7-m/dwt.h
index 274c2ae0802..b09744fdb7f 100644
--- a/arch/arm/src/armv7-m/dwt.h
+++ b/arch/arm/src/armv7-m/dwt.h
@@ -69,7 +69,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index ff3292137d8..a296819ad24 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -33,8 +33,6 @@
 #  include <stdbool.h>
 #  include <assert.h>
 #  include <debug.h>
-
-#  include "arm_arch.h"
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-r/arm_doirq.c b/arch/arm/src/armv7-r/arm_doirq.c
index 659b748639e..c5c0b8ff591 100644
--- a/arch/arm/src/armv7-r/arm_doirq.c
+++ b/arch/arm/src/armv7-r/arm_doirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-r/arm_gicv2.c b/arch/arm/src/armv7-r/arm_gicv2.c
index f12507888ae..f95f775ee5e 100644
--- a/arch/arm/src/armv7-r/arm_gicv2.c
+++ b/arch/arm/src/armv7-r/arm_gicv2.c
@@ -33,7 +33,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "gic.h"
 
diff --git a/arch/arm/src/armv7-r/arm_initialstate.c b/arch/arm/src/armv7-r/arm_initialstate.c
index 1cf12adc80d..de799b3a90d 100644
--- a/arch/arm/src/armv7-r/arm_initialstate.c
+++ b/arch/arm/src/armv7-r/arm_initialstate.c
@@ -31,7 +31,6 @@
 
 #include "arm.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-r/arm_l2cc_pl310.c b/arch/arm/src/armv7-r/arm_l2cc_pl310.c
index de3bfa8cc04..c7af8c32b54 100644
--- a/arch/arm/src/armv7-r/arm_l2cc_pl310.c
+++ b/arch/arm/src/armv7-r/arm_l2cc_pl310.c
@@ -36,7 +36,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "l2cc.h"
 #include "l2cc_pl310.h"
 
diff --git a/arch/arm/src/armv7-r/arm_schedulesigaction.c b/arch/arm/src/armv7-r/arm_schedulesigaction.c
index 32f35130371..f55557b9a50 100644
--- a/arch/arm/src/armv7-r/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-r/arm_schedulesigaction.c
@@ -34,7 +34,6 @@
 #include "arm.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-r/arm_sigdeliver.c b/arch/arm/src/armv7-r/arm_sigdeliver.c
index 558278e60c0..5ebf367ae74 100644
--- a/arch/arm/src/armv7-r/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-r/arm_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h
index 39d4b97c784..5029b12fdc0 100644
--- a/arch/arm/src/armv7-r/mpu.h
+++ b/arch/arm/src/armv7-r/mpu.h
@@ -33,7 +33,6 @@
 #  include <stdbool.h>
 #  include <debug.h>
 
-#  include "arm_arch.h"
 #  include "sctlr.h"
 #  include "cp15.h"
 #endif
diff --git a/arch/arm/src/armv8-m/arm_busfault.c b/arch/arm/src/armv8-m/arm_busfault.c
index aae2bec914a..ce4d232a0fc 100644
--- a/arch/arm/src/armv8-m/arm_busfault.c
+++ b/arch/arm/src/armv8-m/arm_busfault.c
@@ -31,7 +31,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv8-m/arm_cache.c b/arch/arm/src/armv8-m/arm_cache.c
index c7814a81049..4b2b5497877 100644
--- a/arch/arm/src/armv8-m/arm_cache.c
+++ b/arch/arm/src/armv8-m/arm_cache.c
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 #include <nuttx/cache.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "barriers.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/armv8-m/arm_doirq.c b/arch/arm/src/armv8-m/arm_doirq.c
index bbbba302ce1..5cc87802c95 100644
--- a/arch/arm/src/armv8-m/arm_doirq.c
+++ b/arch/arm/src/armv8-m/arm_doirq.c
@@ -32,7 +32,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_hardfault.c b/arch/arm/src/armv8-m/arm_hardfault.c
index c730d1e87c5..f5af2ab71e9 100644
--- a/arch/arm/src/armv8-m/arm_hardfault.c
+++ b/arch/arm/src/armv8-m/arm_hardfault.c
@@ -32,7 +32,6 @@
 #include <nuttx/userspace.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "sau.h"
 #include "arm_internal.h"
diff --git a/arch/arm/src/armv8-m/arm_initialstate.c b/arch/arm/src/armv8-m/arm_initialstate.c
index 99f19125c70..81a6959d521 100644
--- a/arch/arm/src/armv8-m/arm_initialstate.c
+++ b/arch/arm/src/armv8-m/arm_initialstate.c
@@ -32,8 +32,6 @@
 #include <arch/armv8-m/nvicpri.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "psr.h"
 #include "exc_return.h"
 
diff --git a/arch/arm/src/armv8-m/arm_itm.c b/arch/arm/src/armv8-m/arm_itm.c
index 70497777459..fe3b90f10c2 100644
--- a/arch/arm/src/armv8-m/arm_itm.c
+++ b/arch/arm/src/armv8-m/arm_itm.c
@@ -70,7 +70,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "itm.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_itm_syslog.c b/arch/arm/src/armv8-m/arm_itm_syslog.c
index 325a99d502a..2c4d2f68ff5 100644
--- a/arch/arm/src/armv8-m/arm_itm_syslog.c
+++ b/arch/arm/src/armv8-m/arm_itm_syslog.c
@@ -33,7 +33,7 @@
 #include "itm.h"
 #include "tpi.h"
 #include "dwt.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "itm_syslog.h"
 
 #ifdef CONFIG_ARMV8M_ITMSYSLOG
diff --git a/arch/arm/src/armv8-m/arm_memfault.c b/arch/arm/src/armv8-m/arm_memfault.c
index a1f4d5dfa0f..4c459e97a9c 100644
--- a/arch/arm/src/armv8-m/arm_memfault.c
+++ b/arch/arm/src/armv8-m/arm_memfault.c
@@ -30,7 +30,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv8-m/arm_ramvec_initialize.c b/arch/arm/src/armv8-m/arm_ramvec_initialize.c
index 9d00e9f13fc..7eb7409d402 100644
--- a/arch/arm/src/armv8-m/arm_ramvec_initialize.c
+++ b/arch/arm/src/armv8-m/arm_ramvec_initialize.c
@@ -34,7 +34,6 @@
 #include "ram_vectors.h"
 
 #include "chip.h"             /* May redefine VECTAB fields */
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_ARCH_RAMVECTORS
diff --git a/arch/arm/src/armv8-m/arm_schedulesigaction.c b/arch/arm/src/armv8-m/arm_schedulesigaction.c
index b5cb1826ba9..8926dda8402 100644
--- a/arch/arm/src/armv8-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv8-m/arm_schedulesigaction.c
@@ -37,8 +37,6 @@
 #include "exc_return.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "irq/irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_secure_irq.c b/arch/arm/src/armv8-m/arm_secure_irq.c
index d9854ae8aee..59913fefd01 100644
--- a/arch/arm/src/armv8-m/arm_secure_irq.c
+++ b/arch/arm/src/armv8-m/arm_secure_irq.c
@@ -30,7 +30,7 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 #ifdef CONFIG_ARCH_HAVE_TRUSTZONE
diff --git a/arch/arm/src/armv8-m/arm_securefault.c b/arch/arm/src/armv8-m/arm_securefault.c
index 39adb9f4ee4..84fba7fc44b 100644
--- a/arch/arm/src/armv8-m/arm_securefault.c
+++ b/arch/arm/src/armv8-m/arm_securefault.c
@@ -31,7 +31,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "sau.h"
 #include "arm_internal.h"
diff --git a/arch/arm/src/armv8-m/arm_sigdeliver.c b/arch/arm/src/armv8-m/arm_sigdeliver.c
index 2d86b685964..183d00eceba 100644
--- a/arch/arm/src/armv8-m/arm_sigdeliver.c
+++ b/arch/arm/src/armv8-m/arm_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/armv8-m/arm_stackcheck.c b/arch/arm/src/armv8-m/arm_stackcheck.c
index 0f18be17ace..ddc85e26ee9 100644
--- a/arch/arm/src/armv8-m/arm_stackcheck.c
+++ b/arch/arm/src/armv8-m/arm_stackcheck.c
@@ -48,7 +48,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_systemreset.c b/arch/arm/src/armv8-m/arm_systemreset.c
index 567ecd0f9f2..51dacc1acd9 100644
--- a/arch/arm/src/armv8-m/arm_systemreset.c
+++ b/arch/arm/src/armv8-m/arm_systemreset.c
@@ -29,7 +29,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_systick.c b/arch/arm/src/armv8-m/arm_systick.c
index 4751984c5af..c2800cc4156 100644
--- a/arch/arm/src/armv8-m/arm_systick.c
+++ b/arch/arm/src/armv8-m/arm_systick.c
@@ -31,7 +31,7 @@
 
 #include "nvic.h"
 #include "systick.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #ifdef CONFIG_ARMV8M_SYSTICK
 
diff --git a/arch/arm/src/armv8-m/arm_trigger_irq.c b/arch/arm/src/armv8-m/arm_trigger_irq.c
index 89e8e4b6633..9ffde567da6 100644
--- a/arch/arm/src/armv8-m/arm_trigger_irq.c
+++ b/arch/arm/src/armv8-m/arm_trigger_irq.c
@@ -30,7 +30,7 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 
 #ifdef CONFIG_ARCH_HAVE_IRQTRIGGER
diff --git a/arch/arm/src/armv8-m/arm_usagefault.c b/arch/arm/src/armv8-m/arm_usagefault.c
index 8f82112e66c..de91292b4cd 100644
--- a/arch/arm/src/armv8-m/arm_usagefault.c
+++ b/arch/arm/src/armv8-m/arm_usagefault.c
@@ -31,7 +31,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/armv8-m/mpu.h b/arch/arm/src/armv8-m/mpu.h
index 6e5dcdc0f72..3feb4124920 100644
--- a/arch/arm/src/armv8-m/mpu.h
+++ b/arch/arm/src/armv8-m/mpu.h
@@ -33,8 +33,6 @@
 #  include <stdbool.h>
 #  include <assert.h>
 #  include <debug.h>
-
-#  include "arm_arch.h"
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 31df990bd34..4ef77e3911d 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -49,7 +49,6 @@
 #endif
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/c5471/c5471_irq.c b/arch/arm/src/c5471/c5471_irq.c
index 038f6e73846..2423c51bab3 100644
--- a/arch/arm/src/c5471/c5471_irq.c
+++ b/arch/arm/src/c5471/c5471_irq.c
@@ -29,7 +29,6 @@
 
 #include "arm.h"
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c
index b5377fdc181..6800c915cb1 100644
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/arch/arm/src/c5471/c5471_serial.c
@@ -39,7 +39,6 @@
 #include <nuttx/serial/serial.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/c5471/c5471_timerisr.c b/arch/arm/src/c5471/c5471_timerisr.c
index ea94ea44ca8..6e22ba618c2 100644
--- a/arch/arm/src/c5471/c5471_timerisr.c
+++ b/arch/arm/src/c5471/c5471_timerisr.c
@@ -29,7 +29,6 @@
 #include <nuttx/arch.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c
index 231e0402189..b3006aba7ba 100644
--- a/arch/arm/src/c5471/c5471_watchdog.c
+++ b/arch/arm/src/c5471/c5471_watchdog.c
@@ -37,7 +37,7 @@
 #include <nuttx/timers/watchdog.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/common/arm_allocateheap.c b/arch/arm/src/common/arm_allocateheap.c
index 1ac550d89a8..28fffbdcb11 100644
--- a/arch/arm/src/common/arm_allocateheap.c
+++ b/arch/arm/src/common/arm_allocateheap.c
@@ -35,7 +35,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/common/arm_arch.h b/arch/arm/src/common/arm_arch.h
deleted file mode 100644
index aeea0167222..00000000000
--- a/arch/arm/src/common/arm_arch.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
- * arch/arm/src/common/arm_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef ___ARCH_ARM_SRC_COMMON_ARM_ARCH_H
-#define ___ARCH_ARM_SRC_COMMON_ARM_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-/* Non-atomic, but more effective modification of registers */
-
-# define modreg8(v,m,a)       putreg8((getreg8(a) & ~(m)) | ((v) & (m)), a)
-# define modreg16(v,m,a)      putreg16((getreg16(a) & ~(m)) | ((v) & (m)), a)
-# define modreg32(v,m,a)      putreg32((getreg32(a) & ~(m)) | ((v) & (m)), a)
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_ARM_SRC_COMMON_ARM_ARCH_H */
diff --git a/arch/arm/src/common/arm_assert.c b/arch/arm/src/common/arm_assert.c
index 89394dbff36..e3da777c3a9 100644
--- a/arch/arm/src/common/arm_assert.c
+++ b/arch/arm/src/common/arm_assert.c
@@ -39,8 +39,6 @@
 
 #include "sched/sched.h"
 #include "irq/irq.h"
-
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/common/arm_backtrace_fp.c b/arch/arm/src/common/arm_backtrace_fp.c
index c9373ec1259..6e3950fc9fd 100644
--- a/arch/arm/src/common/arm_backtrace_fp.c
+++ b/arch/arm/src/common/arm_backtrace_fp.c
@@ -27,7 +27,6 @@
 #include <nuttx/arch.h>
 
 #include "sched/sched.h"
-
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/common/arm_backtrace_thumb.c b/arch/arm/src/common/arm_backtrace_thumb.c
index 0cf8cb10f8d..00b587a1a7a 100644
--- a/arch/arm/src/common/arm_backtrace_thumb.c
+++ b/arch/arm/src/common/arm_backtrace_thumb.c
@@ -27,7 +27,6 @@
 #include <nuttx/arch.h>
 
 #include "sched/sched.h"
-
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/common/arm_createstack.c b/arch/arm/src/common/arm_createstack.c
index 025aa5844f6..3a1c467b80c 100644
--- a/arch/arm/src/common/arm_createstack.c
+++ b/arch/arm/src/common/arm_createstack.c
@@ -37,7 +37,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/common/arm_initialize.c b/arch/arm/src/common/arm_initialize.c
index cf34c5c868a..f8fef8190e5 100644
--- a/arch/arm/src/common/arm_initialize.c
+++ b/arch/arm/src/common/arm_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/common/arm_internal.h b/arch/arm/src/common/arm_internal.h
index 6066daa1fbc..cbd2ba6de25 100644
--- a/arch/arm/src/common/arm_internal.h
+++ b/arch/arm/src/common/arm_internal.h
@@ -182,6 +182,19 @@
 #define INTSTACK_COLOR 0xdeadbeef
 #define HEAP_COLOR     'h'
 
+#define getreg8(a)     (*(volatile uint8_t *)(a))
+#define putreg8(v,a)   (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)    (*(volatile uint16_t *)(a))
+#define putreg16(v,a)  (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)    (*(volatile uint32_t *)(a))
+#define putreg32(v,a)  (*(volatile uint32_t *)(a) = (v))
+
+/* Non-atomic, but more effective modification of registers */
+
+#define modreg8(v,m,a)  putreg8((getreg8(a) & ~(m)) | ((v) & (m)), (a))
+#define modreg16(v,m,a) putreg16((getreg16(a) & ~(m)) | ((v) & (m)), (a))
+#define modreg32(v,m,a) putreg32((getreg32(a) & ~(m)) | ((v) & (m)), (a))
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -301,6 +314,11 @@ EXTERN uint32_t _eramfuncs;       /* Copy destination end address in RAM */
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
 
 /* Low level initialization provided by board-level logic *******************/
 
diff --git a/arch/arm/src/common/arm_modifyreg16.c b/arch/arm/src/common/arm_modifyreg16.c
index b2280637594..7d837aa8de0 100644
--- a/arch/arm/src/common/arm_modifyreg16.c
+++ b/arch/arm/src/common/arm_modifyreg16.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/common/arm_modifyreg32.c b/arch/arm/src/common/arm_modifyreg32.c
index bdbf3091db0..9b46149e7c1 100644
--- a/arch/arm/src/common/arm_modifyreg32.c
+++ b/arch/arm/src/common/arm_modifyreg32.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/common/arm_modifyreg8.c b/arch/arm/src/common/arm_modifyreg8.c
index d819d269a3b..06ac317b106 100644
--- a/arch/arm/src/common/arm_modifyreg8.c
+++ b/arch/arm/src/common/arm_modifyreg8.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/cxd56xx/cxd56_adc.c b/arch/arm/src/cxd56xx/cxd56_adc.c
index b58f94de0d0..be483fbcca3 100644
--- a/arch/arm/src/cxd56xx/cxd56_adc.c
+++ b/arch/arm/src/cxd56xx/cxd56_adc.c
@@ -41,7 +41,7 @@
 #include <arch/chip/adc.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/cxd56_adc.h"
 #include "hardware/cxd56_scuseq.h"
 #include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_allocateheap.c b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
index e10326f4ddd..8117856e026 100644
--- a/arch/arm/src/cxd56xx/cxd56_allocateheap.c
+++ b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
@@ -35,7 +35,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/cxd56xx/cxd56_cisif.c b/arch/arm/src/cxd56xx/cxd56_cisif.c
index ac47b8e07d4..62888ef067f 100644
--- a/arch/arm/src/cxd56xx/cxd56_cisif.c
+++ b/arch/arm/src/cxd56xx/cxd56_cisif.c
@@ -36,8 +36,7 @@
 
 #include <arch/chip/cisif.h>
 #include <nuttx/video/imgdata.h>
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "cxd56_clock.h"
 #include "hardware/cxd56_cisif.h"
 
diff --git a/arch/arm/src/cxd56xx/cxd56_clock.c b/arch/arm/src/cxd56xx/cxd56_clock.c
index 98472cb85c3..e3a124d1460 100644
--- a/arch/arm/src/cxd56xx/cxd56_clock.c
+++ b/arch/arm/src/cxd56xx/cxd56_clock.c
@@ -32,8 +32,7 @@
 
 #include <arch/chip/pm.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/cxd56_crg.h"
 #include "hardware/cxd5602_backupmem.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_cpufifo.c b/arch/arm/src/cxd56xx/cxd56_cpufifo.c
index 34ffceb67a1..1a1230af212 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpufifo.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpufifo.c
@@ -30,8 +30,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/cxd56_cpufifo.h"
 #include "cxd56_cpufifo.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_cpuindex.c b/arch/arm/src/cxd56xx/cxd56_cpuindex.c
index 541d01d3539..dcc6171ee61 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpuindex.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpuindex.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_cpuindex.h"
 
 #ifdef CONFIG_SMP
diff --git a/arch/arm/src/cxd56xx/cxd56_cpupause.c b/arch/arm/src/cxd56xx/cxd56_cpupause.c
index a53233faee1..30337bec53b 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpupause.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpupause.c
@@ -34,7 +34,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
 #include "hardware/cxd5602_memorymap.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_cpustart.c b/arch/arm/src/cxd56xx/cxd56_cpustart.c
index bbdea2c4ddd..6c0bf94aa96 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpustart.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpustart.c
@@ -36,7 +36,6 @@
 #include <nuttx/sched_note.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "init/init.h"
 #include "arm_internal.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c
index 2fd8ca16b8b..f74857492d4 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -39,7 +39,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_clock.h"
 #include "cxd56_emmc.h"
 #include "hardware/cxd56_emmc.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_farapi.c b/arch/arm/src/cxd56xx/cxd56_farapi.c
index 6cf008e4b59..08662f51bd1 100644
--- a/arch/arm/src/cxd56xx/cxd56_farapi.c
+++ b/arch/arm/src/cxd56xx/cxd56_farapi.c
@@ -34,7 +34,6 @@
 
 #include <arch/chip/pm.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "chip.h"
 #include "cxd56_icc.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_ge2d.c b/arch/arm/src/cxd56xx/cxd56_ge2d.c
index 349f1616fbe..b7f379b95db 100644
--- a/arch/arm/src/cxd56xx/cxd56_ge2d.c
+++ b/arch/arm/src/cxd56xx/cxd56_ge2d.c
@@ -36,7 +36,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "cxd56_clock.h"
 
diff --git a/arch/arm/src/cxd56xx/cxd56_gpio.c b/arch/arm/src/cxd56xx/cxd56_gpio.c
index 395b5406f96..29da5772df4 100644
--- a/arch/arm/src/cxd56xx/cxd56_gpio.c
+++ b/arch/arm/src/cxd56xx/cxd56_gpio.c
@@ -32,8 +32,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "cxd56_pinconfig.h"
 #include "cxd56_gpio.h"
 #include "hardware/cxd5602_topreg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_gpioint.c b/arch/arm/src/cxd56xx/cxd56_gpioint.c
index 1428555ffd0..efbe8f876eb 100644
--- a/arch/arm/src/cxd56xx/cxd56_gpioint.c
+++ b/arch/arm/src/cxd56xx/cxd56_gpioint.c
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "cxd56_pinconfig.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_hostif.c b/arch/arm/src/cxd56xx/cxd56_hostif.c
index 1dac5b15175..efac07f0c05 100644
--- a/arch/arm/src/cxd56xx/cxd56_hostif.c
+++ b/arch/arm/src/cxd56xx/cxd56_hostif.c
@@ -39,8 +39,7 @@
 #include <arch/chip/hostif.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "cxd56_clock.h"
 #include "cxd56_pinconfig.h"
 #include "cxd56_icc.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.c b/arch/arm/src/cxd56xx/cxd56_i2c.c
index c206a382b76..105b629a356 100644
--- a/arch/arm/src/cxd56xx/cxd56_i2c.c
+++ b/arch/arm/src/cxd56xx/cxd56_i2c.c
@@ -40,9 +40,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "cxd56_clock.h"
 #include "cxd56_i2c.h"
 #include "hardware/cxd56_i2c.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_icc.c b/arch/arm/src/cxd56xx/cxd56_icc.c
index 6c714035245..7f4f9c78436 100644
--- a/arch/arm/src/cxd56xx/cxd56_icc.c
+++ b/arch/arm/src/cxd56xx/cxd56_icc.c
@@ -38,7 +38,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "cxd56_cpufifo.h"
 #include "cxd56_icc.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c
index bb2b95b0fcf..093fe092c3e 100644
--- a/arch/arm/src/cxd56xx/cxd56_irq.c
+++ b/arch/arm/src/cxd56xx/cxd56_irq.c
@@ -37,7 +37,6 @@
 #include "chip.h"
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_SMP
diff --git a/arch/arm/src/cxd56xx/cxd56_pinconfig.c b/arch/arm/src/cxd56xx/cxd56_pinconfig.c
index 95f06da874b..e4bb357c78e 100644
--- a/arch/arm/src/cxd56xx/cxd56_pinconfig.c
+++ b/arch/arm/src/cxd56xx/cxd56_pinconfig.c
@@ -32,8 +32,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "cxd56_pinconfig.h"
 #include "hardware/cxd5602_topreg.h"
 
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr.c b/arch/arm/src/cxd56xx/cxd56_powermgr.c
index 2c71c4a4123..1a9e2a47181 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr.c
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr.c
@@ -39,7 +39,6 @@
 #include <arch/chip/pm.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "cxd56_powermgr.h"
 #include "cxd56_icc.h"
 #include "cxd56_pmic.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
index 6f5549a97e8..4abcee58871 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
@@ -38,7 +38,7 @@
 
 #include "cxd56_clock.h"
 #include "cxd56_powermgr.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/cxd56_crg.h"
 #include "hardware/cxd5602_topreg.h"
 
diff --git a/arch/arm/src/cxd56xx/cxd56_pwm.c b/arch/arm/src/cxd56xx/cxd56_pwm.c
index 9a8c56b969f..3574089cfc7 100644
--- a/arch/arm/src/cxd56xx/cxd56_pwm.c
+++ b/arch/arm/src/cxd56xx/cxd56_pwm.c
@@ -34,8 +34,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "cxd56_pinconfig.h"
 #include "cxd56_clock.h"
 #include "cxd56_pwm.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c
index 48ca51aee69..03d74c8e970 100644
--- a/arch/arm/src/cxd56xx/cxd56_rtc.c
+++ b/arch/arm/src/cxd56xx/cxd56_rtc.c
@@ -41,7 +41,7 @@
 #include <arch/board/board.h>
 
 #include "clock/clock.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_rtc.h"
 
 #include "hardware/cxd5602_topreg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_scu.c b/arch/arm/src/cxd56xx/cxd56_scu.c
index 12f4e3a38bd..52cf197b8db 100644
--- a/arch/arm/src/cxd56xx/cxd56_scu.c
+++ b/arch/arm/src/cxd56xx/cxd56_scu.c
@@ -40,8 +40,7 @@
 #include <arch/chip/scu.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "cxd56_scufifo.h"
 #include "cxd56_clock.h"
 #include "cxd56_adc.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_scufifo.c b/arch/arm/src/cxd56xx/cxd56_scufifo.c
index e792abfc82a..c41076b683c 100644
--- a/arch/arm/src/cxd56xx/cxd56_scufifo.c
+++ b/arch/arm/src/cxd56xx/cxd56_scufifo.c
@@ -32,8 +32,7 @@
 #include <arch/chip/scu.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "cxd56_scufifo.h"
 #include "hardware/cxd56_scufifo.h"
 
diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c
index 6914f6034de..7b6ed58352e 100644
--- a/arch/arm/src/cxd56xx/cxd56_sdhci.c
+++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c
@@ -47,7 +47,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_sdhci.h"
 #include "cxd56_clock.h"
 #include "cxd56_pinconfig.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c
index cce7c3125c7..1ec3b7b8491 100644
--- a/arch/arm/src/cxd56xx/cxd56_serial.c
+++ b/arch/arm/src/cxd56xx/cxd56_serial.c
@@ -44,9 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "cxd56_config.h"
 #include "cxd56_serial.h"
 #include "cxd56_powermgr.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_sph.c b/arch/arm/src/cxd56xx/cxd56_sph.c
index 1bc8284ad4b..21b9cb3fba4 100644
--- a/arch/arm/src/cxd56xx/cxd56_sph.c
+++ b/arch/arm/src/cxd56xx/cxd56_sph.c
@@ -36,7 +36,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "hardware/cxd56_sph.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_spi.c b/arch/arm/src/cxd56xx/cxd56_spi.c
index 110a92e1f26..802b1b74c6b 100644
--- a/arch/arm/src/cxd56xx/cxd56_spi.c
+++ b/arch/arm/src/cxd56xx/cxd56_spi.c
@@ -41,8 +41,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "cxd56_spi.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_start.c b/arch/arm/src/cxd56xx/cxd56_start.c
index af584535507..2794f96045d 100644
--- a/arch/arm/src/cxd56xx/cxd56_start.c
+++ b/arch/arm/src/cxd56xx/cxd56_start.c
@@ -57,7 +57,6 @@
 #include <arch/irq.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 #include "sched/sched.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_testset.c b/arch/arm/src/cxd56xx/cxd56_testset.c
index 672c98e4e27..aee69159d87 100644
--- a/arch/arm/src/cxd56xx/cxd56_testset.c
+++ b/arch/arm/src/cxd56xx/cxd56_testset.c
@@ -29,8 +29,7 @@
 
 #include "hardware/cxd56_sph.h"
 #include "cxd56_sph.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/cxd56xx/cxd56_timer.c b/arch/arm/src/cxd56xx/cxd56_timer.c
index e586dce86d7..493dcb364aa 100644
--- a/arch/arm/src/cxd56xx/cxd56_timer.c
+++ b/arch/arm/src/cxd56xx/cxd56_timer.c
@@ -39,7 +39,7 @@
 #include <arch/board/board.h>
 #include <arch/chip/timer.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_timer.h"
 #include "hardware/cxd56_timer.h"
 #include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_timerisr.c b/arch/arm/src/cxd56xx/cxd56_timerisr.c
index 1f047349cef..ca5e74e6abe 100644
--- a/arch/arm/src/cxd56xx/cxd56_timerisr.c
+++ b/arch/arm/src/cxd56xx/cxd56_timerisr.c
@@ -34,7 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "cxd56_powermgr.h"
 #include "cxd56_timerisr.h"
 #include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_uart.c b/arch/arm/src/cxd56xx/cxd56_uart.c
index 54cc65bbc6f..c6315b04e3a 100644
--- a/arch/arm/src/cxd56xx/cxd56_uart.c
+++ b/arch/arm/src/cxd56xx/cxd56_uart.c
@@ -32,8 +32,6 @@
 #include <errno.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "cxd56_config.h"
 #include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_uart0.c b/arch/arm/src/cxd56xx/cxd56_uart0.c
index 66cee63e0e6..f259804b68c 100644
--- a/arch/arm/src/cxd56xx/cxd56_uart0.c
+++ b/arch/arm/src/cxd56xx/cxd56_uart0.c
@@ -37,7 +37,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "cxd56_pinconfig.h"
 
diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.c b/arch/arm/src/cxd56xx/cxd56_udmac.c
index 0d59c5790bc..6e17ea04975 100644
--- a/arch/arm/src/cxd56xx/cxd56_udmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_udmac.c
@@ -35,7 +35,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_clock.h"
 #include "hardware/cxd56_udmac.h"
 #include "cxd56_udmac.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_uid.c b/arch/arm/src/cxd56xx/cxd56_uid.c
index c2f4983e0a1..0b4f9674b00 100644
--- a/arch/arm/src/cxd56xx/cxd56_uid.c
+++ b/arch/arm/src/cxd56xx/cxd56_uid.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_uid.h"
 #include "hardware/cxd5602_topreg.h"
 
diff --git a/arch/arm/src/cxd56xx/cxd56_usbdev.c b/arch/arm/src/cxd56xx/cxd56_usbdev.c
index bbcedd471fb..c78f35ab674 100644
--- a/arch/arm/src/cxd56xx/cxd56_usbdev.c
+++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c
@@ -52,7 +52,6 @@
 #include <arch/chip/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "cxd56_clock.h"
 #include "cxd56_usbdev.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_wdt.c b/arch/arm/src/cxd56xx/cxd56_wdt.c
index 014db123fe8..3113b2a2652 100644
--- a/arch/arm/src/cxd56xx/cxd56_wdt.c
+++ b/arch/arm/src/cxd56xx/cxd56_wdt.c
@@ -35,7 +35,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cxd56_clock.h"
 #include "cxd56_wdt.h"
 #include "cxd56_powermgr.h"
diff --git a/arch/arm/src/dm320/dm320_allocateheap.c b/arch/arm/src/dm320/dm320_allocateheap.c
index 04ec9a61d2f..d58a3d55020 100644
--- a/arch/arm/src/dm320/dm320_allocateheap.c
+++ b/arch/arm/src/dm320/dm320_allocateheap.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/dm320/dm320_boot.c b/arch/arm/src/dm320/dm320_boot.c
index d0b39ae2508..a7ef4234fc5 100644
--- a/arch/arm/src/dm320/dm320_boot.c
+++ b/arch/arm/src/dm320/dm320_boot.c
@@ -28,7 +28,6 @@
 #include "chip.h"
 #include "arm.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #include <nuttx/board.h>
 
diff --git a/arch/arm/src/dm320/dm320_decodeirq.c b/arch/arm/src/dm320/dm320_decodeirq.c
index 5174f5f144e..0745770f9e7 100644
--- a/arch/arm/src/dm320/dm320_decodeirq.c
+++ b/arch/arm/src/dm320/dm320_decodeirq.c
@@ -31,9 +31,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index 82e25acd9a1..a7dfaffd8cc 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -35,7 +35,7 @@
 #include <nuttx/video/fb.h>
 #include <nuttx/nx/nxglib.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "dm320_memorymap.h"
 #include "dm320_osd.h"
 
diff --git a/arch/arm/src/dm320/dm320_gio.h b/arch/arm/src/dm320/dm320_gio.h
index 9565970138b..5f26d34b9fe 100644
--- a/arch/arm/src/dm320/dm320_gio.h
+++ b/arch/arm/src/dm320/dm320_gio.h
@@ -25,10 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-# include "arm_arch.h"
-#endif
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/dm320/dm320_irq.c b/arch/arm/src/dm320/dm320_irq.c
index 9c0c3fc97cf..f11e553b5a8 100644
--- a/arch/arm/src/dm320/dm320_irq.c
+++ b/arch/arm/src/dm320/dm320_irq.c
@@ -29,8 +29,6 @@
 
 #include "arm.h"
 #include "chip.h"
-
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c
index 9172d913034..a906b318d23 100644
--- a/arch/arm/src/dm320/dm320_serial.c
+++ b/arch/arm/src/dm320/dm320_serial.c
@@ -40,7 +40,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/arch/arm/src/dm320/dm320_timerisr.c b/arch/arm/src/dm320/dm320_timerisr.c
index b99bb9b25ba..46383590687 100644
--- a/arch/arm/src/dm320/dm320_timerisr.c
+++ b/arch/arm/src/dm320/dm320_timerisr.c
@@ -29,7 +29,6 @@
 #include <nuttx/arch.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c
index d522f7a99e4..3f08814e5f8 100644
--- a/arch/arm/src/dm320/dm320_usbdev.c
+++ b/arch/arm/src/dm320/dm320_usbdev.c
@@ -43,7 +43,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "dm320_usb.h"
 
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index 43b936fa2b4..8ea6d258732 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/arch/arm/src/efm32/efm32_adc.c
@@ -42,8 +42,6 @@
 #include <nuttx/analog/ioctl.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "efm32.h"
 #include "efm32_adc.h"
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index 5f107090b3a..bd38e5c23ea 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -30,8 +30,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "itm_syslog.h"
 #include "efm32_gpio.h"
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index 447317f1fc1..f61e823436e 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -35,7 +35,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/efm32_cmu.h"
 #include "hardware/efm32_dma.h"
 #include "efm32_dma.h"
diff --git a/arch/arm/src/efm32/efm32_flash.c b/arch/arm/src/efm32/efm32_flash.c
index 380de02ac0d..e042ac36ff8 100644
--- a/arch/arm/src/efm32/efm32_flash.c
+++ b/arch/arm/src/efm32/efm32_flash.c
@@ -79,8 +79,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/efm32_msc.h"
 #include "hardware/efm32_devinfo.h"
 
@@ -353,7 +351,7 @@ int __ramfunc__ msc_load_write_data(uint32_t *data, uint32_t num_words,
 
           /* Subtract this initial odd word for the write loop below */
 
-          num_words --;
+          num_words--;
           ret = 0;
         }
 
diff --git a/arch/arm/src/efm32/efm32_gpio.c b/arch/arm/src/efm32/efm32_gpio.c
index 632c4f26e98..8b47d2bc32f 100644
--- a/arch/arm/src/efm32/efm32_gpio.c
+++ b/arch/arm/src/efm32/efm32_gpio.c
@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/efm32_gpio.h"
 #include "efm32_gpio.h"
 
diff --git a/arch/arm/src/efm32/efm32_gpioirq.c b/arch/arm/src/efm32/efm32_gpioirq.c
index 53aaab3b390..5169d964422 100644
--- a/arch/arm/src/efm32/efm32_gpioirq.c
+++ b/arch/arm/src/efm32/efm32_gpioirq.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/efm32_gpio.h"
 #include "efm32_gpio.h"
 #include "efm32_bitband.h"
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index 543943a9df5..ebf9495f248 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -58,8 +58,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "efm32_gpio.h"
 #include "hardware/efm32_cmu.h"
 #include "hardware/efm32_i2c.h"
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 2c9a5287b0f..10ef7e5a45d 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -36,10 +36,8 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "efm32_gpio.h"
 
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index 240b8c2bc5d..1fb26caf104 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/efm32_leuart.h"
 #include "efm32_config.h"
 #include "efm32_lowputc.h"
diff --git a/arch/arm/src/efm32/efm32_lowputc.c b/arch/arm/src/efm32/efm32_lowputc.c
index 1cb4d3986c2..114e8c72a68 100644
--- a/arch/arm/src/efm32/efm32_lowputc.c
+++ b/arch/arm/src/efm32/efm32_lowputc.c
@@ -30,8 +30,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/efm32_memorymap.h"
 #include "hardware/efm32_usart.h"
 #include "hardware/efm32_leuart.h"
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index 7b574ee4c3e..5447448e34a 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -35,9 +35,7 @@
 #include <nuttx/timers/pwm.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/efm32_cmu.h"
 #include "hardware/efm32_timer.h"
 #include "efm32_timer.h"
diff --git a/arch/arm/src/efm32/efm32_rmu.c b/arch/arm/src/efm32/efm32_rmu.c
index 83678f026e5..e8ffd8aba0b 100644
--- a/arch/arm/src/efm32/efm32_rmu.c
+++ b/arch/arm/src/efm32/efm32_rmu.c
@@ -33,8 +33,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/efm32_emu.h"
 #include "hardware/efm32_rmu.h"
 
diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c
index 27c9b6b08eb..af6de5d14e9 100644
--- a/arch/arm/src/efm32/efm32_rtc_burtc.c
+++ b/arch/arm/src/efm32/efm32_rtc_burtc.c
@@ -35,8 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/efm32_burtc.h"
 
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index 5442a74a9bf..89ad73b64cb 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_serial.c
@@ -43,9 +43,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/efm32_usart.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 06ec136cdc7..1ad335d7155 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -41,8 +41,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/efm32_usart.h"
 #include "efm32_config.h"
diff --git a/arch/arm/src/efm32/efm32_start.c b/arch/arm/src/efm32/efm32_start.c
index 2ff7e9b6a3d..14d47ef566c 100644
--- a/arch/arm/src/efm32/efm32_start.c
+++ b/arch/arm/src/efm32/efm32_start.c
@@ -34,9 +34,7 @@
 #include <arch/board/board.h>
 #include <arch/efm32/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "efm32_config.h"
 #include "efm32_lowputc.h"
 #include "efm32_clockconfig.h"
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index b4708e269ec..76d281229e6 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -33,9 +33,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/efm32_timer.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"
diff --git a/arch/arm/src/efm32/efm32_timerisr.c b/arch/arm/src/efm32/efm32_timerisr.c
index 8c2454285ed..46dbcb7dedd 100644
--- a/arch/arm/src/efm32/efm32_timerisr.c
+++ b/arch/arm/src/efm32/efm32_timerisr.c
@@ -32,8 +32,6 @@
 
 #include "nvic.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index cf659e92be1..c308c6caf7b 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -43,9 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/efm32_cmu.h"
 
 #include "efm32_usb.h"
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index 6bb2678b463..a53020f4daa 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -49,9 +49,7 @@
 #include "chip.h"             /* Includes default GPIO settings */
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "efm32_usb.h"
 
 #if defined(CONFIG_USBHOST) && defined(CONFIG_EFM32_OTGFS)
diff --git a/arch/arm/src/eoss3/eoss3_clockconfig.c b/arch/arm/src/eoss3/eoss3_clockconfig.c
index b4ad8eb22ae..f8a21f2bfd9 100644
--- a/arch/arm/src/eoss3/eoss3_clockconfig.c
+++ b/arch/arm/src/eoss3/eoss3_clockconfig.c
@@ -28,8 +28,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "eoss3.h"
diff --git a/arch/arm/src/eoss3/eoss3_gpio.c b/arch/arm/src/eoss3/eoss3_gpio.c
index cb25c722393..ae6661dedf1 100644
--- a/arch/arm/src/eoss3/eoss3_gpio.c
+++ b/arch/arm/src/eoss3/eoss3_gpio.c
@@ -29,8 +29,6 @@
 #include <nuttx/irq.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "eoss3.h"
diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c
index 869729795c8..4584781d840 100644
--- a/arch/arm/src/eoss3/eoss3_irq.c
+++ b/arch/arm/src/eoss3/eoss3_irq.c
@@ -36,10 +36,8 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/eoss3/eoss3_lowputc.c b/arch/arm/src/eoss3/eoss3_lowputc.c
index a99e93c85cd..931c3a63c17 100644
--- a/arch/arm/src/eoss3/eoss3_lowputc.c
+++ b/arch/arm/src/eoss3/eoss3_lowputc.c
@@ -28,8 +28,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "eoss3.h"
diff --git a/arch/arm/src/eoss3/eoss3_serial.c b/arch/arm/src/eoss3/eoss3_serial.c
index 2387a281afb..b83eb70bcfb 100644
--- a/arch/arm/src/eoss3/eoss3_serial.c
+++ b/arch/arm/src/eoss3/eoss3_serial.c
@@ -45,9 +45,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/eoss3_uart.h"
 #include "hardware/eoss3_intr.h"
 #include "eoss3_lowputc.h"
diff --git a/arch/arm/src/eoss3/eoss3_start.c b/arch/arm/src/eoss3/eoss3_start.c
index a288c6ace24..81511e0215f 100644
--- a/arch/arm/src/eoss3/eoss3_start.c
+++ b/arch/arm/src/eoss3/eoss3_start.c
@@ -29,7 +29,6 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 #include "nuttx/irq.h"
diff --git a/arch/arm/src/eoss3/eoss3_timerisr.c b/arch/arm/src/eoss3/eoss3_timerisr.c
index fee5f5c135f..c74dcd395b3 100644
--- a/arch/arm/src/eoss3/eoss3_timerisr.c
+++ b/arch/arm/src/eoss3/eoss3_timerisr.c
@@ -34,8 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imx1/imx_allocateheap.c b/arch/arm/src/imx1/imx_allocateheap.c
index d9fbfe7e5fb..1904b2ddbc2 100644
--- a/arch/arm/src/imx1/imx_allocateheap.c
+++ b/arch/arm/src/imx1/imx_allocateheap.c
@@ -34,7 +34,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imx1/imx_boot.c b/arch/arm/src/imx1/imx_boot.c
index 7b39f4b061d..ee0a51aeed8 100644
--- a/arch/arm/src/imx1/imx_boot.c
+++ b/arch/arm/src/imx1/imx_boot.c
@@ -27,7 +27,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #include <nuttx/board.h>
 
diff --git a/arch/arm/src/imx1/imx_decodeirq.c b/arch/arm/src/imx1/imx_decodeirq.c
index f25d9d7e740..74b355b5c2e 100644
--- a/arch/arm/src/imx1/imx_decodeirq.c
+++ b/arch/arm/src/imx1/imx_decodeirq.c
@@ -31,9 +31,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imx1/imx_gpio.c b/arch/arm/src/imx1/imx_gpio.c
index 916bb6b45f9..b6c2bcdf670 100644
--- a/arch/arm/src/imx1/imx_gpio.c
+++ b/arch/arm/src/imx1/imx_gpio.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imx_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imx1/imx_gpio.h b/arch/arm/src/imx1/imx_gpio.h
index 43d04475e93..3fc40f0ca8b 100644
--- a/arch/arm/src/imx1/imx_gpio.h
+++ b/arch/arm/src/imx1/imx_gpio.h
@@ -28,7 +28,7 @@
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
 #endif
-#include "arm_arch.h"                     /* getreg32(), putreg32() */
+#include "arm_internal.h"                     /* getreg32(), putreg32() */
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -173,8 +173,8 @@
 
 #ifndef __ASSEMBLY__
 
-/* Handler circular include... This file includes arm_arch.h, but this file
- * is included by arm_arch.h (via chip.h) BEFORE getreg32 is defined.
+/* Handler circular include... This file includes arm_internal.h, but this
+ * file is included by arm_internal.h(via chip.h) BEFORE getreg32 is defined.
  */
 
 #if !defined(__ARCH_ARM_IMX_GPIOHELPERS_H) && defined(getreg32)
diff --git a/arch/arm/src/imx1/imx_irq.c b/arch/arm/src/imx1/imx_irq.c
index 2274aee5f4e..aa1c8959202 100644
--- a/arch/arm/src/imx1/imx_irq.c
+++ b/arch/arm/src/imx1/imx_irq.c
@@ -28,7 +28,6 @@
 #include <arch/irq.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imx1/imx_serial.c b/arch/arm/src/imx1/imx_serial.c
index a0b3fa12861..a99ffb45af4 100644
--- a/arch/arm/src/imx1/imx_serial.c
+++ b/arch/arm/src/imx1/imx_serial.c
@@ -41,7 +41,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "imx_gpio.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/imx1/imx_spi.c b/arch/arm/src/imx1/imx_spi.c
index d345b6b5c2f..9af6ecb75e5 100644
--- a/arch/arm/src/imx1/imx_spi.c
+++ b/arch/arm/src/imx1/imx_spi.c
@@ -38,8 +38,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "imx_gpio.h"
 #include "imx_cspi.h"
diff --git a/arch/arm/src/imx1/imx_timerisr.c b/arch/arm/src/imx1/imx_timerisr.c
index 74cff9e553d..7e5e374651f 100644
--- a/arch/arm/src/imx1/imx_timerisr.c
+++ b/arch/arm/src/imx1/imx_timerisr.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/imx6/imx_boot.c b/arch/arm/src/imx6/imx_boot.c
index 4dea7c9f2d1..9b8d2ed9b61 100644
--- a/arch/arm/src/imx6/imx_boot.c
+++ b/arch/arm/src/imx6/imx_boot.c
@@ -41,8 +41,6 @@
 #include "scu.h"
 #include "fpu.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "imx_config.h"
 #include "imx_clockconfig.h"
 #include "imx_memorymap.h"
diff --git a/arch/arm/src/imx6/imx_clockconfig.c b/arch/arm/src/imx6/imx_clockconfig.c
index 27ffcceb9e0..0ebbd807dd7 100644
--- a/arch/arm/src/imx6/imx_clockconfig.c
+++ b/arch/arm/src/imx6/imx_clockconfig.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/imx_ccm.h"
 #include "imx_config.h"
 #include "imx_clockconfig.h"
diff --git a/arch/arm/src/imx6/imx_cpuboot.c b/arch/arm/src/imx6/imx_cpuboot.c
index cd294f3bc13..85dbfb06175 100644
--- a/arch/arm/src/imx6/imx_cpuboot.c
+++ b/arch/arm/src/imx6/imx_cpuboot.c
@@ -30,9 +30,7 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/imx_src.h"
 #include "sctlr.h"
 #include "smp.h"
diff --git a/arch/arm/src/imx6/imx_ecspi.c b/arch/arm/src/imx6/imx_ecspi.c
index 0e0d166fe56..678d796f46c 100644
--- a/arch/arm/src/imx6/imx_ecspi.c
+++ b/arch/arm/src/imx6/imx_ecspi.c
@@ -38,8 +38,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "imx_gpio.h"
 #include "imx_ecspi.h"
diff --git a/arch/arm/src/imx6/imx_enet.c b/arch/arm/src/imx6/imx_enet.c
index 204d649173b..b0e85f3168f 100644
--- a/arch/arm/src/imx6/imx_enet.c
+++ b/arch/arm/src/imx6/imx_enet.c
@@ -51,7 +51,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "gic.h"
 #include "chip.h"
 #include "imx_config.h"
diff --git a/arch/arm/src/imx6/imx_gpio.c b/arch/arm/src/imx6/imx_gpio.c
index be93d550474..3cb4f74c90e 100644
--- a/arch/arm/src/imx6/imx_gpio.c
+++ b/arch/arm/src/imx6/imx_gpio.c
@@ -31,7 +31,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imx_iomuxc.h"
 #include "imx_gpio.h"
 
diff --git a/arch/arm/src/imx6/imx_iomuxc.c b/arch/arm/src/imx6/imx_iomuxc.c
index a8f2802cb0c..fba3cda23fc 100644
--- a/arch/arm/src/imx6/imx_iomuxc.c
+++ b/arch/arm/src/imx6/imx_iomuxc.c
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imx_iomuxc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imx6/imx_lowputc.c b/arch/arm/src/imx6/imx_lowputc.c
index 5fa9b0cd51c..3383820bc3f 100644
--- a/arch/arm/src/imx6/imx_lowputc.c
+++ b/arch/arm/src/imx6/imx_lowputc.c
@@ -28,8 +28,6 @@
 #include <fixedmath.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
 #include "hardware/imx_iomuxc.h"
 #include "hardware/imx_ccm.h"
 #include "hardware/imx_uart.h"
@@ -37,9 +35,7 @@
 #include "imx_iomuxc.h"
 #include "imx_gpio.h"
 #include "imx_lowputc.h"
-
 #include "arm_internal.h"
-
 #include "hardware/imx_pinmux.h"
 #include <arch/board/board.h> /* Include last:  has dependencies */
 
diff --git a/arch/arm/src/imx6/imx_serial.c b/arch/arm/src/imx6/imx_serial.c
index 9f4100d4592..07f9b41dc6a 100644
--- a/arch/arm/src/imx6/imx_serial.c
+++ b/arch/arm/src/imx6/imx_serial.c
@@ -45,9 +45,7 @@
 #include <nuttx/serial/serial.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "gic.h"
 #include "hardware/imx_uart.h"
 #include "imx_config.h"
diff --git a/arch/arm/src/imx6/imx_timerisr.c b/arch/arm/src/imx6/imx_timerisr.c
index 6a66430bc2c..b429eb55332 100644
--- a/arch/arm/src/imx6/imx_timerisr.c
+++ b/arch/arm/src/imx6/imx_timerisr.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "gic.h"
 #include "hardware/imx_ccm.h"
 #include "hardware/imx_gpt.h"
diff --git a/arch/arm/src/imxrt/imxrt_adc.c b/arch/arm/src/imxrt/imxrt_adc.c
index 4dece9d3f50..a6d7fbeb160 100644
--- a/arch/arm/src/imxrt/imxrt_adc.c
+++ b/arch/arm/src/imxrt/imxrt_adc.c
@@ -40,8 +40,6 @@
 #include <nuttx/analog/ioctl.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/imxrt_adc.h"
 #include "hardware/imxrt_pinmux.h"
diff --git a/arch/arm/src/imxrt/imxrt_allocateheap.c b/arch/arm/src/imxrt/imxrt_allocateheap.c
index a1d2f3b3acb..e925a0141c0 100644
--- a/arch/arm/src/imxrt/imxrt_allocateheap.c
+++ b/arch/arm/src/imxrt/imxrt_allocateheap.c
@@ -36,9 +36,7 @@
 
 #include <arch/imxrt/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/imxrt_memorymap.h"
 #include "imxrt_mpuinit.h"
 
diff --git a/arch/arm/src/imxrt/imxrt_clockconfig.c b/arch/arm/src/imxrt/imxrt_clockconfig.c
index b0aa5d62d93..5f895c7d826 100644
--- a/arch/arm/src/imxrt/imxrt_clockconfig.c
+++ b/arch/arm/src/imxrt/imxrt_clockconfig.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include <arch/board/board.h>
 #include "hardware/imxrt_ccm.h"
 #include "hardware/imxrt_dcdc.h"
diff --git a/arch/arm/src/imxrt/imxrt_clrpend.c b/arch/arm/src/imxrt/imxrt_clrpend.c
index b84831b7ed9..0cec7f6a1de 100644
--- a/arch/arm/src/imxrt/imxrt_clrpend.c
+++ b/arch/arm/src/imxrt/imxrt_clrpend.c
@@ -28,8 +28,7 @@
 #include <assert.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imxrt/imxrt_daisy.c b/arch/arm/src/imxrt/imxrt_daisy.c
index 05f6356fbc6..194622ea198 100644
--- a/arch/arm/src/imxrt/imxrt_daisy.c
+++ b/arch/arm/src/imxrt/imxrt_daisy.c
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/imxrt_daisy.h"
 #include "imxrt_iomuxc.h"
 
diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c
index 26dd9a6581f..aa0a10bc9ef 100644
--- a/arch/arm/src/imxrt/imxrt_edma.c
+++ b/arch/arm/src/imxrt/imxrt_edma.c
@@ -59,7 +59,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/arm/src/imxrt/imxrt_ehci.c b/arch/arm/src/imxrt/imxrt_ehci.c
index ff83ee17813..2e68d013aac 100644
--- a/arch/arm/src/imxrt/imxrt_ehci.c
+++ b/arch/arm/src/imxrt/imxrt_ehci.c
@@ -43,7 +43,7 @@
 #include <nuttx/usb/usbhost_devaddr.h>
 #include <nuttx/usb/usbhost_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/imxrt_usbotg.h"
 #include "imxrt_periphclks.h"
diff --git a/arch/arm/src/imxrt/imxrt_enc.c b/arch/arm/src/imxrt/imxrt_enc.c
index 201457dadd7..0274c30be91 100644
--- a/arch/arm/src/imxrt/imxrt_enc.c
+++ b/arch/arm/src/imxrt/imxrt_enc.c
@@ -35,8 +35,7 @@
 #include <nuttx/semaphore.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_periphclks.h"
 
 #include "imxrt_enc.h"
diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c
index decdf1006fc..ab27d70afe6 100644
--- a/arch/arm/src/imxrt/imxrt_enet.c
+++ b/arch/arm/src/imxrt/imxrt_enet.c
@@ -51,7 +51,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_config.h"
 #include "hardware/imxrt_enet.h"
diff --git a/arch/arm/src/imxrt/imxrt_flexcan.c b/arch/arm/src/imxrt/imxrt_flexcan.c
index d44da84d03f..b63ae0bbb59 100644
--- a/arch/arm/src/imxrt/imxrt_flexcan.c
+++ b/arch/arm/src/imxrt/imxrt_flexcan.c
@@ -43,7 +43,7 @@
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/can.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_config.h"
 #include "imxrt_flexcan.h"
diff --git a/arch/arm/src/imxrt/imxrt_flexpwm.c b/arch/arm/src/imxrt/imxrt_flexpwm.c
index 64913cbdc61..89b72ca1fb9 100644
--- a/arch/arm/src/imxrt/imxrt_flexpwm.c
+++ b/arch/arm/src/imxrt/imxrt_flexpwm.c
@@ -35,7 +35,7 @@
 
 #include <nuttx/timers/pwm.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_config.h"
 #include "imxrt_flexpwm.h"
diff --git a/arch/arm/src/imxrt/imxrt_flexspi.c b/arch/arm/src/imxrt/imxrt_flexspi.c
index 782c191b8e3..a36f84f4550 100644
--- a/arch/arm/src/imxrt/imxrt_flexspi.c
+++ b/arch/arm/src/imxrt/imxrt_flexspi.c
@@ -42,7 +42,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "barriers.h"
 
 #include "imxrt_gpio.h"
diff --git a/arch/arm/src/imxrt/imxrt_gpio.c b/arch/arm/src/imxrt/imxrt_gpio.c
index 85ab32ef897..1b1c0abeb2b 100644
--- a/arch/arm/src/imxrt/imxrt_gpio.c
+++ b/arch/arm/src/imxrt/imxrt_gpio.c
@@ -33,7 +33,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_iomuxc.h"
 #include "imxrt_gpio.h"
 #include "hardware/imxrt_daisy.h"
diff --git a/arch/arm/src/imxrt/imxrt_gpioirq.c b/arch/arm/src/imxrt/imxrt_gpioirq.c
index 1dc9484f8ee..14b66fcbea4 100644
--- a/arch/arm/src/imxrt/imxrt_gpioirq.c
+++ b/arch/arm/src/imxrt/imxrt_gpioirq.c
@@ -32,8 +32,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
 #include "imxrt_gpio.h"
diff --git a/arch/arm/src/imxrt/imxrt_hprtc.c b/arch/arm/src/imxrt/imxrt_hprtc.c
index fccfe848cc1..1f07d4186d3 100644
--- a/arch/arm/src/imxrt/imxrt_hprtc.c
+++ b/arch/arm/src/imxrt/imxrt_hprtc.c
@@ -39,8 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/imxrt_snvs.h"
 #include "imxrt_periphclks.h"
 #include "imxrt_lpsrtc.h"
diff --git a/arch/arm/src/imxrt/imxrt_iomuxc.c b/arch/arm/src/imxrt/imxrt_iomuxc.c
index 2cbc9df897e..c5209d9afaa 100644
--- a/arch/arm/src/imxrt/imxrt_iomuxc.c
+++ b/arch/arm/src/imxrt/imxrt_iomuxc.c
@@ -32,7 +32,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/imxrt_ccm.h"
 #include "imxrt_periphclks.h"
 #include "imxrt_iomuxc.h"
diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c
index 6f38413a222..ebd5910c56e 100644
--- a/arch/arm/src/imxrt/imxrt_irq.c
+++ b/arch/arm/src/imxrt/imxrt_irq.c
@@ -37,7 +37,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_IMXRT_GPIO_IRQ
diff --git a/arch/arm/src/imxrt/imxrt_lcd.c b/arch/arm/src/imxrt/imxrt_lcd.c
index fbc662e5371..55e0de6f85f 100644
--- a/arch/arm/src/imxrt/imxrt_lcd.c
+++ b/arch/arm/src/imxrt/imxrt_lcd.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/video/fb.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <nuttx/board.h>
 
diff --git a/arch/arm/src/imxrt/imxrt_lowputc.c b/arch/arm/src/imxrt/imxrt_lowputc.c
index 610ad430b6c..7f0c432b68e 100644
--- a/arch/arm/src/imxrt/imxrt_lowputc.c
+++ b/arch/arm/src/imxrt/imxrt_lowputc.c
@@ -28,8 +28,6 @@
 #include <fixedmath.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
 #include "hardware/imxrt_iomuxc.h"
 #include "hardware/imxrt_pinmux.h"
 #include "hardware/imxrt_ccm.h"
@@ -39,7 +37,6 @@
 #include "imxrt_iomuxc.h"
 #include "imxrt_gpio.h"
 #include "imxrt_lowputc.h"
-
 #include "arm_internal.h"
 
 #include <arch/board/board.h> /* Include last:  has dependencies */
diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c
index bcd1d2ea68c..894031814d2 100644
--- a/arch/arm/src/imxrt/imxrt_lpi2c.c
+++ b/arch/arm/src/imxrt/imxrt_lpi2c.c
@@ -42,8 +42,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_lpi2c.h"
 #include "imxrt_gpio.h"
 
diff --git a/arch/arm/src/imxrt/imxrt_lpspi.c b/arch/arm/src/imxrt/imxrt_lpspi.c
index c8c3eff0e04..22beebecb47 100644
--- a/arch/arm/src/imxrt/imxrt_lpspi.c
+++ b/arch/arm/src/imxrt/imxrt_lpspi.c
@@ -65,8 +65,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "imxrt_lpspi.h"
diff --git a/arch/arm/src/imxrt/imxrt_lpsrtc.c b/arch/arm/src/imxrt/imxrt_lpsrtc.c
index 521acca0fca..33def0d3945 100644
--- a/arch/arm/src/imxrt/imxrt_lpsrtc.c
+++ b/arch/arm/src/imxrt/imxrt_lpsrtc.c
@@ -38,8 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/imxrt_snvs.h"
 #include "imxrt_periphclks.h"
 #include "imxrt_hprtc.h"
diff --git a/arch/arm/src/imxrt/imxrt_ocotp.c b/arch/arm/src/imxrt/imxrt_ocotp.c
index 3fa9a1756f5..3fe280825b5 100644
--- a/arch/arm/src/imxrt/imxrt_ocotp.c
+++ b/arch/arm/src/imxrt/imxrt_ocotp.c
@@ -31,7 +31,7 @@
 #include <nuttx/clock.h>
 
 #include <arch/board/board.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_periphclks.h"
 #include "imxrt_ocotp.h"
 
diff --git a/arch/arm/src/imxrt/imxrt_periphclks.c b/arch/arm/src/imxrt/imxrt_periphclks.c
index dbec4758249..b6316ce0f14 100644
--- a/arch/arm/src/imxrt/imxrt_periphclks.c
+++ b/arch/arm/src/imxrt/imxrt_periphclks.c
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_periphclks.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
index 0712e62487b..dd8771c52ec 100644
--- a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
+++ b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
@@ -34,8 +34,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_lpsrtc.h"
 #include "imxrt_hprtc.h"
diff --git a/arch/arm/src/imxrt/imxrt_serial.c b/arch/arm/src/imxrt/imxrt_serial.c
index 2b9fc124d95..fc3db983a8d 100644
--- a/arch/arm/src/imxrt/imxrt_serial.c
+++ b/arch/arm/src/imxrt/imxrt_serial.c
@@ -48,9 +48,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/imxrt_lpuart.h"
 #include "imxrt_gpio.h"
 #include "hardware/imxrt_pinmux.h"
diff --git a/arch/arm/src/imxrt/imxrt_start.c b/arch/arm/src/imxrt/imxrt_start.c
index f6f6a59c10e..f462f694d4a 100644
--- a/arch/arm/src/imxrt/imxrt_start.c
+++ b/arch/arm/src/imxrt/imxrt_start.c
@@ -32,7 +32,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "barriers.h"
 #include "nvic.h"
diff --git a/arch/arm/src/imxrt/imxrt_tickless.c b/arch/arm/src/imxrt/imxrt_tickless.c
index 67bcc21f911..d5537be3b28 100644
--- a/arch/arm/src/imxrt/imxrt_tickless.c
+++ b/arch/arm/src/imxrt/imxrt_tickless.c
@@ -72,7 +72,7 @@
 #include <nuttx/irq.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_periphclks.h"
 #include "hardware/imxrt_gpt.h"
 #include "imxrt_irq.h"
diff --git a/arch/arm/src/imxrt/imxrt_timerisr.c b/arch/arm/src/imxrt/imxrt_timerisr.c
index eade31cc92a..2a81ed46738 100644
--- a/arch/arm/src/imxrt/imxrt_timerisr.c
+++ b/arch/arm/src/imxrt/imxrt_timerisr.c
@@ -37,8 +37,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/imxrt_ccm.h"
 
diff --git a/arch/arm/src/imxrt/imxrt_usbdev.c b/arch/arm/src/imxrt/imxrt_usbdev.c
index 7447211f81d..63352b59b21 100644
--- a/arch/arm/src/imxrt/imxrt_usbdev.c
+++ b/arch/arm/src/imxrt/imxrt_usbdev.c
@@ -43,9 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/imxrt_usbotg.h"
 #include "hardware/imxrt_usbphy.h"
 #include "hardware/rt106x/imxrt106x_ccm.h"
diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c
index ab754d14bae..950eceda020 100644
--- a/arch/arm/src/imxrt/imxrt_usdhc.c
+++ b/arch/arm/src/imxrt/imxrt_usdhc.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_gpio.h"
 #include "hardware/imxrt_pinmux.h"
diff --git a/arch/arm/src/imxrt/imxrt_wdog.c b/arch/arm/src/imxrt/imxrt_wdog.c
index b785a9c9ee5..730fbdec301 100644
--- a/arch/arm/src/imxrt/imxrt_wdog.c
+++ b/arch/arm/src/imxrt/imxrt_wdog.c
@@ -34,7 +34,7 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/timers/watchdog.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/imxrt_wdog.h"
 #include "imxrt_wdog.h"
 
diff --git a/arch/arm/src/imxrt/imxrt_xbar.c b/arch/arm/src/imxrt/imxrt_xbar.c
index 695a67df9b3..d642e879d32 100644
--- a/arch/arm/src/imxrt/imxrt_xbar.c
+++ b/arch/arm/src/imxrt/imxrt_xbar.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_xbar.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_allocateheap.c b/arch/arm/src/kinetis/kinetis_allocateheap.c
index e1d819d70d0..1f3a9713fbf 100644
--- a/arch/arm/src/kinetis/kinetis_allocateheap.c
+++ b/arch/arm/src/kinetis/kinetis_allocateheap.c
@@ -34,7 +34,6 @@
 #include <nuttx/userspace.h>
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "kinetis_mpuinit.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index 79454db9df9..036023373f1 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "hardware/kinetis_mcg.h"
 #include "hardware/kinetis_sim.h"
diff --git a/arch/arm/src/kinetis/kinetis_clrpend.c b/arch/arm/src/kinetis/kinetis_clrpend.c
index 7342dcfa4a5..7636261d738 100644
--- a/arch/arm/src/kinetis/kinetis_clrpend.c
+++ b/arch/arm/src/kinetis/kinetis_clrpend.c
@@ -27,7 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_edma.c b/arch/arm/src/kinetis/kinetis_edma.c
index 5612fbef8ae..19ca0391b4a 100644
--- a/arch/arm/src/kinetis/kinetis_edma.c
+++ b/arch/arm/src/kinetis/kinetis_edma.c
@@ -61,7 +61,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 6cb4361a51c..af0cb20c64b 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -50,7 +50,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "kinetis_config.h"
diff --git a/arch/arm/src/kinetis/kinetis_flexcan.c b/arch/arm/src/kinetis/kinetis_flexcan.c
index 4ecb5c9f06c..c4455bd9d81 100644
--- a/arch/arm/src/kinetis/kinetis_flexcan.c
+++ b/arch/arm/src/kinetis/kinetis_flexcan.c
@@ -42,7 +42,7 @@
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/can.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis_config.h"
 #include "hardware/kinetis_flexcan.h"
diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c
index 41193721a0f..c5e144be79f 100644
--- a/arch/arm/src/kinetis/kinetis_i2c.c
+++ b/arch/arm/src/kinetis/kinetis_i2c.c
@@ -42,9 +42,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis_config.h"
 #include "chip.h"
 #include "hardware/kinetis_i2c.h"
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index c0104aa1056..004faf7d669 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "kinetis.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index 658d422142e..a90177a4c8d 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "kinetis_config.h"
 #include "kinetis.h"
 #include "hardware/kinetis_uart.h"
diff --git a/arch/arm/src/kinetis/kinetis_lpserial.c b/arch/arm/src/kinetis/kinetis_lpserial.c
index 35af49ab22f..9f2b22f65b4 100644
--- a/arch/arm/src/kinetis/kinetis_lpserial.c
+++ b/arch/arm/src/kinetis/kinetis_lpserial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis_config.h"
 #include "chip.h"
 #include "hardware/kinetis_lpuart.h"
diff --git a/arch/arm/src/kinetis/kinetis_mpuinit.c b/arch/arm/src/kinetis/kinetis_mpuinit.c
index 5160862cb24..b619750cc49 100644
--- a/arch/arm/src/kinetis/kinetis_mpuinit.c
+++ b/arch/arm/src/kinetis/kinetis_mpuinit.c
@@ -29,6 +29,8 @@
 #include <nuttx/userspace.h>
 
 #include "mpu.h"
+#include "arm_internal.h"
+
 #include "kinetis_mpuinit.h"
 #include "hardware/kinetis_mpu.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_pin.c b/arch/arm/src/kinetis/kinetis_pin.c
index d06ac47ea49..6228293fc63 100644
--- a/arch/arm/src/kinetis/kinetis_pin.c
+++ b/arch/arm/src/kinetis/kinetis_pin.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis.h"
 #include "hardware/kinetis_port.h"
 #include "hardware/kinetis_gpio.h"
diff --git a/arch/arm/src/kinetis/kinetis_pindma.c b/arch/arm/src/kinetis/kinetis_pindma.c
index 8e0db93c9f9..1204a4c54a6 100644
--- a/arch/arm/src/kinetis/kinetis_pindma.c
+++ b/arch/arm/src/kinetis/kinetis_pindma.c
@@ -34,9 +34,7 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/arch.h>
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis_config.h"
 #include "chip.h"
 #include "kinetis.h"
diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c
index 400b05f8074..2548e85459a 100644
--- a/arch/arm/src/kinetis/kinetis_pindump.c
+++ b/arch/arm/src/kinetis/kinetis_pindump.c
@@ -29,8 +29,7 @@
 #include <debug.h>
 
 #include <nuttx/irq.h>
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "hardware/kinetis_gpio.h"
 #include "hardware/kinetis_port.h"
diff --git a/arch/arm/src/kinetis/kinetis_pingpio.c b/arch/arm/src/kinetis/kinetis_pingpio.c
index e5ca8d23cb7..404e08d7bcb 100644
--- a/arch/arm/src/kinetis/kinetis_pingpio.c
+++ b/arch/arm/src/kinetis/kinetis_pingpio.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis.h"
 #include "hardware/kinetis_gpio.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_pinirq.c b/arch/arm/src/kinetis/kinetis_pinirq.c
index ebb25d64a35..d630e32e25f 100644
--- a/arch/arm/src/kinetis/kinetis_pinirq.c
+++ b/arch/arm/src/kinetis/kinetis_pinirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis.h"
 #include "hardware/kinetis_port.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index e0545cb0ef1..f3a3791a307 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -37,8 +37,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "kinetis.h"
diff --git a/arch/arm/src/kinetis/kinetis_rtc.c b/arch/arm/src/kinetis/kinetis_rtc.c
index 0d2578c234e..87b6dff2872 100644
--- a/arch/arm/src/kinetis/kinetis_rtc.c
+++ b/arch/arm/src/kinetis/kinetis_rtc.c
@@ -36,8 +36,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "kinetis_config.h"
 #include "chip.h"
 #include "hardware/kinetis_rtc.h"
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index e9114dbbf9b..e3058f716d3 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "hardware/kinetis_pinmux.h"
 #include "hardware/kinetis_sim.h"
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index b116c0a0537..146d2de571a 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis_config.h"
 #include "chip.h"
 #include "hardware/kinetis_dmamux.h"
diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c
index 09742695821..07afe80d4aa 100644
--- a/arch/arm/src/kinetis/kinetis_spi.c
+++ b/arch/arm/src/kinetis/kinetis_spi.c
@@ -64,8 +64,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "kinetis_edma.h"
 #include "kinetis_spi.h"
diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c
index 8fa57d415b5..62dbc08aa96 100644
--- a/arch/arm/src/kinetis/kinetis_start.c
+++ b/arch/arm/src/kinetis/kinetis_start.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kinetis.h"
 #include "hardware/kinetis_smc.h"
 #include "kinetis_mpuinit.h"
diff --git a/arch/arm/src/kinetis/kinetis_timerisr.c b/arch/arm/src/kinetis/kinetis_timerisr.c
index 59b7494613d..4d7befbd860 100644
--- a/arch/arm/src/kinetis/kinetis_timerisr.c
+++ b/arch/arm/src/kinetis/kinetis_timerisr.c
@@ -34,8 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "kinetis.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index 7b1a3504bca..64f60865353 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "kinetis_usbotg.h"
 #include "hardware/kinetis_sim.h"
diff --git a/arch/arm/src/kinetis/kinetis_usbhshost.c b/arch/arm/src/kinetis/kinetis_usbhshost.c
index bd83e8e1aa5..962e48b21bb 100644
--- a/arch/arm/src/kinetis/kinetis_usbhshost.c
+++ b/arch/arm/src/kinetis/kinetis_usbhshost.c
@@ -45,7 +45,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/kinetis_sim.h"
 #include "hardware/kinetis_usbhs.h"
diff --git a/arch/arm/src/kinetis/kinetis_wdog.c b/arch/arm/src/kinetis/kinetis_wdog.c
index 8e062f424fa..7e677b13334 100644
--- a/arch/arm/src/kinetis/kinetis_wdog.c
+++ b/arch/arm/src/kinetis/kinetis_wdog.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "hardware/kinetis_wdog.h"
 
diff --git a/arch/arm/src/kl/kl_clockconfig.c b/arch/arm/src/kl/kl_clockconfig.c
index a38e6f13849..cc1609e99c1 100644
--- a/arch/arm/src/kl/kl_clockconfig.c
+++ b/arch/arm/src/kl/kl_clockconfig.c
@@ -26,8 +26,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "kl_gpio.h"
 #include "hardware/kl_mcg.h"
diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index 7b7af6df2ae..209c2c9c2cb 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -34,8 +34,7 @@
 #include <debug.h>
 
 #include <nuttx/irq.h>
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "kl_gpio.h"
 
diff --git a/arch/arm/src/kl/kl_gpio.c b/arch/arm/src/kl/kl_gpio.c
index 6cca50b5153..2fc225980ae 100644
--- a/arch/arm/src/kl/kl_gpio.c
+++ b/arch/arm/src/kl/kl_gpio.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kl_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kl/kl_gpioirq.c b/arch/arm/src/kl/kl_gpioirq.c
index 94925a82b3f..269e01083c2 100644
--- a/arch/arm/src/kl/kl_gpioirq.c
+++ b/arch/arm/src/kl/kl_gpioirq.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/kl_port.h"
 #include "kl_gpio.h"
 
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index dc18748e434..e972fc208b4 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -33,9 +33,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kl_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kl/kl_irqprio.c b/arch/arm/src/kl/kl_irqprio.c
index 5337667f7c1..ba5c018feca 100644
--- a/arch/arm/src/kl/kl_irqprio.c
+++ b/arch/arm/src/kl/kl_irqprio.c
@@ -29,8 +29,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "kl_irq.h"
 
 #ifdef CONFIG_ARCH_IRQPRIO
diff --git a/arch/arm/src/kl/kl_lowputc.c b/arch/arm/src/kl/kl_lowputc.c
index baa849faf26..00d8aa076f9 100644
--- a/arch/arm/src/kl/kl_lowputc.c
+++ b/arch/arm/src/kl/kl_lowputc.c
@@ -31,8 +31,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "kl_config.h"
 #include "kl_lowputc.h"
 #include "kl_gpio.h"
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 9c562fea5aa..a158b6bac27 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -37,8 +37,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "kl_pwm.h"
 #include "kl_gpio.h"
diff --git a/arch/arm/src/kl/kl_serial.c b/arch/arm/src/kl/kl_serial.c
index 93b66a459d2..0ad393a9dd5 100644
--- a/arch/arm/src/kl/kl_serial.c
+++ b/arch/arm/src/kl/kl_serial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "kl_config.h"
 #include "kl_lowputc.h"
 #include "chip.h"
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index 15a007696cc..4294a1805fb 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -36,7 +36,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kl_spi.h"
 #include "kl_gpio.h"
 #include "hardware/kl_memorymap.h"
diff --git a/arch/arm/src/kl/kl_start.c b/arch/arm/src/kl/kl_start.c
index 6669a495112..710136b288a 100644
--- a/arch/arm/src/kl/kl_start.c
+++ b/arch/arm/src/kl/kl_start.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/kl_sim.h"
 
 #include "kl_config.h"
diff --git a/arch/arm/src/kl/kl_timerisr.c b/arch/arm/src/kl/kl_timerisr.c
index 1280d039b99..e58c4ca8efb 100644
--- a/arch/arm/src/kl/kl_timerisr.c
+++ b/arch/arm/src/kl/kl_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_adc.c b/arch/arm/src/lc823450/lc823450_adc.c
index f6b0b5c2917..8dafb95e383 100644
--- a/arch/arm/src/lc823450/lc823450_adc.c
+++ b/arch/arm/src/lc823450/lc823450_adc.c
@@ -46,7 +46,7 @@
 #include <nuttx/analog/ioctl.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_adc.h"
 #include "lc823450_syscontrol.h"
 #include "lc823450_clockconfig.h"
diff --git a/arch/arm/src/lc823450/lc823450_allocateheap2.c b/arch/arm/src/lc823450/lc823450_allocateheap2.c
index 8abf2804e08..7a24fe7ddc0 100644
--- a/arch/arm/src/lc823450/lc823450_allocateheap2.c
+++ b/arch/arm/src/lc823450/lc823450_allocateheap2.c
@@ -39,7 +39,6 @@
 
 #include "chip.h"
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lc823450_mpuinit2.h"
 
diff --git a/arch/arm/src/lc823450/lc823450_clockconfig.c b/arch/arm/src/lc823450/lc823450_clockconfig.c
index f7c73bb2c2a..9d84b45989f 100644
--- a/arch/arm/src/lc823450/lc823450_clockconfig.c
+++ b/arch/arm/src/lc823450/lc823450_clockconfig.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_clockconfig.h"
 #include "lc823450_syscontrol.h"
 
diff --git a/arch/arm/src/lc823450/lc823450_cpuidlestack.c b/arch/arm/src/lc823450/lc823450_cpuidlestack.c
index a163c9d1f9f..5e57ba612e4 100644
--- a/arch/arm/src/lc823450/lc823450_cpuidlestack.c
+++ b/arch/arm/src/lc823450/lc823450_cpuidlestack.c
@@ -27,7 +27,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/lc823450/lc823450_cpuindex.c b/arch/arm/src/lc823450/lc823450_cpuindex.c
index aa7c13b9fc1..61127bdf08d 100644
--- a/arch/arm/src/lc823450/lc823450_cpuindex.c
+++ b/arch/arm/src/lc823450/lc823450_cpuindex.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lc823450/lc823450_cpupause.c b/arch/arm/src/lc823450/lc823450_cpupause.c
index 9c41e828c92..bc5eccca3a7 100644
--- a/arch/arm/src/lc823450/lc823450_cpupause.c
+++ b/arch/arm/src/lc823450/lc823450_cpupause.c
@@ -34,7 +34,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
 #include "lc823450_intc.h"
diff --git a/arch/arm/src/lc823450/lc823450_cpustart.c b/arch/arm/src/lc823450/lc823450_cpustart.c
index cfc8db0768d..80a0127f9ea 100644
--- a/arch/arm/src/lc823450/lc823450_cpustart.c
+++ b/arch/arm/src/lc823450/lc823450_cpustart.c
@@ -36,12 +36,10 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "sched/sched.h"
 #include "init/init.h"
 #include "arm_internal.h"
-
 #include "lc823450_syscontrol.h"
 
 #if defined(CONFIG_BUILD_FLAT) && defined(CONFIG_ARM_MPU)
diff --git a/arch/arm/src/lc823450/lc823450_dma.c b/arch/arm/src/lc823450/lc823450_dma.c
index 1ed240c16fc..5d8f1cbd7a7 100644
--- a/arch/arm/src/lc823450/lc823450_dma.c
+++ b/arch/arm/src/lc823450/lc823450_dma.c
@@ -37,7 +37,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_dma.h"
 #include "lc823450_syscontrol.h"
 #include <arch/chip/clk.h>
diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c
index af2b6ba2b70..9613ba450db 100644
--- a/arch/arm/src/lc823450/lc823450_dvfs2.c
+++ b/arch/arm/src/lc823450/lc823450_dvfs2.c
@@ -30,8 +30,7 @@
 #include <arch/board/board.h>
 #include <string.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lc823450_clockconfig.h"
 #include "lc823450_syscontrol.h"
 #include "lc823450_intc.h"
diff --git a/arch/arm/src/lc823450/lc823450_gpio.c b/arch/arm/src/lc823450/lc823450_gpio.c
index a7cf85cb2f5..20edcddf00d 100644
--- a/arch/arm/src/lc823450/lc823450_gpio.c
+++ b/arch/arm/src/lc823450/lc823450_gpio.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_gpio.h"
 #include "lc823450_syscontrol.h"
 
diff --git a/arch/arm/src/lc823450/lc823450_i2c.c b/arch/arm/src/lc823450/lc823450_i2c.c
index ab7b88e7d75..9421be42ee0 100644
--- a/arch/arm/src/lc823450/lc823450_i2c.c
+++ b/arch/arm/src/lc823450/lc823450_i2c.c
@@ -44,8 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lc823450_syscontrol.h"
 #include "lc823450_clockconfig.h"
 #include "lc823450_i2c.h"
diff --git a/arch/arm/src/lc823450/lc823450_i2s.c b/arch/arm/src/lc823450/lc823450_i2s.c
index 8c5900909ee..d067b406d0d 100644
--- a/arch/arm/src/lc823450/lc823450_i2s.c
+++ b/arch/arm/src/lc823450/lc823450_i2s.c
@@ -38,7 +38,7 @@
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/i2s.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_dma.h"
 #include "lc823450_i2s.h"
 #include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_idle.c b/arch/arm/src/lc823450/lc823450_idle.c
index 217abee5318..5c4c9c4ba1d 100644
--- a/arch/arm/src/lc823450/lc823450_idle.c
+++ b/arch/arm/src/lc823450/lc823450_idle.c
@@ -31,7 +31,6 @@
 
 #include "nvic.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #ifdef CONFIG_DVFS
 #  include "lc823450_dvfs2.h"
diff --git a/arch/arm/src/lc823450/lc823450_ipl2.c b/arch/arm/src/lc823450/lc823450_ipl2.c
index 5a6a0c31688..556d8be8bc4 100644
--- a/arch/arm/src/lc823450/lc823450_ipl2.c
+++ b/arch/arm/src/lc823450/lc823450_ipl2.c
@@ -61,7 +61,6 @@
 #include <libgen.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #ifdef CONFIG_ADC
 #  include "lc823450_adc.h"
diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c
index 6c1112844b2..f4fee9e29ef 100644
--- a/arch/arm/src/lc823450/lc823450_irq.c
+++ b/arch/arm/src/lc823450/lc823450_irq.c
@@ -37,7 +37,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lc823450_intc.h"
 
diff --git a/arch/arm/src/lc823450/lc823450_lowputc.c b/arch/arm/src/lc823450/lc823450_lowputc.c
index 1400e3652cb..8a96aab1918 100644
--- a/arch/arm/src/lc823450/lc823450_lowputc.c
+++ b/arch/arm/src/lc823450/lc823450_lowputc.c
@@ -27,8 +27,6 @@
 #include <stdint.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "lc823450_serial.h"
diff --git a/arch/arm/src/lc823450/lc823450_rtc.c b/arch/arm/src/lc823450/lc823450_rtc.c
index 0a4d1c58bfc..0a4b7d03859 100644
--- a/arch/arm/src/lc823450/lc823450_rtc.c
+++ b/arch/arm/src/lc823450/lc823450_rtc.c
@@ -40,7 +40,7 @@
 #include <string.h>
 
 #include "lc823450_syscontrol.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "clock/clock.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_sdc.c b/arch/arm/src/lc823450/lc823450_sdc.c
index f8f915417ce..cbbbcddd017 100644
--- a/arch/arm/src/lc823450/lc823450_sdc.c
+++ b/arch/arm/src/lc823450/lc823450_sdc.c
@@ -55,8 +55,7 @@
 #include <string.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lc823450_sddrv_if.h"
 #include "lc823450_sdc.h"
 #include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_sddrv_dep.c b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
index 9b2e2a179ef..9b17865d166 100644
--- a/arch/arm/src/lc823450/lc823450_sddrv_dep.c
+++ b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
@@ -54,7 +54,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/signal.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_sddrv_type.h"
 #include "lc823450_sddrv_if.h"
 #include "lc823450_dma.h"
diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c
index 93b5a5bb977..c0d669c5679 100644
--- a/arch/arm/src/lc823450/lc823450_serial.c
+++ b/arch/arm/src/lc823450/lc823450_serial.c
@@ -45,9 +45,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lc823450_dma.h"
 #include "lc823450_serial.h"
 #include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_spi.c b/arch/arm/src/lc823450/lc823450_spi.c
index d8a67dba466..255fdcffc2c 100644
--- a/arch/arm/src/lc823450/lc823450_spi.c
+++ b/arch/arm/src/lc823450/lc823450_spi.c
@@ -37,7 +37,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_spifi2.c b/arch/arm/src/lc823450/lc823450_spifi2.c
index 9a6a3848ff0..a31b29797ba 100644
--- a/arch/arm/src/lc823450/lc823450_spifi2.c
+++ b/arch/arm/src/lc823450/lc823450_spifi2.c
@@ -28,8 +28,7 @@
 #include <errno.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lc823450_syscontrol.h"
 #include "lc823450_spifi2.h"
 
diff --git a/arch/arm/src/lc823450/lc823450_start.c b/arch/arm/src/lc823450/lc823450_start.c
index 952f48a550a..6496016fffd 100644
--- a/arch/arm/src/lc823450/lc823450_start.c
+++ b/arch/arm/src/lc823450/lc823450_start.c
@@ -38,7 +38,6 @@
 #  include <nuttx/lastkmsg.h>
 #endif /* CONFIG_LASTKMSG */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lc823450/lc823450_syscontrol.c b/arch/arm/src/lc823450/lc823450_syscontrol.c
index 6c71aa5ba3e..f85720fe4b5 100644
--- a/arch/arm/src/lc823450/lc823450_syscontrol.c
+++ b/arch/arm/src/lc823450/lc823450_syscontrol.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lc823450_gpio.h"
 #include "lc823450_syscontrol.h"
 #include <arch/chip/clk.h>
diff --git a/arch/arm/src/lc823450/lc823450_testset.c b/arch/arm/src/lc823450/lc823450_testset.c
index d234b54290c..2683cf5d042 100644
--- a/arch/arm/src/lc823450/lc823450_testset.c
+++ b/arch/arm/src/lc823450/lc823450_testset.c
@@ -27,7 +27,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c
index befb18129df..15e5516811e 100644
--- a/arch/arm/src/lc823450/lc823450_timer.c
+++ b/arch/arm/src/lc823450/lc823450_timer.c
@@ -36,8 +36,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "lc823450_gpio.h"
 #ifdef CONFIG_LC823450_MTM0_TICK
diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c
index 3cec641d2fa..690b7b1e02d 100644
--- a/arch/arm/src/lc823450/lc823450_usbdev.c
+++ b/arch/arm/src/lc823450/lc823450_usbdev.c
@@ -60,8 +60,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lc823450_usbdev.h"
 #include "lc823450_dma.h"
 #include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_wdt.c b/arch/arm/src/lc823450/lc823450_wdt.c
index b99e3e63b15..03f2430a4ac 100644
--- a/arch/arm/src/lc823450/lc823450_wdt.c
+++ b/arch/arm/src/lc823450/lc823450_wdt.c
@@ -40,7 +40,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lc823450_syscontrol.h"
 #include "lc823450_wdt.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c b/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c
index eebf3603504..427c2677f76 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c
@@ -30,7 +30,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc17_40_clockconfig.h"
 #include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c b/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c
index a63408937a2..6b3e8b85f52 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c
@@ -33,7 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c
index 404f4711727..a072bb3f73a 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c
@@ -33,9 +33,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c
index d2e6ffb516a..41d55e9d155 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c
@@ -30,7 +30,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc17_40_clockconfig.h"
 #include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c
index 9b511fc0164..5ab838005af 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c
@@ -33,7 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
index 4071384c033..e21b25c45d2 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
@@ -59,8 +59,6 @@
 #include <nuttx/analog/adc.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c
index f7694481f08..af1def8df79 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c
@@ -35,9 +35,7 @@
 
 #include "chip.h"
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/lpc17_40_memorymap.h"
 #include "lpc17_40_emacram.h"
 #include "lpc17_40_ohciram.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
index 454ed3cd7c2..788c78ec25b 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
@@ -65,8 +65,6 @@
 #include <nuttx/can/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c
index 1bd151fe201..a32a093014a 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c
@@ -27,7 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc17_40_clrpend.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
index 6ebcf4848da..ac529259b9b 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
@@ -57,8 +57,6 @@
 #include <nuttx/analog/dac.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c
index 793bf29b5f2..ace43bfe4e7 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c
@@ -28,8 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_emc.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
index d87ed770430..00ba8ce03b9 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
@@ -51,7 +51,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
index 6029cb9a126..12e86acfbcb 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
@@ -36,8 +36,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
index 8d9d351491e..581b814eab4 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
@@ -35,7 +35,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c
index 426b58232e2..a16697e3add 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c
@@ -32,7 +32,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
index 3742e1e14a9..c7cd0adc5d6 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
@@ -67,9 +67,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
index aed53faaa0b..ad6e27ca0bf 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
@@ -35,9 +35,7 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_clrpend.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c
index a065f4e2c34..3ed79a23d82 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c
@@ -33,7 +33,7 @@
 #include <nuttx/video/fb.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_lcd.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c
index 53024f0a00e..0845109bb7f 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c
@@ -30,8 +30,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/lpc17_40_syscon.h"
 #include "hardware/lpc17_40_uart.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c
index 5973e4b3edd..b91863de1f5 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c
@@ -36,8 +36,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_pwm.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c
index daadcd72c0b..ba49967f523 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c
@@ -36,8 +36,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_pwm.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
index 0b28df15fc3..1c75f22a5a4 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_gpdma.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_sdcard.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
index e08770fe753..a0da10db368 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_uart.h"
 #include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
index cb01b94ad21..b6db132e468 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
@@ -39,8 +39,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
index 29417626166..37dca3ffc2b 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
@@ -39,8 +39,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c
index 1928eb37fba..7983ae65d93 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c
@@ -32,7 +32,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c
index fde4e459b8e..f6657359ad0 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c
@@ -36,8 +36,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_timer.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c
index 6e209df63b9..37a3b66d7ad 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c
@@ -34,8 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c
index 1cb1f068f2b..6ac05468b98 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c
@@ -42,9 +42,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_usb.h"
 #include "hardware/lpc17_40_syscon.h"
@@ -2604,7 +2602,7 @@ static void lpc17_40_dmarestart(uint8_t epphy, uint32_t descndx)
 
   /* Clear DMA descriptor status */
 
-  USB_DmaDesc[descndx].status = 0;
+  g_usbddesc[descndx].status = 0;
 
   /* Enable DMA transfer on the endpoint */
 
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
index f6b6567f97d..0f25c3a4cd0 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
@@ -47,9 +47,7 @@
 
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/lpc17_40_usb.h"
 #include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
index 0c1bf51a1ee..72e79af1581 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
@@ -35,7 +35,7 @@
 #include <nuttx/clock.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc17_40_wdt.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_wdt.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_decodeirq.c b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
index e86f527843e..fa6630397b4 100644
--- a/arch/arm/src/lpc214x/lpc214x_decodeirq.c
+++ b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
@@ -31,9 +31,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc214x_vic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_irq.c b/arch/arm/src/lpc214x/lpc214x_irq.c
index 9e452111333..8b74b87330e 100644
--- a/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -30,9 +30,7 @@
 
 #include "arm.h"
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc214x_vic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index 78d59b1b5a9..1d2a29e48f1 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -38,9 +38,7 @@
 #include <nuttx/serial/serial.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc214x_pinsel.h"
 #include "lpc214x_uart.h"
 
diff --git a/arch/arm/src/lpc214x/lpc214x_timerisr.c b/arch/arm/src/lpc214x/lpc214x_timerisr.c
index 6a93b2d84e9..41158dffabb 100644
--- a/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -30,10 +30,8 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-
 #include "lpc214x_timer.h"
 #include "lpc214x_vic.h"
 
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 6717053aefa..41fe25317d7 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -43,9 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc214x_usbdev.h"
 #include "lpc214x_pll.h"
 #include "lpc214x_power.h"
@@ -2568,7 +2566,7 @@ static void lpc214x_dmarestart(uint8_t epphy, uint32_t descndx)
 
   /* Clear DMA descriptor status */
 
-  USB_DmaDesc[descndx].status = 0;
+  g_usbddesc[descndx].status = 0;
 
   /* Enable DMA transfer on the endpoint */
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
index 1c350f125a7..ed65798b880 100644
--- a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
+++ b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
@@ -53,7 +53,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc2378.h"
 #include "lpc23xx_vic.h"
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.c b/arch/arm/src/lpc2378/lpc23xx_i2c.c
index c819b32fdb7..c13bb0ae739 100644
--- a/arch/arm/src/lpc2378/lpc23xx_i2c.c
+++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c
@@ -72,9 +72,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc23xx_pinsel.h"
 #include "lpc23xx_scb.h"
 #include "lpc23xx_i2c.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_io.c b/arch/arm/src/lpc2378/lpc23xx_io.c
index c824e1dfca0..77de66a175e 100644
--- a/arch/arm/src/lpc2378/lpc23xx_io.c
+++ b/arch/arm/src/lpc2378/lpc23xx_io.c
@@ -41,7 +41,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include <sys/types.h>
 #include "lpc23xx_scb.h"
 #include "lpc23xx_pinsel.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_irq.c b/arch/arm/src/lpc2378/lpc23xx_irq.c
index f65ce0d7013..0b2e08c55e6 100644
--- a/arch/arm/src/lpc2378/lpc23xx_irq.c
+++ b/arch/arm/src/lpc2378/lpc23xx_irq.c
@@ -52,8 +52,6 @@
 #include "arm.h"
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "lpc2378.h"
 #include "lpc23xx_vic.h"
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
index 5aa3810c1b5..99d46596776 100644
--- a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
+++ b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
@@ -65,7 +65,7 @@
 #include <sys/types.h>
 
 #include "arm.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc2378.h"
 #include "lpc23xx_pinsel.h"
 #include "lpc23xx_scb.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index b9f63557cb0..fd92b5ef1d1 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -59,8 +59,7 @@
 #include <nuttx/serial/serial.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc2378.h"
 #include "lpc23xx_scb.h"
 #include "lpc23xx_pinsel.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c
index 0cba0101120..187f3b871e2 100644
--- a/arch/arm/src/lpc2378/lpc23xx_spi.c
+++ b/arch/arm/src/lpc2378/lpc23xx_spi.c
@@ -58,8 +58,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "lpc23xx_pinsel.h"
 #include "lpc23xx_scb.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
index bf9284b4ae4..bf3036c9480 100644
--- a/arch/arm/src/lpc2378/lpc23xx_timerisr.c
+++ b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
@@ -50,8 +50,7 @@
 
 #include "clock/clock.h"
 #include "lpc2378.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc23xx_scb.h"
 #include "lpc23xx_vic.h"
 #include "lpc23xx_timer.h"
diff --git a/arch/arm/src/lpc31xx/lpc31.h b/arch/arm/src/lpc31xx/lpc31.h
index be0ae38c5f9..45f6b336d20 100644
--- a/arch/arm/src/lpc31xx/lpc31.h
+++ b/arch/arm/src/lpc31xx/lpc31.h
@@ -32,7 +32,6 @@
 #include <stdbool.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "chip.h"
 #include "lpc31_ioconfig.h"
 
diff --git a/arch/arm/src/lpc31xx/lpc31_allocateheap.c b/arch/arm/src/lpc31xx/lpc31_allocateheap.c
index dbc7a595f2b..514dc375769 100644
--- a/arch/arm/src/lpc31xx/lpc31_allocateheap.c
+++ b/arch/arm/src/lpc31xx/lpc31_allocateheap.c
@@ -34,7 +34,6 @@
 
 #include "arm.h"
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc31_memorymap.h"
 
diff --git a/arch/arm/src/lpc31xx/lpc31_bcrndx.c b/arch/arm/src/lpc31xx/lpc31_bcrndx.c
index 61b2db1d19c..20b7403b522 100644
--- a/arch/arm/src/lpc31xx/lpc31_bcrndx.c
+++ b/arch/arm/src/lpc31xx/lpc31_bcrndx.c
@@ -30,7 +30,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_boot.c b/arch/arm/src/lpc31xx/lpc31_boot.c
index 1642eace9b6..52125954573 100644
--- a/arch/arm/src/lpc31xx/lpc31_boot.c
+++ b/arch/arm/src/lpc31xx/lpc31_boot.c
@@ -28,7 +28,6 @@
 #include "chip.h"
 #include "arm.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #ifdef CONFIG_PAGING
 #  include <nuttx/page.h>
diff --git a/arch/arm/src/lpc31xx/lpc31_cgudrvr.h b/arch/arm/src/lpc31xx/lpc31_cgudrvr.h
index a6e069d2c11..40b92873341 100644
--- a/arch/arm/src/lpc31xx/lpc31_cgudrvr.h
+++ b/arch/arm/src/lpc31xx/lpc31_cgudrvr.h
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc31_cgu.h"
 
 /****************************************************************************
@@ -492,7 +492,8 @@ struct lpc31_clkinit_s
   {
     uint16_t  sel;
     struct lpc31_fdivconfig_s cfg;
-  } dynfdiv[CGU_NDYNFRACDIV];
+  }
+  dynfdiv[CGU_NDYNFRACDIV];
 #endif
 };
 
diff --git a/arch/arm/src/lpc31xx/lpc31_clkdomain.c b/arch/arm/src/lpc31xx/lpc31_clkdomain.c
index 6c0edfa07b1..a21e393f725 100644
--- a/arch/arm/src/lpc31xx/lpc31_clkdomain.c
+++ b/arch/arm/src/lpc31xx/lpc31_clkdomain.c
@@ -30,7 +30,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_clkfreq.c b/arch/arm/src/lpc31xx/lpc31_clkfreq.c
index 01458b71148..77cbee56fc1 100644
--- a/arch/arm/src/lpc31xx/lpc31_clkfreq.c
+++ b/arch/arm/src/lpc31xx/lpc31_clkfreq.c
@@ -30,7 +30,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_decodeirq.c b/arch/arm/src/lpc31xx/lpc31_decodeirq.c
index a139956113e..71207146360 100644
--- a/arch/arm/src/lpc31xx/lpc31_decodeirq.c
+++ b/arch/arm/src/lpc31xx/lpc31_decodeirq.c
@@ -32,8 +32,6 @@
 #include <nuttx/arch.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
 #include "arm_internal.h"
 #include "group/group.h"
 
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 4990137a548..7afeddcf742 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -43,7 +43,7 @@
 #include <nuttx/usb/usbhost_devaddr.h>
 #include <nuttx/usb/usbhost_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc31.h"
 #include "lpc31_cgudrvr.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_esrndx.c b/arch/arm/src/lpc31xx/lpc31_esrndx.c
index 07bfc76554d..dd7241d0551 100644
--- a/arch/arm/src/lpc31xx/lpc31_esrndx.c
+++ b/arch/arm/src/lpc31xx/lpc31_esrndx.c
@@ -30,7 +30,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_fdcndx.c b/arch/arm/src/lpc31xx/lpc31_fdcndx.c
index 28b08b4037e..3fff0aaacba 100644
--- a/arch/arm/src/lpc31xx/lpc31_fdcndx.c
+++ b/arch/arm/src/lpc31xx/lpc31_fdcndx.c
@@ -30,7 +30,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_i2c.c b/arch/arm/src/lpc31xx/lpc31_i2c.c
index a269d8c07d4..906d84df18e 100644
--- a/arch/arm/src/lpc31xx/lpc31_i2c.c
+++ b/arch/arm/src/lpc31xx/lpc31_i2c.c
@@ -42,9 +42,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc31_i2c.h"
 #include "lpc31_evntrtr.h"
 #include "lpc31_syscreg.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_irq.c b/arch/arm/src/lpc31xx/lpc31_irq.c
index 9418060f73a..8e787f872cd 100644
--- a/arch/arm/src/lpc31xx/lpc31_irq.c
+++ b/arch/arm/src/lpc31xx/lpc31_irq.c
@@ -32,9 +32,7 @@
 #include <arch/irq.h>
 
 #include "arm.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc31_intc.h"
 #include "lpc31_cgudrvr.h"
 #include "lpc31.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_lowputc.c b/arch/arm/src/lpc31xx/lpc31_lowputc.c
index 2b340610c7a..a398c04e84e 100644
--- a/arch/arm/src/lpc31xx/lpc31_lowputc.c
+++ b/arch/arm/src/lpc31xx/lpc31_lowputc.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc31_cgudrvr.h"
 #include "lpc31_uart.h"
 
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index ff4f88dc500..55dcd52bf73 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -37,9 +37,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/serial/serial.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc31_cgudrvr.h"
 #include "lpc31_uart.h"
 
diff --git a/arch/arm/src/lpc31xx/lpc31_softreset.c b/arch/arm/src/lpc31xx/lpc31_softreset.c
index 09111a0d79f..b1d0b27b8cc 100644
--- a/arch/arm/src/lpc31xx/lpc31_softreset.c
+++ b/arch/arm/src/lpc31xx/lpc31_softreset.c
@@ -30,7 +30,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc31_cgudrvr.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_timerisr.c b/arch/arm/src/lpc31xx/lpc31_timerisr.c
index a9326951eca..22144f863fc 100644
--- a/arch/arm/src/lpc31xx/lpc31_timerisr.c
+++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c
@@ -33,8 +33,6 @@
 
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "lpc31_timer.h"
 #include "lpc31.h"
 
diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c
index 2593e4567df..d8ecc85a824 100644
--- a/arch/arm/src/lpc31xx/lpc31_usbdev.c
+++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c
@@ -43,9 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc31_usbotg.h"
 #include "lpc31_evntrtr.h"
 #include "lpc31_syscreg.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_adc.c b/arch/arm/src/lpc43xx/lpc43_adc.c
index 81c28fa9aa2..104158ce44f 100644
--- a/arch/arm/src/lpc43xx/lpc43_adc.c
+++ b/arch/arm/src/lpc43xx/lpc43_adc.c
@@ -63,8 +63,6 @@
 #include <nuttx/analog/adc.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "lpc43_adc.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_aes.c b/arch/arm/src/lpc43xx/lpc43_aes.c
index 53ef95c230a..a26b863ff08 100644
--- a/arch/arm/src/lpc43xx/lpc43_aes.c
+++ b/arch/arm/src/lpc43xx/lpc43_aes.c
@@ -36,8 +36,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include <chip/lpc43_aes.h>
 
diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
index 0d28651ac20..0d1fd95c722 100644
--- a/arch/arm/src/lpc43xx/lpc43_allocateheap.c
+++ b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
@@ -38,9 +38,7 @@
 
 #include "mpu.h"
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc43_mpuinit.h"
 #include "lpc43_emacram.h"
 #include "lpc43_usbram.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_can.c b/arch/arm/src/lpc43xx/lpc43_can.c
index 48e0b90ec90..f41c0b6bc1d 100644
--- a/arch/arm/src/lpc43xx/lpc43_can.c
+++ b/arch/arm/src/lpc43xx/lpc43_can.c
@@ -38,8 +38,6 @@
 #include <nuttx/can/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "lpc43_gpio.h"
 #include "hardware/lpc43_can.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_cgu.c b/arch/arm/src/lpc43xx/lpc43_cgu.c
index 8f4d11089a3..43d47a5d02c 100644
--- a/arch/arm/src/lpc43xx/lpc43_cgu.c
+++ b/arch/arm/src/lpc43xx/lpc43_cgu.c
@@ -27,7 +27,7 @@
 #include <nuttx/arch.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc43_cgu.h"
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/lpc43xx/lpc43_clrpend.c b/arch/arm/src/lpc43xx/lpc43_clrpend.c
index 61fe4922dc2..2b4374a3a07 100644
--- a/arch/arm/src/lpc43xx/lpc43_clrpend.c
+++ b/arch/arm/src/lpc43xx/lpc43_clrpend.c
@@ -27,8 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc43_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_dac.c b/arch/arm/src/lpc43xx/lpc43_dac.c
index 5fe778dd704..51beb36c71d 100644
--- a/arch/arm/src/lpc43xx/lpc43_dac.c
+++ b/arch/arm/src/lpc43xx/lpc43_dac.c
@@ -62,8 +62,6 @@
 #include <nuttx/analog/dac.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "lpc43_syscon.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_debug.c b/arch/arm/src/lpc43xx/lpc43_debug.c
index 0f325d2eb3f..e880ac8f5bb 100644
--- a/arch/arm/src/lpc43xx/lpc43_debug.c
+++ b/arch/arm/src/lpc43xx/lpc43_debug.c
@@ -28,7 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc43_pinconfig.h"
 #include "lpc43_gpio.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index afbef8ee177..25bae0b0711 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -47,8 +47,7 @@
 
 #include "chip.h"
 #include "hardware/lpc43_usb0.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc43_cgu.h"
 #include "hardware/lpc43_creg.h"
 #include "hardware/lpc43_evntrtr.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_emc.c b/arch/arm/src/lpc43xx/lpc43_emc.c
index ef8b8f43ea5..df1c862b5c3 100644
--- a/arch/arm/src/lpc43xx/lpc43_emc.c
+++ b/arch/arm/src/lpc43xx/lpc43_emc.c
@@ -24,7 +24,6 @@
 #include <nuttx/wdog.h>
 
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "lpc43_pinconfig.h"
 #include "lpc43_emc.h"
@@ -33,7 +32,7 @@
 #include "hardware/lpc43_ccu.h"
 #include "lpc43_rgu.h"
 #include "lpc43_gpio.h"
-#include "arm_arch.h"
+
 #include <arch/board/board.h>
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index a3079ba5176..cfcd1c1d02e 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -49,7 +49,6 @@
 #endif
 
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "lpc43_pinconfig.h"
 #include "lpc43_ethernet.h"
@@ -58,7 +57,7 @@
 #include "hardware/lpc43_ccu.h"
 #include "lpc43_rgu.h"
 #include "lpc43_gpio.h"
-#include "arm_arch.h"
+
 #include <arch/board/board.h>
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c
index 2143fb37f5b..a604dc640a6 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c
@@ -34,8 +34,6 @@
 #include <nuttx/arch.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "lpc43_ccu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_gpio.c b/arch/arm/src/lpc43xx/lpc43_gpio.c
index ece1b4c1657..5a5bc2e6a02 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpio.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpio.c
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc43_gpio.h"
 
 #ifdef CONFIG_LPC43_GPIO_IRQ
diff --git a/arch/arm/src/lpc43xx/lpc43_gpioint.c b/arch/arm/src/lpc43xx/lpc43_gpioint.c
index 7c4a917e41a..591001e0316 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpioint.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpioint.c
@@ -51,7 +51,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/lpc43_scu.h"
 #include "hardware/lpc43_gpio.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c
index 5393c86131a..b181205fdfb 100644
--- a/arch/arm/src/lpc43xx/lpc43_i2c.c
+++ b/arch/arm/src/lpc43xx/lpc43_i2c.c
@@ -70,9 +70,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc43_i2c.h"
 #include "lpc43_scu.h"
 #include "lpc43_ccu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index 3ae81acaf68..67116770aa0 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -36,9 +36,7 @@
 #include "chip.h"
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc43_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_pinconfig.c b/arch/arm/src/lpc43xx/lpc43_pinconfig.c
index 5f84fe7b897..d792b05ae02 100644
--- a/arch/arm/src/lpc43xx/lpc43_pinconfig.c
+++ b/arch/arm/src/lpc43xx/lpc43_pinconfig.c
@@ -28,7 +28,7 @@
 #include <nuttx/arch.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc43_pinconfig.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_rgu.c b/arch/arm/src/lpc43xx/lpc43_rgu.c
index 2e33848fb68..9722ac1d627 100644
--- a/arch/arm/src/lpc43xx/lpc43_rgu.c
+++ b/arch/arm/src/lpc43xx/lpc43_rgu.c
@@ -28,8 +28,7 @@
 #include <nuttx/arch.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc43_rgu.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c
index 5faaf9ccb91..eeb44d39a6d 100644
--- a/arch/arm/src/lpc43xx/lpc43_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_rit.c
@@ -39,7 +39,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc43_rit.h"
 #include "lpc43_rit.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_rtc.c b/arch/arm/src/lpc43xx/lpc43_rtc.c
index 54591f9ec94..b6b3c334496 100644
--- a/arch/arm/src/lpc43xx/lpc43_rtc.c
+++ b/arch/arm/src/lpc43xx/lpc43_rtc.c
@@ -34,7 +34,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "chip.h"
 #include "hardware/lpc43_creg.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
index af4294675c1..b23bcbadbc4 100644
--- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c
+++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
@@ -41,8 +41,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/lpc43_pinconfig.h"
 #include "lpc43_cgu.h"
 #include "lpc43_ccu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index 7682ac599e4..05f7bc61712 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -46,9 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc43_config.h"
 #include "lpc43_serial.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index 591c6fab4c0..7280f63d6b3 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -37,8 +37,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "lpc43_pinconfig.h"
 #include "lpc43_spi.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index 687680adf45..4f0dffad74c 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -41,8 +41,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc43_cgu.h"
 #include "lpc43_spifi.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index 861609fad79..c8845f39de8 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -39,8 +39,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "lpc43_ssp.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c
index f7bbed8a61e..c59e3364448 100644
--- a/arch/arm/src/lpc43xx/lpc43_start.c
+++ b/arch/arm/src/lpc43xx/lpc43_start.c
@@ -52,7 +52,6 @@
 #include <nuttx/init.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
index ca8f32518ae..02c6091dcfe 100644
--- a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
@@ -40,7 +40,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/lpc43_rit.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_timer.c b/arch/arm/src/lpc43xx/lpc43_timer.c
index ee518983344..50e7a96cb4e 100644
--- a/arch/arm/src/lpc43xx/lpc43_timer.c
+++ b/arch/arm/src/lpc43xx/lpc43_timer.c
@@ -37,7 +37,7 @@
 #include <nuttx/timers/timer.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc43_timer.h"
 
 #if defined(CONFIG_TIMER) && (defined(CONFIG_LPC43_TMR0) || \
diff --git a/arch/arm/src/lpc43xx/lpc43_timerisr.c b/arch/arm/src/lpc43xx/lpc43_timerisr.c
index 1030686ad5b..be9bb2a4995 100644
--- a/arch/arm/src/lpc43xx/lpc43_timerisr.c
+++ b/arch/arm/src/lpc43xx/lpc43_timerisr.c
@@ -34,8 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_uart.c b/arch/arm/src/lpc43xx/lpc43_uart.c
index f9077650520..d0787db4e08 100644
--- a/arch/arm/src/lpc43xx/lpc43_uart.c
+++ b/arch/arm/src/lpc43xx/lpc43_uart.c
@@ -31,8 +31,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "lpc43_config.h"
 #include "lpc43_pinconfig.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index daa1ce1beb3..62e9c8e9954 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -43,9 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc43_usb0dev.h"
 #include "lpc43_creg.h"
 #include "lpc43_ccu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_wwdt.c b/arch/arm/src/lpc43xx/lpc43_wwdt.c
index b1a2ce6d1c7..8f9a738041d 100644
--- a/arch/arm/src/lpc43xx/lpc43_wwdt.c
+++ b/arch/arm/src/lpc43xx/lpc43_wwdt.c
@@ -34,7 +34,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc43_wdt.h"
 #include "hardware/lpc43_wwdt.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc546x_enableclk.h b/arch/arm/src/lpc54xx/lpc546x_enableclk.h
index e264096d6ac..21cdc0538ff 100644
--- a/arch/arm/src/lpc54xx/lpc546x_enableclk.h
+++ b/arch/arm/src/lpc54xx/lpc546x_enableclk.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc54_syscon.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc546x_power.h b/arch/arm/src/lpc54xx/lpc546x_power.h
index f646f9329c8..ad1e6d2b9ef 100644
--- a/arch/arm/src/lpc54xx/lpc546x_power.h
+++ b/arch/arm/src/lpc54xx/lpc546x_power.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc54_syscon.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_allocateheap.c b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
index ee0dd0459d8..907e48b6955 100644
--- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c
+++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
@@ -34,9 +34,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/userspace.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/lpc54_memorymap.h"
 #include "lpc54_mpuinit.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.c b/arch/arm/src/lpc54xx/lpc54_clockconfig.c
index 59385e8021c..0907d4de5d6 100644
--- a/arch/arm/src/lpc54xx/lpc54_clockconfig.c
+++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.c
@@ -52,9 +52,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/lpc54_syscon.h"
 #include "lpc54_power.h"
 #include "lpc54_clockconfig.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_clrpend.c b/arch/arm/src/lpc54xx/lpc54_clrpend.c
index 6021e152306..2f01d6abcf0 100644
--- a/arch/arm/src/lpc54xx/lpc54_clrpend.c
+++ b/arch/arm/src/lpc54xx/lpc54_clrpend.c
@@ -27,8 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc54_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_dma.c b/arch/arm/src/lpc54xx/lpc54_dma.c
index c366647f6c6..dc88c86beb7 100644
--- a/arch/arm/src/lpc54xx/lpc54_dma.c
+++ b/arch/arm/src/lpc54xx/lpc54_dma.c
@@ -34,8 +34,6 @@
 #include <nuttx/arch.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/lpc54_inputmux.h"
 #include "hardware/lpc54_dma.h"
 #include "lpc54_enableclk.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_emc.c b/arch/arm/src/lpc54xx/lpc54_emc.c
index b4c75ec63f5..cdf51526132 100644
--- a/arch/arm/src/lpc54xx/lpc54_emc.c
+++ b/arch/arm/src/lpc54xx/lpc54_emc.c
@@ -50,8 +50,7 @@
 
 #include <nuttx/clock.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/lpc54_syscon.h"
 #include "hardware/lpc54_emc.h"
 #include "lpc54_config.h"
@@ -388,7 +387,7 @@ void lpc54_emc_sdram_initialize(
 
   putreg32(2 * EMC_REFRESH_CLOCK_SCALE, LPC54_EMC_DYNREFRESH);
 
-  for (i = 0; i < EMC_SDRAM_WAIT_CYCLES / 2; i ++)
+  for (j = 0; j < EMC_SDRAM_WAIT_CYCLES / 2; j++)
     {
     }
 
diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c
index 6077a922665..3caf281a953 100644
--- a/arch/arm/src/lpc54xx/lpc54_ethernet.c
+++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c
@@ -87,7 +87,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc54_syscon.h"
 #include "hardware/lpc54_pinmux.h"
 #include "hardware/lpc54_ethernet.h"
@@ -3032,14 +3032,13 @@ static int lpc54_phy_reset(struct lpc54_ethdriver_s *priv)
  *
  ****************************************************************************/
 
-int arm_netinitialize(int intf)
+void arm_netinitialize(void)
 {
   struct lpc54_ethdriver_s *priv;
   int ret;
 
   /* Get the interface structure associated with this interface number. */
 
-  DEBUGASSERT(intf == 0);
   priv = &g_ethdriver;
 
   /* Attach the three Ethernet-related IRQs to the handlers */
@@ -3050,7 +3049,7 @@ int arm_netinitialize(int intf)
       /* We could not attach the ISR to the interrupt */
 
       nerr("ERROR: irq_attach failed: %d\n", ret);
-      return -EAGAIN;
+      return;
     }
 
 #if 0 /* Not used */
@@ -3060,7 +3059,7 @@ int arm_netinitialize(int intf)
       /* We could not attach the ISR to the interrupt */
 
       nerr("ERROR:  irq_attach for PMT failed: %d\n", ret);
-      return -EAGAIN;
+      return;
     }
 
   ret = irq_attach(LPC54_IRQ_ETHERNETMACLP, lpc54_mac_interrupt, priv);
@@ -3069,7 +3068,7 @@ int arm_netinitialize(int intf)
       /* We could not attach the ISR to the interrupt */
 
       nerr("ERROR:  irq_attach for MAC failed: %d\n", ret);
-      return -EAGAIN;
+      return;
     }
 #endif
 
@@ -3154,11 +3153,10 @@ int arm_netinitialize(int intf)
       goto errout_with_clock;
     }
 
-  return OK;
+  return;
 
 errout_with_clock:
   lpc54_eth_disableclk();
-  return ret;
 }
 
 #endif /* CONFIG_LPC54_ETHERNET */
diff --git a/arch/arm/src/lpc54xx/lpc54_gpio.c b/arch/arm/src/lpc54xx/lpc54_gpio.c
index f68a344864b..26d8ca41525 100644
--- a/arch/arm/src/lpc54xx/lpc54_gpio.c
+++ b/arch/arm/src/lpc54xx/lpc54_gpio.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc54_iocon.h"
 #include "hardware/lpc54_gpio.h"
 #include "lpc54_gpio.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_gpioirq.c b/arch/arm/src/lpc54xx/lpc54_gpioirq.c
index 080cd13d250..1f618877717 100644
--- a/arch/arm/src/lpc54xx/lpc54_gpioirq.c
+++ b/arch/arm/src/lpc54xx/lpc54_gpioirq.c
@@ -30,8 +30,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/lpc54_syscon.h"
 #include "hardware/lpc54_inputmux.h"
 #include "hardware/lpc54_pint.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
index e488999182c..1e0447cdff4 100644
--- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
@@ -65,9 +65,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/lpc54_pinmux.h"
 #include "hardware/lpc54_syscon.h"
 #include "hardware/lpc54_flexcomm.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c
index cf98323a54d..5ec1cb5f181 100644
--- a/arch/arm/src/lpc54xx/lpc54_irq.c
+++ b/arch/arm/src/lpc54xx/lpc54_irq.c
@@ -36,9 +36,7 @@
 #include "chip.h"
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc54_gpio.h"
 #include "lpc54_irq.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_lcd.c b/arch/arm/src/lpc54xx/lpc54_lcd.c
index db588b670b0..1468da8d113 100644
--- a/arch/arm/src/lpc54xx/lpc54_lcd.c
+++ b/arch/arm/src/lpc54xx/lpc54_lcd.c
@@ -36,7 +36,7 @@
 
 #include <nuttx/video/fb.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc54_syscon.h"
 #include "hardware/lpc54_pinmux.h"
 #include "lpc54_config.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_lowputc.c b/arch/arm/src/lpc54xx/lpc54_lowputc.c
index 0dc8fec17fa..149d3a524a6 100644
--- a/arch/arm/src/lpc54xx/lpc54_lowputc.c
+++ b/arch/arm/src/lpc54xx/lpc54_lowputc.c
@@ -48,9 +48,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/lpc54_memorymap.h"
 #include "hardware/lpc54_syscon.h"
 #include "hardware/lpc54_flexcomm.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_reset.c b/arch/arm/src/lpc54xx/lpc54_reset.c
index 9597ea4c803..47a990d58a2 100644
--- a/arch/arm/src/lpc54xx/lpc54_reset.c
+++ b/arch/arm/src/lpc54xx/lpc54_reset.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc54_reset.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_rtc.c b/arch/arm/src/lpc54xx/lpc54_rtc.c
index 9053fe57cc0..df226a2cc98 100644
--- a/arch/arm/src/lpc54xx/lpc54_rtc.c
+++ b/arch/arm/src/lpc54xx/lpc54_rtc.c
@@ -37,8 +37,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/lpc54_rtc.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_rtc.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
index 3056d82c79b..3d2f57d34bd 100644
--- a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
+++ b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
@@ -33,8 +33,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/lpc54_rtc.h"
 #include "lpc54_rtc.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
index 5c4e9086d6b..edb088d329f 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
@@ -41,7 +41,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc54_pinmux.h"
 #include "hardware/lpc54_syscon.h"
 #include "lpc54_enableclk.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c
index 6d4eea4daab..93680b22c4a 100644
--- a/arch/arm/src/lpc54xx/lpc54_serial.c
+++ b/arch/arm/src/lpc54xx/lpc54_serial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "lpc54_config.h"
 #include "hardware/lpc54_usart.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.c b/arch/arm/src/lpc54xx/lpc54_spi_master.c
index 6210d81ed21..264f34280a6 100644
--- a/arch/arm/src/lpc54xx/lpc54_spi_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_spi_master.c
@@ -47,8 +47,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/lpc54_pinmux.h"
 #include "hardware/lpc54_syscon.h"
 #include "hardware/lpc54_flexcomm.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_start.c b/arch/arm/src/lpc54xx/lpc54_start.c
index 67c9c9bf77e..09d55239bbe 100644
--- a/arch/arm/src/lpc54xx/lpc54_start.c
+++ b/arch/arm/src/lpc54xx/lpc54_start.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c
index 817d9d4d950..e59df7ab81b 100644
--- a/arch/arm/src/lpc54xx/lpc54_tickless.c
+++ b/arch/arm/src/lpc54xx/lpc54_tickless.c
@@ -32,7 +32,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/lpc54_rit.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_timerisr.c b/arch/arm/src/lpc54xx/lpc54_timerisr.c
index 4b43a912651..b0b53af4f87 100644
--- a/arch/arm/src/lpc54xx/lpc54_timerisr.c
+++ b/arch/arm/src/lpc54xx/lpc54_timerisr.c
@@ -34,8 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/lpc54_syscon.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
index 821f8d37811..f4ba8be2ec9 100644
--- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
+++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
@@ -46,9 +46,7 @@
 
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/lpc54_usb.h"
 #include "hardware/lpc54_syscon.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_wwdt.c b/arch/arm/src/lpc54xx/lpc54_wwdt.c
index dbc2edd18b3..f8a896854d9 100644
--- a/arch/arm/src/lpc54xx/lpc54_wwdt.c
+++ b/arch/arm/src/lpc54xx/lpc54_wwdt.c
@@ -34,7 +34,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/lpc54_wwdt.h"
 #include "lpc54_power.h"
 #include "lpc54_wdt.h"
diff --git a/arch/arm/src/max326xx/common/max326_clrpend.c b/arch/arm/src/max326xx/common/max326_clrpend.c
index 45840926a2a..885c8667a5a 100644
--- a/arch/arm/src/max326xx/common/max326_clrpend.c
+++ b/arch/arm/src/max326xx/common/max326_clrpend.c
@@ -27,8 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "max326_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/max326xx/common/max326_icc.c b/arch/arm/src/max326xx/common/max326_icc.c
index dbbb3f36157..88f57c1a445 100644
--- a/arch/arm/src/max326xx/common/max326_icc.c
+++ b/arch/arm/src/max326xx/common/max326_icc.c
@@ -28,7 +28,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/max326_icc.h"
 #include "max326_periphclks.h"
 #include "max326_icc.h"
diff --git a/arch/arm/src/max326xx/common/max326_irq.c b/arch/arm/src/max326xx/common/max326_irq.c
index 6765753927c..478868a4fa1 100644
--- a/arch/arm/src/max326xx/common/max326_irq.c
+++ b/arch/arm/src/max326xx/common/max326_irq.c
@@ -36,9 +36,7 @@
 #include "chip.h"
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "max326_gpio.h"
 #include "max326_irq.h"
 
diff --git a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
index 2489e59da02..acdfd6ebe6a 100644
--- a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
+++ b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
@@ -33,8 +33,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "max326_rtc.h"
 
diff --git a/arch/arm/src/max326xx/common/max326_start.c b/arch/arm/src/max326xx/common/max326_start.c
index 63575b2ce87..cde8e280085 100644
--- a/arch/arm/src/max326xx/common/max326_start.c
+++ b/arch/arm/src/max326xx/common/max326_start.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/max326xx/common/max326_timerisr.c b/arch/arm/src/max326xx/common/max326_timerisr.c
index f343b4a7025..6c335eaece7 100644
--- a/arch/arm/src/max326xx/common/max326_timerisr.c
+++ b/arch/arm/src/max326xx/common/max326_timerisr.c
@@ -35,7 +35,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "max326_clockconfig.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/max326xx/max32660/max32660_clockconfig.c b/arch/arm/src/max326xx/max32660/max32660_clockconfig.c
index a2002eb3544..77718758b6d 100644
--- a/arch/arm/src/max326xx/max32660/max32660_clockconfig.c
+++ b/arch/arm/src/max326xx/max32660/max32660_clockconfig.c
@@ -29,8 +29,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/max326_gcr.h"
 #include "hardware/max326_pwrseq.h"
 #include "hardware/max326_flc.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_dma.c b/arch/arm/src/max326xx/max32660/max32660_dma.c
index 9a311afdfd5..0e9b4796796 100644
--- a/arch/arm/src/max326xx/max32660/max32660_dma.c
+++ b/arch/arm/src/max326xx/max32660/max32660_dma.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/max326_dma.h"
 #include "max326_periphclks.h"
 #include "max326_dma.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_gpio.c b/arch/arm/src/max326xx/max32660/max32660_gpio.c
index 9db7286fa30..6a0e4981fa4 100644
--- a/arch/arm/src/max326xx/max32660/max32660_gpio.c
+++ b/arch/arm/src/max326xx/max32660/max32660_gpio.c
@@ -31,8 +31,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "max326_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/max326xx/max32660/max32660_gpioirq.c b/arch/arm/src/max326xx/max32660/max32660_gpioirq.c
index 509dc51961d..dbbdaf9c6e5 100644
--- a/arch/arm/src/max326xx/max32660/max32660_gpioirq.c
+++ b/arch/arm/src/max326xx/max32660/max32660_gpioirq.c
@@ -30,8 +30,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "max326_gpio.h"
 
 #ifdef CONFIG_MAX326XX_GPIOIRQ
diff --git a/arch/arm/src/max326xx/max32660/max32660_lowputc.c b/arch/arm/src/max326xx/max32660/max32660_lowputc.c
index f1c33cf9b02..8ba286a449e 100644
--- a/arch/arm/src/max326xx/max32660/max32660_lowputc.c
+++ b/arch/arm/src/max326xx/max32660/max32660_lowputc.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/max326_memorymap.h"
 #include "hardware/max326_pinmux.h"
 #include "hardware/max326_uart.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_periphclks.h b/arch/arm/src/max326xx/max32660/max32660_periphclks.h
index c23fc5c99f7..8cefb2dbaae 100644
--- a/arch/arm/src/max326xx/max32660/max32660_periphclks.h
+++ b/arch/arm/src/max326xx/max32660/max32660_periphclks.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/max326_gcr.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/max326xx/max32660/max32660_rtc.c b/arch/arm/src/max326xx/max32660/max32660_rtc.c
index d90a2778129..4a174855daa 100644
--- a/arch/arm/src/max326xx/max32660/max32660_rtc.c
+++ b/arch/arm/src/max326xx/max32660/max32660_rtc.c
@@ -38,8 +38,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/timers/rtc.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/max326_rtc.h"
 #include "max326_rtc.h"
 
diff --git a/arch/arm/src/max326xx/max32660/max32660_serial.c b/arch/arm/src/max326xx/max32660/max32660_serial.c
index de5f43ae637..7c76975b8d5 100644
--- a/arch/arm/src/max326xx/max32660/max32660_serial.c
+++ b/arch/arm/src/max326xx/max32660/max32660_serial.c
@@ -40,9 +40,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "max326_config.h"
 #include "hardware/max326_uart.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_spim.c b/arch/arm/src/max326xx/max32660/max32660_spim.c
index c51f8c6edb2..93186b920af 100644
--- a/arch/arm/src/max326xx/max32660/max32660_spim.c
+++ b/arch/arm/src/max326xx/max32660/max32660_spim.c
@@ -61,8 +61,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/max326_pinmux.h"
 #include "max326_clockconfig.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_wdt.c b/arch/arm/src/max326xx/max32660/max32660_wdt.c
index dd9bad1fb08..903ae61e401 100644
--- a/arch/arm/src/max326xx/max32660/max32660_wdt.c
+++ b/arch/arm/src/max326xx/max32660/max32660_wdt.c
@@ -37,9 +37,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/max326_wdt.h"
 #include "max326_clockconfig.h"
 #include "max326_wdt.h"
diff --git a/arch/arm/src/moxart/moxart_16550.c b/arch/arm/src/moxart/moxart_16550.c
index 01a907e7976..49305d44143 100644
--- a/arch/arm/src/moxart/moxart_16550.c
+++ b/arch/arm/src/moxart/moxart_16550.c
@@ -36,7 +36,7 @@
 #include <nuttx/serial/mxser.h>
 
 #include "arm.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/moxart/moxart_irq.c b/arch/arm/src/moxart/moxart_irq.c
index 512b01414d3..88a00926c72 100644
--- a/arch/arm/src/moxart/moxart_irq.c
+++ b/arch/arm/src/moxart/moxart_irq.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "arm.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/moxart/moxart_systemreset.c b/arch/arm/src/moxart/moxart_systemreset.c
index 0caa26a261e..3e596f9a24a 100644
--- a/arch/arm/src/moxart/moxart_systemreset.c
+++ b/arch/arm/src/moxart/moxart_systemreset.c
@@ -29,7 +29,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/moxart/moxart_timer.c b/arch/arm/src/moxart/moxart_timer.c
index 17c94245654..c18fbdb6cb5 100644
--- a/arch/arm/src/moxart/moxart_timer.c
+++ b/arch/arm/src/moxart/moxart_timer.c
@@ -29,7 +29,7 @@
 #include <arch/board/board.h>
 
 #include "arm.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/nrf52/nrf52832_errdata.c b/arch/arm/src/nrf52/nrf52832_errdata.c
index c7c0dab7129..cc98fcfaa75 100644
--- a/arch/arm/src/nrf52/nrf52832_errdata.c
+++ b/arch/arm/src/nrf52/nrf52832_errdata.c
@@ -35,13 +35,12 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/nrf52_utils.h"
 #include "hardware/nrf52_rng.h"
 #include "hardware/nrf52_ficr.h"
 #include "hardware/nrf52_temp.h"
-#include "arm_internal.h"
 
 /****************************************************************************
  * Private Functions
diff --git a/arch/arm/src/nrf52/nrf52_adc.c b/arch/arm/src/nrf52/nrf52_adc.c
index 73c38036c15..50a2211f955 100644
--- a/arch/arm/src/nrf52/nrf52_adc.c
+++ b/arch/arm/src/nrf52/nrf52_adc.c
@@ -35,8 +35,7 @@
 #include <nuttx/analog/adc.h>
 #include <nuttx/analog/ioctl.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nrf52_gpio.h"
 #include "nrf52_adc.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_allocateheap.c b/arch/arm/src/nrf52/nrf52_allocateheap.c
index cf431b0e610..63af40af5a5 100644
--- a/arch/arm/src/nrf52/nrf52_allocateheap.c
+++ b/arch/arm/src/nrf52/nrf52_allocateheap.c
@@ -34,9 +34,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/userspace.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/nrf52_memorymap.h"
 
 #include <arch/board/board.h>
diff --git a/arch/arm/src/nrf52/nrf52_clockconfig.c b/arch/arm/src/nrf52/nrf52_clockconfig.c
index 0e4af50f88d..ae1ce4d64d2 100644
--- a/arch/arm/src/nrf52/nrf52_clockconfig.c
+++ b/arch/arm/src/nrf52/nrf52_clockconfig.c
@@ -30,9 +30,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52_clockconfig.h"
 #include "hardware/nrf52_clock.h"
 #include "hardware/nrf52_power.h"
diff --git a/arch/arm/src/nrf52/nrf52_flash.c b/arch/arm/src/nrf52/nrf52_flash.c
index 4cab7ea64f8..eddcec0f63c 100644
--- a/arch/arm/src/nrf52/nrf52_flash.c
+++ b/arch/arm/src/nrf52/nrf52_flash.c
@@ -52,9 +52,7 @@
 #include <nuttx/progmem.h>
 
 #include "chip.h"
-
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/nrf52_ficr.h"
 #include "hardware/nrf52_nvmc.h"
 #include "nrf52_nvmc.h"
diff --git a/arch/arm/src/nrf52/nrf52_gpio.c b/arch/arm/src/nrf52/nrf52_gpio.c
index f914f1c8e3b..c43b925c3e9 100644
--- a/arch/arm/src/nrf52/nrf52_gpio.c
+++ b/arch/arm/src/nrf52/nrf52_gpio.c
@@ -32,7 +32,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/nrf52_gpio.h"
 #include "nrf52_gpio.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_gpiote.c b/arch/arm/src/nrf52/nrf52_gpiote.c
index c7c9f0dd4ae..31607a75e68 100644
--- a/arch/arm/src/nrf52/nrf52_gpiote.c
+++ b/arch/arm/src/nrf52/nrf52_gpiote.c
@@ -35,8 +35,7 @@
 #include <arch/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nrf52_gpio.h"
 #include "nrf52_gpiote.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_i2c.c b/arch/arm/src/nrf52/nrf52_i2c.c
index 8529c08ae09..97758465cb8 100644
--- a/arch/arm/src/nrf52/nrf52_i2c.c
+++ b/arch/arm/src/nrf52/nrf52_i2c.c
@@ -34,8 +34,7 @@
 #include <nuttx/kmalloc.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nrf52_gpio.h"
 #include "nrf52_i2c.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_i2c_bitbang.c b/arch/arm/src/nrf52/nrf52_i2c_bitbang.c
index 27aa2dd22d4..25b40c5f87e 100644
--- a/arch/arm/src/nrf52/nrf52_i2c_bitbang.c
+++ b/arch/arm/src/nrf52/nrf52_i2c_bitbang.c
@@ -28,7 +28,7 @@
 #include <nuttx/i2c/i2c_bitbang.h>
 #include <nuttx/kmalloc.h>
 #include "nrf52_gpio.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/nrf52/nrf52_irq.c b/arch/arm/src/nrf52/nrf52_irq.c
index 22c52a54c4e..488b3562bed 100644
--- a/arch/arm/src/nrf52/nrf52_irq.c
+++ b/arch/arm/src/nrf52/nrf52_irq.c
@@ -36,9 +36,7 @@
 #include "chip.h"
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52_irq.h"
 #ifdef CONFIG_NRF52_GPIOTE
 #  include "nrf52_gpiote.h"
diff --git a/arch/arm/src/nrf52/nrf52_lowputc.c b/arch/arm/src/nrf52/nrf52_lowputc.c
index 59d7d8a2d9a..eda5e492f2b 100644
--- a/arch/arm/src/nrf52/nrf52_lowputc.c
+++ b/arch/arm/src/nrf52/nrf52_lowputc.c
@@ -27,9 +27,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/nrf52_memorymap.h"
 #include "hardware/nrf52_uarte.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_nvmc.c b/arch/arm/src/nrf52/nrf52_nvmc.c
index e8881655a48..55d98e40c1a 100644
--- a/arch/arm/src/nrf52/nrf52_nvmc.c
+++ b/arch/arm/src/nrf52/nrf52_nvmc.c
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "barriers.h"
 
 #include "hardware/nrf52_ficr.h"
@@ -324,7 +324,6 @@ uint32_t system_image_start_address(void)
 
 uint32_t system_image_ro_section_end(void)
 {
-  extern uint32_t _eronly;
   return (uint32_t)&_eronly;
 }
 
diff --git a/arch/arm/src/nrf52/nrf52_ppi.c b/arch/arm/src/nrf52/nrf52_ppi.c
index aecc8077df8..016739a8d17 100644
--- a/arch/arm/src/nrf52/nrf52_ppi.c
+++ b/arch/arm/src/nrf52/nrf52_ppi.c
@@ -26,7 +26,7 @@
 
 #include <assert.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "nrf52_ppi.h"
 #include "hardware/nrf52_ppi.h"
diff --git a/arch/arm/src/nrf52/nrf52_pwm.c b/arch/arm/src/nrf52/nrf52_pwm.c
index 31dfdcded99..1f28659b1d1 100644
--- a/arch/arm/src/nrf52/nrf52_pwm.c
+++ b/arch/arm/src/nrf52/nrf52_pwm.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "nrf52_gpio.h"
 #include "nrf52_pwm.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_radio.c b/arch/arm/src/nrf52/nrf52_radio.c
index 28ec00208e5..b05f00523dc 100644
--- a/arch/arm/src/nrf52/nrf52_radio.c
+++ b/arch/arm/src/nrf52/nrf52_radio.c
@@ -34,8 +34,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nrf52_gpio.h"
 #include "nrf52_radio.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_rng.c b/arch/arm/src/nrf52/nrf52_rng.c
index b91c6bc0d28..4bb75fd328f 100644
--- a/arch/arm/src/nrf52/nrf52_rng.c
+++ b/arch/arm/src/nrf52/nrf52_rng.c
@@ -36,11 +36,10 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/nrf52_utils.h"
 #include "hardware/nrf52_rng.h"
-#include "arm_internal.h"
 
 #if defined(CONFIG_NRF52_RNG)
 #if defined(CONFIG_DEV_RANDOM) || defined(CONFIG_DEV_URANDOM_ARCH)
diff --git a/arch/arm/src/nrf52/nrf52_rtc.c b/arch/arm/src/nrf52/nrf52_rtc.c
index 95dfddde900..3f6407e8809 100644
--- a/arch/arm/src/nrf52/nrf52_rtc.c
+++ b/arch/arm/src/nrf52/nrf52_rtc.c
@@ -30,8 +30,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/nrf52_rtc.h"
 
 #include "nrf52_rtc.h"
diff --git a/arch/arm/src/nrf52/nrf52_sdc.c b/arch/arm/src/nrf52/nrf52_sdc.c
index 6e414f28803..bf9ef26e20d 100644
--- a/arch/arm/src/nrf52/nrf52_sdc.c
+++ b/arch/arm/src/nrf52/nrf52_sdc.c
@@ -42,7 +42,6 @@
 
 #include "arm_internal.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 
 #include "hardware/nrf52_ficr.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_serial.c b/arch/arm/src/nrf52/nrf52_serial.c
index 0d6a524a58b..5ebc6d639e2 100644
--- a/arch/arm/src/nrf52/nrf52_serial.c
+++ b/arch/arm/src/nrf52/nrf52_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "nrf52_config.h"
 #include "hardware/nrf52_uarte.h"
diff --git a/arch/arm/src/nrf52/nrf52_spi.c b/arch/arm/src/nrf52/nrf52_spi.c
index f6d0e297620..6611cb64d1d 100644
--- a/arch/arm/src/nrf52/nrf52_spi.c
+++ b/arch/arm/src/nrf52/nrf52_spi.c
@@ -35,7 +35,7 @@
 #include <arch/board/board.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "barriers.h"
 
 #include "nrf52_gpio.h"
diff --git a/arch/arm/src/nrf52/nrf52_start.c b/arch/arm/src/nrf52/nrf52_start.c
index ea5a7396302..8553696474d 100644
--- a/arch/arm/src/nrf52/nrf52_start.c
+++ b/arch/arm/src/nrf52/nrf52_start.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_tickless_rtc.c b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
index 1950d68d971..ee9ca5a090c 100644
--- a/arch/arm/src/nrf52/nrf52_tickless_rtc.c
+++ b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
@@ -33,8 +33,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/nrf52_rtc.h"
 #include "nrf52_rtc.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_tim.c b/arch/arm/src/nrf52/nrf52_tim.c
index 8d60758acd1..45a99af0671 100644
--- a/arch/arm/src/nrf52/nrf52_tim.c
+++ b/arch/arm/src/nrf52/nrf52_tim.c
@@ -30,8 +30,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/nrf52_tim.h"
 
 #include "nrf52_tim.h"
diff --git a/arch/arm/src/nrf52/nrf52_tim_lowerhalf.c b/arch/arm/src/nrf52/nrf52_tim_lowerhalf.c
index f7f11b6342c..21ecdd0f857 100644
--- a/arch/arm/src/nrf52/nrf52_tim_lowerhalf.c
+++ b/arch/arm/src/nrf52/nrf52_tim_lowerhalf.c
@@ -34,8 +34,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/timer.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nrf52_tim.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/nrf52/nrf52_uid.c b/arch/arm/src/nrf52/nrf52_uid.c
index 8571435c7a5..cf53b719d44 100644
--- a/arch/arm/src/nrf52/nrf52_uid.c
+++ b/arch/arm/src/nrf52/nrf52_uid.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nrf52_uid.h"
 
 #include "hardware/nrf52_ficr.h"
diff --git a/arch/arm/src/nrf52/nrf52_utils.c b/arch/arm/src/nrf52/nrf52_utils.c
index 1c633ae6d1c..9c5e762df42 100644
--- a/arch/arm/src/nrf52/nrf52_utils.c
+++ b/arch/arm/src/nrf52/nrf52_utils.c
@@ -27,8 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nrf52_irq.h"
 #include "hardware/nrf52_utils.h"
 
diff --git a/arch/arm/src/nrf52/nrf52_wdt.c b/arch/arm/src/nrf52/nrf52_wdt.c
index a29043b24b3..cef6b456699 100644
--- a/arch/arm/src/nrf52/nrf52_wdt.c
+++ b/arch/arm/src/nrf52/nrf52_wdt.c
@@ -41,9 +41,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/nrf52_wdt.h"
 #include "nrf52_wdt.h"
 
diff --git a/arch/arm/src/nuc1xx/nuc_clockconfig.c b/arch/arm/src/nuc1xx/nuc_clockconfig.c
index 16faeb8f6ec..d12ced6d2a1 100644
--- a/arch/arm/src/nuc1xx/nuc_clockconfig.c
+++ b/arch/arm/src/nuc1xx/nuc_clockconfig.c
@@ -32,8 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/nuc_gcr.h"
 #include "hardware/nuc_clk.h"
diff --git a/arch/arm/src/nuc1xx/nuc_dumpgpio.c b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
index 4596a249e3a..d343e69b4b9 100644
--- a/arch/arm/src/nuc1xx/nuc_dumpgpio.c
+++ b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
@@ -30,8 +30,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "nuc_gpio.h"
 
diff --git a/arch/arm/src/nuc1xx/nuc_gpio.c b/arch/arm/src/nuc1xx/nuc_gpio.c
index e418a490209..fb197580cdc 100644
--- a/arch/arm/src/nuc1xx/nuc_gpio.c
+++ b/arch/arm/src/nuc1xx/nuc_gpio.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <arch/nuc1xx/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/nuc_gpio.h"
 
diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c
index 54ae84fcf34..948137eb433 100644
--- a/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/arch/arm/src/nuc1xx/nuc_irq.c
@@ -33,9 +33,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nuc_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/nuc1xx/nuc_lowputc.c b/arch/arm/src/nuc1xx/nuc_lowputc.c
index 6d56edf7a67..e01b30d277e 100644
--- a/arch/arm/src/nuc1xx/nuc_lowputc.c
+++ b/arch/arm/src/nuc1xx/nuc_lowputc.c
@@ -30,8 +30,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "nuc_config.h"
 #include "hardware/nuc_clk.h"
diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c
index 9f093df6436..aa600d37360 100644
--- a/arch/arm/src/nuc1xx/nuc_serial.c
+++ b/arch/arm/src/nuc1xx/nuc_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/nuc_uart.h"
 #include "nuc_lowputc.h"
diff --git a/arch/arm/src/nuc1xx/nuc_start.c b/arch/arm/src/nuc1xx/nuc_start.c
index 5713c139a58..dc3680ff325 100644
--- a/arch/arm/src/nuc1xx/nuc_start.c
+++ b/arch/arm/src/nuc1xx/nuc_start.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nuc_config.h"
 #include "nuc_lowputc.h"
 #include "nuc_clockconfig.h"
diff --git a/arch/arm/src/nuc1xx/nuc_timerisr.c b/arch/arm/src/nuc1xx/nuc_timerisr.c
index 39d3156b8c8..b6eff265c60 100644
--- a/arch/arm/src/nuc1xx/nuc_timerisr.c
+++ b/arch/arm/src/nuc1xx/nuc_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/nuc_clk.h"
 #include "hardware/nuc_gcr.h"
diff --git a/arch/arm/src/phy62xx/irq.c b/arch/arm/src/phy62xx/irq.c
index 97f81f10b47..321c32b51ce 100644
--- a/arch/arm/src/phy62xx/irq.c
+++ b/arch/arm/src/phy62xx/irq.c
@@ -33,7 +33,6 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "jump_function.h"
 #include "bus_dev.h"
diff --git a/arch/arm/src/phy62xx/phy62xx_hardfault.c b/arch/arm/src/phy62xx/phy62xx_hardfault.c
index cc3c4617e8d..661e245d47a 100644
--- a/arch/arm/src/phy62xx/phy62xx_hardfault.c
+++ b/arch/arm/src/phy62xx/phy62xx_hardfault.c
@@ -31,7 +31,6 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "nvic.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/phy62xx/phyplus_tim.c b/arch/arm/src/phy62xx/phyplus_tim.c
index acf236fe06c..8023f9af201 100644
--- a/arch/arm/src/phy62xx/phyplus_tim.c
+++ b/arch/arm/src/phy62xx/phyplus_tim.c
@@ -36,7 +36,7 @@
 #include "phyplus_tim.h"
 
 #include "mcu_phy_bumbee.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 struct phyplus_tim_priv_s
 {
diff --git a/arch/arm/src/phy62xx/phyplus_timerisr.c b/arch/arm/src/phy62xx/phyplus_timerisr.c
index e5bf82cba47..625532b775e 100644
--- a/arch/arm/src/phy62xx/phyplus_timerisr.c
+++ b/arch/arm/src/phy62xx/phyplus_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /* #include "irq.h" */
diff --git a/arch/arm/src/phy62xx/start.c b/arch/arm/src/phy62xx/start.c
index 48d0cd97db6..4c6dcb2bd9b 100644
--- a/arch/arm/src/phy62xx/start.c
+++ b/arch/arm/src/phy62xx/start.c
@@ -32,9 +32,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "start.h"
 #include "clock.h"
 #include "log.h"
diff --git a/arch/arm/src/phy62xx/systick.c b/arch/arm/src/phy62xx/systick.c
index 18360cec528..1e63a5efa87 100644
--- a/arch/arm/src/phy62xx/systick.c
+++ b/arch/arm/src/phy62xx/systick.c
@@ -28,7 +28,7 @@
 #include "clock.h"
 #include "pwrmgr.h"
 #include "nvic.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "jump_function.h"
 #include <arch/irq.h>
 
diff --git a/arch/arm/src/phy62xx/timer.c b/arch/arm/src/phy62xx/timer.c
index 0428e06cf50..fadd51b07d5 100644
--- a/arch/arm/src/phy62xx/timer.c
+++ b/arch/arm/src/phy62xx/timer.c
@@ -28,7 +28,7 @@
 #include "clock.h"
 #include "pwrmgr.h"
 #include "nvic.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "jump_function.h"
 #include <arch/irq.h>
 
diff --git a/arch/arm/src/rp2040/hardware/rp2040_memorymap.h b/arch/arm/src/rp2040/hardware/rp2040_memorymap.h
index 46019c91d91..0f4d90817f7 100644
--- a/arch/arm/src/rp2040/hardware/rp2040_memorymap.h
+++ b/arch/arm/src/rp2040/hardware/rp2040_memorymap.h
@@ -44,8 +44,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/rp2040/rp2040_clock.c b/arch/arm/src/rp2040/rp2040_clock.c
index 5a819a936ab..d275d58f247 100644
--- a/arch/arm/src/rp2040/rp2040_clock.c
+++ b/arch/arm/src/rp2040/rp2040_clock.c
@@ -49,8 +49,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "rp2040_clock.h"
diff --git a/arch/arm/src/rp2040/rp2040_cpuindex.c b/arch/arm/src/rp2040/rp2040_cpuindex.c
index 3d1f0ff4aba..245f38bf167 100644
--- a/arch/arm/src/rp2040/rp2040_cpuindex.c
+++ b/arch/arm/src/rp2040/rp2040_cpuindex.c
@@ -26,8 +26,7 @@
 #include <stdint.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/rp2040_sio.h"
 
 #ifdef CONFIG_SMP
diff --git a/arch/arm/src/rp2040/rp2040_cpupause.c b/arch/arm/src/rp2040/rp2040_cpupause.c
index 08f1f34465b..69871af345e 100644
--- a/arch/arm/src/rp2040/rp2040_cpupause.c
+++ b/arch/arm/src/rp2040/rp2040_cpupause.c
@@ -34,7 +34,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
 #include "hardware/rp2040_sio.h"
diff --git a/arch/arm/src/rp2040/rp2040_cpustart.c b/arch/arm/src/rp2040/rp2040_cpustart.c
index af6f5b5420b..6cb5e7e4e20 100644
--- a/arch/arm/src/rp2040/rp2040_cpustart.c
+++ b/arch/arm/src/rp2040/rp2040_cpustart.c
@@ -36,11 +36,9 @@
 #include <nuttx/sched_note.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "init/init.h"
 #include "arm_internal.h"
-
 #include "hardware/rp2040_memorymap.h"
 #include "hardware/rp2040_sio.h"
 #include "hardware/rp2040_psm.h"
diff --git a/arch/arm/src/rp2040/rp2040_dmac.c b/arch/arm/src/rp2040/rp2040_dmac.c
index d68ae2e4539..f3e0abe0aaf 100644
--- a/arch/arm/src/rp2040/rp2040_dmac.c
+++ b/arch/arm/src/rp2040/rp2040_dmac.c
@@ -35,7 +35,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/rp2040_dma.h"
 #include "rp2040_dmac.h"
 
diff --git a/arch/arm/src/rp2040/rp2040_gpio.c b/arch/arm/src/rp2040/rp2040_gpio.c
index 6dd5ee30e8e..e90fbc58503 100644
--- a/arch/arm/src/rp2040/rp2040_gpio.c
+++ b/arch/arm/src/rp2040/rp2040_gpio.c
@@ -32,8 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "rp2040_gpio.h"
 
diff --git a/arch/arm/src/rp2040/rp2040_i2c.c b/arch/arm/src/rp2040/rp2040_i2c.c
index d2c56771f62..338e07eb935 100644
--- a/arch/arm/src/rp2040/rp2040_i2c.c
+++ b/arch/arm/src/rp2040/rp2040_i2c.c
@@ -40,9 +40,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "rp2040_i2c.h"
 #include "hardware/rp2040_i2c.h"
 #include "hardware/rp2040_resets.h"
diff --git a/arch/arm/src/rp2040/rp2040_i2s.c b/arch/arm/src/rp2040/rp2040_i2s.c
index 89eaa244d60..6581a1036df 100644
--- a/arch/arm/src/rp2040/rp2040_i2s.c
+++ b/arch/arm/src/rp2040/rp2040_i2s.c
@@ -47,8 +47,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "rp2040_gpio.h"
 #include "rp2040_dmac.h"
 #include "rp2040_i2s_pio.h"
diff --git a/arch/arm/src/rp2040/rp2040_irq.c b/arch/arm/src/rp2040/rp2040_irq.c
index 08e9bd69e2c..b3052c23178 100644
--- a/arch/arm/src/rp2040/rp2040_irq.c
+++ b/arch/arm/src/rp2040/rp2040_irq.c
@@ -34,7 +34,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/rp2040/rp2040_pll.c b/arch/arm/src/rp2040/rp2040_pll.c
index 9428e3bde52..fc5e4f78d9c 100644
--- a/arch/arm/src/rp2040/rp2040_pll.c
+++ b/arch/arm/src/rp2040/rp2040_pll.c
@@ -49,8 +49,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "rp2040_pll.h"
diff --git a/arch/arm/src/rp2040/rp2040_serial.c b/arch/arm/src/rp2040/rp2040_serial.c
index 7937c5b31d9..2c989b5818a 100644
--- a/arch/arm/src/rp2040/rp2040_serial.c
+++ b/arch/arm/src/rp2040/rp2040_serial.c
@@ -45,9 +45,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "rp2040_config.h"
 #include "rp2040_serial.h"
 
diff --git a/arch/arm/src/rp2040/rp2040_spi.c b/arch/arm/src/rp2040/rp2040_spi.c
index 29012c08c56..e3d88d8fb42 100644
--- a/arch/arm/src/rp2040/rp2040_spi.c
+++ b/arch/arm/src/rp2040/rp2040_spi.c
@@ -40,8 +40,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "rp2040_spi.h"
diff --git a/arch/arm/src/rp2040/rp2040_start.c b/arch/arm/src/rp2040/rp2040_start.c
index 48fe9b07337..9c548c42b9f 100644
--- a/arch/arm/src/rp2040/rp2040_start.c
+++ b/arch/arm/src/rp2040/rp2040_start.c
@@ -31,9 +31,7 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "rp2040_config.h"
 #include "rp2040_clock.h"
 #include "rp2040_uart.h"
diff --git a/arch/arm/src/rp2040/rp2040_testset.c b/arch/arm/src/rp2040/rp2040_testset.c
index 37fd5b80bd4..461a7903b0c 100644
--- a/arch/arm/src/rp2040/rp2040_testset.c
+++ b/arch/arm/src/rp2040/rp2040_testset.c
@@ -28,8 +28,7 @@
 #include <nuttx/spinlock.h>
 
 #include "hardware/rp2040_sio.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/rp2040/rp2040_timerisr.c b/arch/arm/src/rp2040/rp2040_timerisr.c
index 81e578b3726..f618434e4f6 100644
--- a/arch/arm/src/rp2040/rp2040_timerisr.c
+++ b/arch/arm/src/rp2040/rp2040_timerisr.c
@@ -34,8 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/rp2040/rp2040_uart.c b/arch/arm/src/rp2040/rp2040_uart.c
index 0ab20212f8b..564d49860ae 100644
--- a/arch/arm/src/rp2040/rp2040_uart.c
+++ b/arch/arm/src/rp2040/rp2040_uart.c
@@ -32,8 +32,6 @@
 #include <errno.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "rp2040_config.h"
 #include "rp2040_uart.h"
diff --git a/arch/arm/src/rp2040/rp2040_usbdev.c b/arch/arm/src/rp2040/rp2040_usbdev.c
index 12f6e2d23b2..14d509a75d9 100644
--- a/arch/arm/src/rp2040/rp2040_usbdev.c
+++ b/arch/arm/src/rp2040/rp2040_usbdev.c
@@ -41,7 +41,6 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "rp2040_usbdev.h"
 
diff --git a/arch/arm/src/rp2040/rp2040_xosc.c b/arch/arm/src/rp2040/rp2040_xosc.c
index 02601c6f91e..978a3b5ab4a 100644
--- a/arch/arm/src/rp2040/rp2040_xosc.c
+++ b/arch/arm/src/rp2040/rp2040_xosc.c
@@ -49,8 +49,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "rp2040_xosc.h"
diff --git a/arch/arm/src/rtl8720c/ameba_nvic.c b/arch/arm/src/rtl8720c/ameba_nvic.c
index 2369cd400ab..060d3d5f0e5 100644
--- a/arch/arm/src/rtl8720c/ameba_nvic.c
+++ b/arch/arm/src/rtl8720c/ameba_nvic.c
@@ -32,7 +32,6 @@
 #include "chip.h"
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c b/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c
index 277e2acb696..78bf290f61e 100644
--- a/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c
+++ b/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c
@@ -33,9 +33,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "s32k1xx_pin.h"
 #include "s32k11x/s32k11x_irq.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c
index e0b96ad3b0d..b8198702711 100644
--- a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c
+++ b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "clock/clock.h"
 #include "s32k1xx_clockconfig.h"
diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c
index 512d745fd8e..d1d5bf46442 100644
--- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c
+++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c
@@ -27,8 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "s32k14x_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
index c0c8f1734a8..e97aed9040a 100644
--- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
+++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
@@ -36,9 +36,7 @@
 #include "chip.h"
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "s32k1xx_pin.h"
 #include "s32k14x/s32k14x_irq.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c
index 999be86506a..63c1f3facea 100644
--- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c
+++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c
@@ -34,8 +34,6 @@
 
 #include "nvic.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "clock/clock.h"
 #include "s32k1xx_clockconfig.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c b/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c
index 880ee19edbc..cc6e74235a8 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c
@@ -65,9 +65,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/s32k1xx_scg.h"
 #include "hardware/s32k1xx_smc.h"
 #include "hardware/s32k1xx_sim.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_edma.c b/arch/arm/src/s32k1xx/s32k1xx_edma.c
index d429557c578..3c30bceb2d4 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_edma.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_edma.c
@@ -60,7 +60,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k1xx_eeeprom.c b/arch/arm/src/s32k1xx/s32k1xx_eeeprom.c
index a114da0b440..2088081c851 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_eeeprom.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_eeeprom.c
@@ -33,14 +33,11 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "arm_arch.h"
-
 #include "hardware/s32k1xx_ftfc.h"
 #include "hardware/s32k1xx_sim.h"
 
 #include "s32k1xx_config.h"
 #include "s32k1xx_eeeprom.h"
-
 #include "arm_internal.h"
 
 #include <arch/board/board.h> /* Include last:  has dependencies */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.c b/arch/arm/src/s32k1xx/s32k1xx_enet.c
index 3075d25264c..75411f2f213 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_enet.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_enet.c
@@ -50,7 +50,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "s32k1xx_config.h"
 #include "hardware/s32k1xx_enet.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c
index 870355a5740..ebe48e4b9cf 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c
@@ -42,7 +42,7 @@
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/can.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "s32k1xx_config.h"
 #include "hardware/s32k1xx_flexcan.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lowputc.c b/arch/arm/src/s32k1xx/s32k1xx_lowputc.c
index 6d0fed6e5e8..aef6d2e2d2b 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lowputc.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lowputc.c
@@ -29,8 +29,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
-
 #include "hardware/s32k1xx_pinmux.h"
 #include "hardware/s32k1xx_lpuart.h"
 
@@ -38,7 +36,6 @@
 #include "s32k1xx_pin.h"
 #include "s32k1xx_lowputc.h"
 #include "s32k1xx_periphclocks.h"
-
 #include "arm_internal.h"
 
 #include <arch/board/board.h> /* Include last:  has dependencies */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
index a00f77da6cd..a73712e7a6f 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
@@ -42,8 +42,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "s32k1xx_pin.h"
 #include "hardware/s32k1xx_pinmux.h"
 #include "s32k1xx_lpi2c.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpi2c_slave.c b/arch/arm/src/s32k1xx/s32k1xx_lpi2c_slave.c
index 18a839dbe68..5c7cf8c66c5 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpi2c_slave.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpi2c_slave.c
@@ -40,8 +40,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "s32k1xx_pin.h"
 #include "hardware/s32k1xx_pinmux.h"
 #include "s32k1xx_lpi2c.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
index fc6937292fc..c3b01307fff 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
@@ -69,8 +69,6 @@
 #include <nuttx/power/pm.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "s32k1xx_pin.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_periphclocks.c b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.c
index c5c0d1581e5..375b759a14b 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_periphclocks.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.c
@@ -62,7 +62,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/s32k1xx_scg.h"
 #include "hardware/s32k1xx_pcc.h"
 #include "s32k1xx_clockconfig.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h
index 604414e161d..46e3b7e9a1c 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h
+++ b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h
@@ -67,9 +67,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "s32k1xx_config.h"
 
 #if defined(CONFIG_ARCH_CHIP_S32K11X)
diff --git a/arch/arm/src/s32k1xx/s32k1xx_pin.c b/arch/arm/src/s32k1xx/s32k1xx_pin.c
index acd7a1ee92e..04a9e5163d8 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_pin.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_pin.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/s32k1xx_port.h"
 #include "hardware/s32k1xx_gpio.h"
 #include "s32k1xx_pin.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_pindma.c b/arch/arm/src/s32k1xx/s32k1xx_pindma.c
index 6347a242665..2b0b918a7cf 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_pindma.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_pindma.c
@@ -32,9 +32,7 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/arch.h>
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "s32k1xx_pin.h"
 
 #ifdef CONFIG_S32K1XX_DMA
diff --git a/arch/arm/src/s32k1xx/s32k1xx_pindump.c b/arch/arm/src/s32k1xx/s32k1xx_pindump.c
index b638ad6ce94..d62f23afd40 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_pindump.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_pindump.c
@@ -29,8 +29,7 @@
 #include <debug.h>
 
 #include <nuttx/irq.h>
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/s32k1xx_gpio.h"
 #include "hardware/s32k1xx_port.h"
 #include "s32k1xx_pin.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_pingpio.c b/arch/arm/src/s32k1xx/s32k1xx_pingpio.c
index 0a5175b0c7e..1924bd59d60 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_pingpio.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_pingpio.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/s32k1xx_gpio.h"
 #include "s32k1xx_pin.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k1xx_pinirq.c b/arch/arm/src/s32k1xx/s32k1xx_pinirq.c
index 3d7fd247d35..48f04667916 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_pinirq.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_pinirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "s32k1xx_pin.h"
 #include "hardware/s32k1xx_port.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k1xx_progmem.c b/arch/arm/src/s32k1xx/s32k1xx_progmem.c
index 7b18ffcd104..ef90f118043 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_progmem.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_progmem.c
@@ -28,13 +28,10 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
-
 #include "hardware/s32k1xx_ftfc.h"
 
 #include "s32k1xx_config.h"
 #include "s32k1xx_progmem.h"
-
 #include "arm_internal.h"
 
 #include <arch/board/board.h> /* Include last:  has dependencies */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_pwm.c b/arch/arm/src/s32k1xx/s32k1xx_pwm.c
index e84ac99e1a3..6d32c911f16 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_pwm.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_pwm.c
@@ -36,8 +36,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "s32k1xx_clockconfig.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_resetcause_procfs.c b/arch/arm/src/s32k1xx/s32k1xx_resetcause_procfs.c
index c4e9f7ff9e0..000704b063b 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_resetcause_procfs.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_resetcause_procfs.c
@@ -36,8 +36,7 @@
 #include <fcntl.h>
 #include <debug.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/s32k1xx_rcm.h"
 #include "s32k1xx_resetcause_procfs.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k1xx_rtc.c b/arch/arm/src/s32k1xx/s32k1xx_rtc.c
index 415bef3a944..73e6c238cad 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_rtc.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_rtc.c
@@ -38,8 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/s32k1xx_rtc.h"
 #include "s32k1xx_periphclocks.h"
 #include "s32k1xx_rtc.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.c b/arch/arm/src/s32k1xx/s32k1xx_serial.c
index 63724a611d5..cefa314d1a0 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_serial.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_serial.c
@@ -48,9 +48,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/s32k1xx_lpuart.h"
 #include "hardware/s32k1xx_pinmux.h"
 #include "s32k1xx_config.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_start.c b/arch/arm/src/s32k1xx/s32k1xx_start.c
index c364b4c9d2a..34e241f6688 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_start.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_start.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k1xx_uid.c b/arch/arm/src/s32k1xx/s32k1xx_uid.c
index 1aebed0e93c..7ca0e727ab2 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_uid.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_uid.c
@@ -26,8 +26,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/s32k1xx_sim.h"
 #include "s32k1xx_uid.h"
 
diff --git a/arch/arm/src/s32k1xx/s32k1xx_wdog.h b/arch/arm/src/s32k1xx/s32k1xx_wdog.h
index 24d376805eb..69a48dba0cd 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_wdog.h
+++ b/arch/arm/src/s32k1xx/s32k1xx_wdog.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/s32k1xx_wdog.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam4cm_cpupause.c b/arch/arm/src/sam34/sam4cm_cpupause.c
index e7285c1ec2b..1fb11ab1650 100644
--- a/arch/arm/src/sam34/sam4cm_cpupause.c
+++ b/arch/arm/src/sam34/sam4cm_cpupause.c
@@ -34,7 +34,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "arm_internal.h"
 #include "hardware/sam4cm_ipc.h"
diff --git a/arch/arm/src/sam34/sam4cm_cpustart.c b/arch/arm/src/sam34/sam4cm_cpustart.c
index 81d23360895..02dd65b7d51 100644
--- a/arch/arm/src/sam34/sam4cm_cpustart.c
+++ b/arch/arm/src/sam34/sam4cm_cpustart.c
@@ -36,7 +36,6 @@
 #include <nuttx/sched_note.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "sched/sched.h"
 #include "init/init.h"
 #include "arm_internal.h"
diff --git a/arch/arm/src/sam34/sam4cm_supc.c b/arch/arm/src/sam34/sam4cm_supc.c
index 5a0a5c04dc8..0a169c5a4d2 100644
--- a/arch/arm/src/sam34/sam4cm_supc.c
+++ b/arch/arm/src/sam34/sam4cm_supc.c
@@ -33,8 +33,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/sam_supc.h"
 
diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c
index e16129a0492..5b7c2562352 100644
--- a/arch/arm/src/sam34/sam4cm_tc.c
+++ b/arch/arm/src/sam34/sam4cm_tc.c
@@ -62,7 +62,7 @@
 #include <nuttx/semaphore.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pinmap.h"
 #include "hardware/sam_pmc.h"
diff --git a/arch/arm/src/sam34/sam4l_clockconfig.c b/arch/arm/src/sam34/sam4l_clockconfig.c
index 3702ee827a5..96070331eec 100644
--- a/arch/arm/src/sam34/sam4l_clockconfig.c
+++ b/arch/arm/src/sam34/sam4l_clockconfig.c
@@ -30,8 +30,6 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
 #include "arm_internal.h"
 #include "hardware/sam4l_pm.h"
 #include "hardware/sam4l_scif.h"
diff --git a/arch/arm/src/sam34/sam4l_gpio.c b/arch/arm/src/sam34/sam4l_gpio.c
index 89645b707c9..978e6f8a803 100644
--- a/arch/arm/src/sam34/sam4l_gpio.c
+++ b/arch/arm/src/sam34/sam4l_gpio.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_gpio.h"
 #include "hardware/sam4l_gpio.h"
diff --git a/arch/arm/src/sam34/sam4l_periphclks.c b/arch/arm/src/sam34/sam4l_periphclks.c
index 1f3fb7c3d12..a55456e4071 100644
--- a/arch/arm/src/sam34/sam4l_periphclks.c
+++ b/arch/arm/src/sam34/sam4l_periphclks.c
@@ -27,8 +27,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
 #include "arm_internal.h"
 #include "hardware/sam4l_pm.h"
 
diff --git a/arch/arm/src/sam34/sam4s_nand.c b/arch/arm/src/sam34/sam4s_nand.c
index f1ad929c1b8..abe9c6000f3 100644
--- a/arch/arm/src/sam34/sam4s_nand.c
+++ b/arch/arm/src/sam34/sam4s_nand.c
@@ -43,7 +43,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 #include "hardware/sam4s_pinmap.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam4s_nand.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam4s_nand.h b/arch/arm/src/sam34/sam4s_nand.h
index e7ed5f709a0..e1fbe485afc 100644
--- a/arch/arm/src/sam34/sam4s_nand.h
+++ b/arch/arm/src/sam34/sam4s_nand.h
@@ -35,7 +35,7 @@
 #include <nuttx/mtd/nand_raw.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "hardware/sam_smc.h"
diff --git a/arch/arm/src/sam34/sam_aes.c b/arch/arm/src/sam34/sam_aes.c
index 0fbb37cbcce..66e06699a24 100644
--- a/arch/arm/src/sam34/sam_aes.c
+++ b/arch/arm/src/sam34/sam_aes.c
@@ -37,8 +37,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_periphclks.h"
 #include "sam_aes.h"
diff --git a/arch/arm/src/sam34/sam_allocateheap.c b/arch/arm/src/sam34/sam_allocateheap.c
index 750983b03b1..bc1d88deab1 100644
--- a/arch/arm/src/sam34/sam_allocateheap.c
+++ b/arch/arm/src/sam34/sam_allocateheap.c
@@ -35,9 +35,7 @@
 #include <arch/board/board.h>
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "sam_mpuinit.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/sam34/sam_clockconfig.c b/arch/arm/src/sam34/sam_clockconfig.c
index 883e89733a9..cf80511def2 100644
--- a/arch/arm/src/sam34/sam_clockconfig.c
+++ b/arch/arm/src/sam34/sam_clockconfig.c
@@ -30,9 +30,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_clockconfig.h"
 #include "hardware/sam_pmc.h"
 #include "hardware/sam_eefc.h"
diff --git a/arch/arm/src/sam34/sam_cmcc.c b/arch/arm/src/sam34/sam_cmcc.c
index bfdd3f42c79..269bbd958b5 100644
--- a/arch/arm/src/sam34/sam_cmcc.c
+++ b/arch/arm/src/sam34/sam_cmcc.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_cmcc.h"
 #include "sam_cmcc.h"
 
diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c
index 11801a27347..fa601e38c65 100644
--- a/arch/arm/src/sam34/sam_dmac.c
+++ b/arch/arm/src/sam34/sam_dmac.c
@@ -35,7 +35,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index a702cf445e6..139a94b4ac3 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -50,9 +50,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_pinmap.h"
 #include "sam_gpio.h"
diff --git a/arch/arm/src/sam34/sam_gpio.c b/arch/arm/src/sam34/sam_gpio.c
index 86f97e15794..d08624ab8dc 100644
--- a/arch/arm/src/sam34/sam_gpio.c
+++ b/arch/arm/src/sam34/sam_gpio.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/sam34/sam_gpioirq.c b/arch/arm/src/sam34/sam_gpioirq.c
index 9d0a4a4f3f6..d32f1455317 100644
--- a/arch/arm/src/sam34/sam_gpioirq.c
+++ b/arch/arm/src/sam34/sam_gpioirq.c
@@ -35,9 +35,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pmc.h"
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index cea20dce4db..8cc0f95ea1f 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam_cmcc.h"
 #include "sam_hsmci.h"
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 3f27430c068..f4a3091a87d 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_SAM34_GPIO_IRQ
diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c
index fccc567e12f..3ec9fc51e2f 100644
--- a/arch/arm/src/sam34/sam_lowputc.c
+++ b/arch/arm/src/sam34/sam_lowputc.c
@@ -29,8 +29,6 @@
 #include <nuttx/irq.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "sam_lowputc.h"
diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c
index d3a622f62cd..a0d7900aa74 100644
--- a/arch/arm/src/sam34/sam_rtc.c
+++ b/arch/arm/src/sam34/sam_rtc.c
@@ -35,7 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_rtc.h"
 
 #if defined(CONFIG_RTC_HIRES) && defined (CONFIG_SAM34_RTT)
diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c
index 06c74401181..837f9463efd 100644
--- a/arch/arm/src/sam34/sam_rtt.c
+++ b/arch/arm/src/sam34/sam_rtt.c
@@ -36,7 +36,7 @@
 #include <nuttx/timers/timer.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_rtt.h"
 #include "sam_periphclks.h"
 
diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c
index c77be962f7e..9b48baf3702 100644
--- a/arch/arm/src/sam34/sam_serial.c
+++ b/arch/arm/src/sam34/sam_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 
 #if defined(CONFIG_ARCH_CHIP_SAM3U) || defined(CONFIG_ARCH_CHIP_SAM3X) || \
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index c280eaba81d..71d61476683 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -45,8 +45,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_dmac.h"
diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c
index 9486b0cb1d5..c264328e49b 100644
--- a/arch/arm/src/sam34/sam_start.c
+++ b/arch/arm/src/sam34/sam_start.c
@@ -30,7 +30,6 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c
index 2ad533283ce..dd4581881e3 100644
--- a/arch/arm/src/sam34/sam_tc.c
+++ b/arch/arm/src/sam34/sam_tc.c
@@ -36,7 +36,7 @@
 #include <nuttx/timers/timer.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_tc.h"
 #include "sam_periphclks.h"
 
diff --git a/arch/arm/src/sam34/sam_timerisr.c b/arch/arm/src/sam34/sam_timerisr.c
index 4d85bceda30..20b30d381ef 100644
--- a/arch/arm/src/sam34/sam_timerisr.c
+++ b/arch/arm/src/sam34/sam_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index 79e536884d8..55b77c89b87 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -64,8 +64,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/sam_pmc.h"
 #include "hardware/sam_pinmap.h"
 
diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c
index 3f765c9b756..9bdbc182297 100644
--- a/arch/arm/src/sam34/sam_udp.c
+++ b/arch/arm/src/sam34/sam_udp.c
@@ -43,9 +43,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_periphclks.h"
 #include "hardware/sam_udp.h"
 #include "sam_udp.h"
diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c
index 7dd1fa89fa8..7c35b28e317 100644
--- a/arch/arm/src/sam34/sam_wdt.c
+++ b/arch/arm/src/sam34/sam_wdt.c
@@ -37,7 +37,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_wdt.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAM34_WDT)
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index 4012db65c7c..89608410018 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -69,8 +69,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/sam_adc.h"
 #include "hardware/sam_pmc.h"
diff --git a/arch/arm/src/sama5/sam_allocateheap.c b/arch/arm/src/sama5/sam_allocateheap.c
index 21bf51a71dc..6897c7ded6c 100644
--- a/arch/arm/src/sama5/sam_allocateheap.c
+++ b/arch/arm/src/sama5/sam_allocateheap.c
@@ -36,7 +36,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "mmu.h"
 
diff --git a/arch/arm/src/sama5/sam_boot.c b/arch/arm/src/sama5/sam_boot.c
index ec9007d4e42..d01e7857ab0 100644
--- a/arch/arm/src/sama5/sam_boot.c
+++ b/arch/arm/src/sama5/sam_boot.c
@@ -40,8 +40,6 @@
 #include "mmu.h"
 #include "fpu.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/sam_wdt.h"
 #include "hardware/sam_aximx.h"
 #include "hardware/sam_sfr.h"
diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c
index 426c4969f9f..0954378bb79 100644
--- a/arch/arm/src/sama5/sam_can.c
+++ b/arch/arm/src/sama5/sam_can.c
@@ -65,8 +65,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/sam_pinmap.h"
 #include "sam_periphclks.h"
 #include "sam_pio.h"
diff --git a/arch/arm/src/sama5/sam_clockconfig.c b/arch/arm/src/sama5/sam_clockconfig.c
index d1135c86b05..98908edaadd 100644
--- a/arch/arm/src/sama5/sam_clockconfig.c
+++ b/arch/arm/src/sama5/sam_clockconfig.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 #include <arch/sama5/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_periphclks.h"
 #include "sam_clockconfig.h"
 #include "hardware/sam_pmc.h"
diff --git a/arch/arm/src/sama5/sam_dbgu.c b/arch/arm/src/sama5/sam_dbgu.c
index ad9dd51abbb..90355719536 100644
--- a/arch/arm/src/sama5/sam_dbgu.c
+++ b/arch/arm/src/sama5/sam_dbgu.c
@@ -40,9 +40,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_dbgu.h"
 #include "hardware/sam_pinmap.h"
diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index a1f31ec457b..cd711715ec7 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -36,7 +36,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index d7541854b21..c305e01f7db 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -45,7 +45,7 @@
 #include <nuttx/usb/usbhost_devaddr.h>
 #include <nuttx/usb/usbhost_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_periphclks.h"
 #include "sam_memories.h"
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index af4ee23600c..67c69c8eef6 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -78,9 +78,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index a0236379430..b5910ebb2cd 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -64,9 +64,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
diff --git a/arch/arm/src/sama5/sam_flexcom_serial.c b/arch/arm/src/sama5/sam_flexcom_serial.c
index 210661d9c7e..6fec17ee198 100644
--- a/arch/arm/src/sama5/sam_flexcom_serial.c
+++ b/arch/arm/src/sama5/sam_flexcom_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_flexcom.h"
 #include "sam_config.h"
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index 931d78073aa..37606f913ed 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -75,9 +75,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index 852cae83d9e..4684dd05b6b 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_dmac.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/sama5/sam_irq.c b/arch/arm/src/sama5/sam_irq.c
index a7b7ff530a8..f253fe15b12 100644
--- a/arch/arm/src/sama5/sam_irq.c
+++ b/arch/arm/src/sama5/sam_irq.c
@@ -32,7 +32,6 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_SAMA5_PIO_IRQ
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index dc6ccee5324..25f55a95b0f 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -61,7 +61,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_lcdc.h"
 #include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
@@ -2476,7 +2476,7 @@ static void sam_show_layer(struct sam_layer_s *layer,
 
   if ((bprow & 7) != 0)
     {
-      bytesprow ++;
+      bytesprow++;
     }
 
   padding = 0;
diff --git a/arch/arm/src/sama5/sam_lowputc.c b/arch/arm/src/sama5/sam_lowputc.c
index 3f9002b6edb..9caf8223628 100644
--- a/arch/arm/src/sama5/sam_lowputc.c
+++ b/arch/arm/src/sama5/sam_lowputc.c
@@ -29,8 +29,6 @@
 #include <nuttx/irq.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_pio.h"
 #include "sam_periphclks.h"
 #include "sam_config.h"
diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c
index a1d3d12ff0e..976544fd028 100644
--- a/arch/arm/src/sama5/sam_nand.c
+++ b/arch/arm/src/sama5/sam_nand.c
@@ -67,8 +67,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_memories.h"
 #include "sam_dmac.h"
 #include "sam_pmecc.h"
diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h
index 20a9980d5af..1db83d4f0ca 100644
--- a/arch/arm/src/sama5/sam_nand.h
+++ b/arch/arm/src/sama5/sam_nand.h
@@ -35,7 +35,7 @@
 #include <nuttx/mtd/nand_raw.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/sam_hsmc.h"
 
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index a5102735bc4..3a1b44409c0 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -48,9 +48,7 @@
 
 #include <arch/board/board.h> /* May redefine PIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "sam_periphclks.h"
 #include "sam_memories.h"
diff --git a/arch/arm/src/sama5/sam_pck.c b/arch/arm/src/sama5/sam_pck.c
index 1067b5726ea..7b1b814d32e 100644
--- a/arch/arm/src/sama5/sam_pck.c
+++ b/arch/arm/src/sama5/sam_pck.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "hardware/sam_pinmap.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_isi.h"
 
diff --git a/arch/arm/src/sama5/sam_pioirq.c b/arch/arm/src/sama5/sam_pioirq.c
index cf54821f425..e87bb645840 100644
--- a/arch/arm/src/sama5/sam_pioirq.c
+++ b/arch/arm/src/sama5/sam_pioirq.c
@@ -35,9 +35,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/sam_pio.h"
 #include "hardware/sam_pmc.h"
 
diff --git a/arch/arm/src/sama5/sam_pmc.c b/arch/arm/src/sama5/sam_pmc.c
index 687c49de204..bfe6ac711f9 100644
--- a/arch/arm/src/sama5/sam_pmc.c
+++ b/arch/arm/src/sama5/sam_pmc.c
@@ -32,8 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 
 #ifdef CONFIG_ARCH_HAVE_SDIO
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index 4a525d3a4fa..ceec6bf6641 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -38,8 +38,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_periphclks.h"
 #include "sam_pio.h"
 #include "sam_pwm.h"
diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
index 6a5fadeeb59..565a203dc9d 100644
--- a/arch/arm/src/sama5/sam_rtc.c
+++ b/arch/arm/src/sama5/sam_rtc.c
@@ -38,7 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_rtc.h"
 
 #ifdef CONFIG_RTC
diff --git a/arch/arm/src/sama5/sam_sckc.c b/arch/arm/src/sama5/sam_sckc.c
index bfc0860e98a..c3d18ef7aa8 100644
--- a/arch/arm/src/sama5/sam_sckc.c
+++ b/arch/arm/src/sama5/sam_sckc.c
@@ -31,7 +31,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_sckc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/sama5/sam_sdmmc.c b/arch/arm/src/sama5/sam_sdmmc.c
index 0de021e0a54..545320961e1 100644
--- a/arch/arm/src/sama5/sam_sdmmc.c
+++ b/arch/arm/src/sama5/sam_sdmmc.c
@@ -48,8 +48,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_config.h"
 #include "sam_pio.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c
index f5d541ddf11..749ee2c5a2a 100644
--- a/arch/arm/src/sama5/sam_serial.c
+++ b/arch/arm/src/sama5/sam_serial.c
@@ -45,9 +45,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_uart.h"
 #include "sam_config.h"
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index 4bb9ae743e7..8bcbdfa1ab4 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -45,8 +45,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_pio.h"
 #include "sam_dmac.h"
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index 1d1228db19d..fec601a0743 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -47,8 +47,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_pio.h"
 #include "sam_dmac.h"
diff --git a/arch/arm/src/sama5/sam_systemreset.c b/arch/arm/src/sama5/sam_systemreset.c
index 3fa8299ab7d..d043759bd9a 100644
--- a/arch/arm/src/sama5/sam_systemreset.c
+++ b/arch/arm/src/sama5/sam_systemreset.c
@@ -31,7 +31,7 @@
 #include <nuttx/board.h>
 #include <arch/sama5/chip.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_rstc.h"
 
 #ifdef CONFIG_SAMA5_SYSTEMRESET
diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c
index 4a1a26aec15..324b06ad63a 100644
--- a/arch/arm/src/sama5/sam_tc.c
+++ b/arch/arm/src/sama5/sam_tc.c
@@ -62,7 +62,7 @@
 #include <nuttx/semaphore.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pinmap.h"
 #include "hardware/sam_pmc.h"
diff --git a/arch/arm/src/sama5/sam_timerisr.c b/arch/arm/src/sama5/sam_timerisr.c
index c4e01f42407..63a37a4afcb 100644
--- a/arch/arm/src/sama5/sam_timerisr.c
+++ b/arch/arm/src/sama5/sam_timerisr.c
@@ -33,7 +33,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pit.h"
 
diff --git a/arch/arm/src/sama5/sam_trng.c b/arch/arm/src/sama5/sam_trng.c
index 8990f7eec48..538822f7cf2 100644
--- a/arch/arm/src/sama5/sam_trng.c
+++ b/arch/arm/src/sama5/sam_trng.c
@@ -36,9 +36,7 @@
 #include <nuttx/drivers/drivers.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_periphclks.h"
 #include "sam_trng.h"
 
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index 4f72b4cf521..9540f01287e 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -72,7 +72,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_adc.h"
 #include "sam_adc.h"
 #include "sam_tsd.h"
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index 4800eefd8db..906cf95dcf8 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -66,8 +66,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/sam_pmc.h"
 #include "hardware/sam_pinmap.h"
 
diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c
index 22d14639da6..c98b1623793 100644
--- a/arch/arm/src/sama5/sam_udphs.c
+++ b/arch/arm/src/sama5/sam_udphs.c
@@ -67,9 +67,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_periphclks.h"
 #include "sam_memories.h"
 #include "hardware/sam_udphs.h"
diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c
index 61146194b8c..1b591b15ac5 100644
--- a/arch/arm/src/sama5/sam_wdt.c
+++ b/arch/arm/src/sama5/sam_wdt.c
@@ -34,7 +34,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_wdt.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAMA5_WDT)
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index 774dc325104..337db31448d 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -36,7 +36,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/arm/src/sama5/sama5d2x_pio.c b/arch/arm/src/sama5/sama5d2x_pio.c
index c2deaf786d0..905a57996a1 100644
--- a/arch/arm/src/sama5/sama5d2x_pio.c
+++ b/arch/arm/src/sama5/sama5d2x_pio.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/_sama5d2x_pio.h"
 
 #include "chip.h"
diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.c b/arch/arm/src/sama5/sama5d3x4x_pio.c
index cf8848b9d15..cfd8ddd3279 100644
--- a/arch/arm/src/sama5/sama5d3x4x_pio.c
+++ b/arch/arm/src/sama5/sama5d3x4x_pio.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/_sama5d3x4x_pio.h"
 
 #include "chip.h"
diff --git a/arch/arm/src/samd2l2/sam_ac.c b/arch/arm/src/samd2l2/sam_ac.c
index a8b8479158c..4a85ca980c3 100644
--- a/arch/arm/src/samd2l2/sam_ac.c
+++ b/arch/arm/src/samd2l2/sam_ac.c
@@ -33,8 +33,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_config.h"
 
 #include "sam_pm.h"
diff --git a/arch/arm/src/samd2l2/sam_adc.c b/arch/arm/src/samd2l2/sam_adc.c
index 1243a04ec55..e25082d1588 100644
--- a/arch/arm/src/samd2l2/sam_adc.c
+++ b/arch/arm/src/samd2l2/sam_adc.c
@@ -42,7 +42,7 @@
 
 #include <arch/chip/sam_adc.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_adc.h"
 #include "sam_pinmap.h"
 #include "sam_gclk.h"
diff --git a/arch/arm/src/samd2l2/sam_dmac.c b/arch/arm/src/samd2l2/sam_dmac.c
index 1fec09bf255..38be09d0fda 100644
--- a/arch/arm/src/samd2l2/sam_dmac.c
+++ b/arch/arm/src/samd2l2/sam_dmac.c
@@ -35,7 +35,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/arm/src/samd2l2/sam_eic.c b/arch/arm/src/samd2l2/sam_eic.c
index 6b947870109..ac7ac47c149 100644
--- a/arch/arm/src/samd2l2/sam_eic.c
+++ b/arch/arm/src/samd2l2/sam_eic.c
@@ -32,8 +32,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_config.h"
 
 #include "sam_pm.h"
diff --git a/arch/arm/src/samd2l2/sam_i2c_master.c b/arch/arm/src/samd2l2/sam_i2c_master.c
index d5b38564f02..b52a8bcde0a 100644
--- a/arch/arm/src/samd2l2/sam_i2c_master.c
+++ b/arch/arm/src/samd2l2/sam_i2c_master.c
@@ -69,8 +69,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_pinmap.h"
 #include "sam_gclk.h"
diff --git a/arch/arm/src/samd2l2/sam_irq.c b/arch/arm/src/samd2l2/sam_irq.c
index 2a0c0591143..a05b68ac4fd 100644
--- a/arch/arm/src/samd2l2/sam_irq.c
+++ b/arch/arm/src/samd2l2/sam_irq.c
@@ -33,9 +33,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_irq.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/samd2l2/sam_irqprio.c b/arch/arm/src/samd2l2/sam_irqprio.c
index 5f7e88c0479..8f0c5104c01 100644
--- a/arch/arm/src/samd2l2/sam_irqprio.c
+++ b/arch/arm/src/samd2l2/sam_irqprio.c
@@ -29,8 +29,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_irq.h"
 
 #ifdef CONFIG_ARCH_IRQPRIO
diff --git a/arch/arm/src/samd2l2/sam_lowputc.c b/arch/arm/src/samd2l2/sam_lowputc.c
index 68c4932cdd3..6741a3995a9 100644
--- a/arch/arm/src/samd2l2/sam_lowputc.c
+++ b/arch/arm/src/samd2l2/sam_lowputc.c
@@ -40,7 +40,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_config.h"
 #include "sam_gclk.h"
 #include "sam_pm.h"
diff --git a/arch/arm/src/samd2l2/sam_port.c b/arch/arm/src/samd2l2/sam_port.c
index a443075bdd3..0734d4ad042 100644
--- a/arch/arm/src/samd2l2/sam_port.c
+++ b/arch/arm/src/samd2l2/sam_port.c
@@ -39,8 +39,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_port.h"
 #include "sam_eic.h"
diff --git a/arch/arm/src/samd2l2/sam_sercom.c b/arch/arm/src/samd2l2/sam_sercom.c
index c49c265178d..edebcd3bd26 100644
--- a/arch/arm/src/samd2l2/sam_sercom.c
+++ b/arch/arm/src/samd2l2/sam_sercom.c
@@ -33,10 +33,8 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_config.h"
-
 #include "sam_pm.h"
 #include "sam_gclk.h"
 #include "sam_sercom.h"
diff --git a/arch/arm/src/samd2l2/sam_sercom.h b/arch/arm/src/samd2l2/sam_sercom.h
index eb7a84290e9..8a786b60775 100644
--- a/arch/arm/src/samd2l2/sam_sercom.h
+++ b/arch/arm/src/samd2l2/sam_sercom.h
@@ -29,7 +29,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_config.h"
 #include "sam_periphclks.h"
 
diff --git a/arch/arm/src/samd2l2/sam_serial.c b/arch/arm/src/samd2l2/sam_serial.c
index a34605a7c77..6f66c7b8f6e 100644
--- a/arch/arm/src/samd2l2/sam_serial.c
+++ b/arch/arm/src/samd2l2/sam_serial.c
@@ -40,9 +40,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "sam_config.h"
 #include "sam_usart.h"
diff --git a/arch/arm/src/samd2l2/sam_spi.c b/arch/arm/src/samd2l2/sam_spi.c
index d17d50310fd..f520cc0000e 100644
--- a/arch/arm/src/samd2l2/sam_spi.c
+++ b/arch/arm/src/samd2l2/sam_spi.c
@@ -46,8 +46,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "sam_pinmap.h"
 #include "sam_gclk.h"
diff --git a/arch/arm/src/samd2l2/sam_start.c b/arch/arm/src/samd2l2/sam_start.c
index 0b22f6c6576..f13f6b1096d 100644
--- a/arch/arm/src/samd2l2/sam_start.c
+++ b/arch/arm/src/samd2l2/sam_start.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_config.h"
 #include "sam_lowputc.h"
 #include "sam_clockconfig.h"
diff --git a/arch/arm/src/samd2l2/sam_timerisr.c b/arch/arm/src/samd2l2/sam_timerisr.c
index 85bf79e3128..9c9854ec962 100644
--- a/arch/arm/src/samd2l2/sam_timerisr.c
+++ b/arch/arm/src/samd2l2/sam_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/samd2l2/sam_usart.h b/arch/arm/src/samd2l2/sam_usart.h
index 585876e1c6f..5ee437b207b 100644
--- a/arch/arm/src/samd2l2/sam_usart.h
+++ b/arch/arm/src/samd2l2/sam_usart.h
@@ -32,7 +32,7 @@
 
 #include <arch/chip/chip.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21)
 #  include "hardware/samd_usart.h"
diff --git a/arch/arm/src/samd2l2/sam_usb.c b/arch/arm/src/samd2l2/sam_usb.c
index a1ce8dab511..fbf48121d75 100644
--- a/arch/arm/src/samd2l2/sam_usb.c
+++ b/arch/arm/src/samd2l2/sam_usb.c
@@ -84,9 +84,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_gclk.h"
 #include "chip.h"
 #include "sam_port.h"
diff --git a/arch/arm/src/samd2l2/samd_clockconfig.c b/arch/arm/src/samd2l2/samd_clockconfig.c
index 678e8bfb1eb..57356836d9a 100644
--- a/arch/arm/src/samd2l2/samd_clockconfig.c
+++ b/arch/arm/src/samd2l2/samd_clockconfig.c
@@ -40,8 +40,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/samd_pm.h"
 #include "hardware/samd_sysctrl.h"
 #include "hardware/samd_gclk.h"
diff --git a/arch/arm/src/samd2l2/samd_gclk.c b/arch/arm/src/samd2l2/samd_gclk.c
index 168f5353d60..597dbb218ae 100644
--- a/arch/arm/src/samd2l2/samd_gclk.c
+++ b/arch/arm/src/samd2l2/samd_gclk.c
@@ -29,7 +29,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gclk.h"
 
 #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21)
diff --git a/arch/arm/src/samd2l2/saml_clockconfig.c b/arch/arm/src/samd2l2/saml_clockconfig.c
index dbcb17d902a..9ac93cf8dbc 100644
--- a/arch/arm/src/samd2l2/saml_clockconfig.c
+++ b/arch/arm/src/samd2l2/saml_clockconfig.c
@@ -40,8 +40,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/saml_pm.h"
 #include "hardware/saml_supc.h"
 #include "hardware/saml_oscctrl.h"
diff --git a/arch/arm/src/samd2l2/saml_gclk.c b/arch/arm/src/samd2l2/saml_gclk.c
index eef204ba5ef..18594a7f6c6 100644
--- a/arch/arm/src/samd2l2/saml_gclk.c
+++ b/arch/arm/src/samd2l2/saml_gclk.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gclk.h"
 
 #ifdef CONFIG_ARCH_FAMILY_SAML21
diff --git a/arch/arm/src/samd5e5/sam_clockconfig.c b/arch/arm/src/samd5e5/sam_clockconfig.c
index bb450900be3..5372fcc7759 100644
--- a/arch/arm/src/samd5e5/sam_clockconfig.c
+++ b/arch/arm/src/samd5e5/sam_clockconfig.c
@@ -28,8 +28,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/sam_pm.h"
 #include "hardware/sam_supc.h"
 #include "hardware/sam_oscctrl.h"
diff --git a/arch/arm/src/samd5e5/sam_cmcc.c b/arch/arm/src/samd5e5/sam_cmcc.c
index 974f2a000af..6543aa5b91c 100644
--- a/arch/arm/src/samd5e5/sam_cmcc.c
+++ b/arch/arm/src/samd5e5/sam_cmcc.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_cmcc.h"
 #include "sam_cmcc.h"
 
diff --git a/arch/arm/src/samd5e5/sam_dmac.c b/arch/arm/src/samd5e5/sam_dmac.c
index 63d6f57da87..08114f542a4 100644
--- a/arch/arm/src/samd5e5/sam_dmac.c
+++ b/arch/arm/src/samd5e5/sam_dmac.c
@@ -36,7 +36,6 @@
 #include <nuttx/semaphore.h>
 #include <arch/samd5e5/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/arm/src/samd5e5/sam_eic.c b/arch/arm/src/samd5e5/sam_eic.c
index 3a45a8f6ea0..33369098fa8 100644
--- a/arch/arm/src/samd5e5/sam_eic.c
+++ b/arch/arm/src/samd5e5/sam_eic.c
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gclk.h"
 #include "sam_periphclks.h"
 #include "sam_port.h"
diff --git a/arch/arm/src/samd5e5/sam_gclk.c b/arch/arm/src/samd5e5/sam_gclk.c
index 2dcf00a425e..9dff3b90d9c 100644
--- a/arch/arm/src/samd5e5/sam_gclk.c
+++ b/arch/arm/src/samd5e5/sam_gclk.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gclk.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/samd5e5/sam_gclk.h b/arch/arm/src/samd5e5/sam_gclk.h
index b107cccf2ac..36293def756 100644
--- a/arch/arm/src/samd5e5/sam_gclk.h
+++ b/arch/arm/src/samd5e5/sam_gclk.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_config.h"
 #include "hardware/sam_gclk.h"
 
diff --git a/arch/arm/src/samd5e5/sam_gmac.c b/arch/arm/src/samd5e5/sam_gmac.c
index 65c32e39d73..09879963946 100644
--- a/arch/arm/src/samd5e5/sam_gmac.c
+++ b/arch/arm/src/samd5e5/sam_gmac.c
@@ -74,9 +74,7 @@
 #  include <nuttx/net/pkt.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "hardware/sam_pinmap.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/samd5e5/sam_i2c_master.c b/arch/arm/src/samd5e5/sam_i2c_master.c
index d6ef41a8a0e..e8dbbed7c66 100644
--- a/arch/arm/src/samd5e5/sam_i2c_master.c
+++ b/arch/arm/src/samd5e5/sam_i2c_master.c
@@ -62,8 +62,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/sam_i2c_master.h"
 #include "hardware/sam_pinmap.h"
 #include "sam_gclk.h"
diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c
index a364a1d4c81..f5bc9628947 100644
--- a/arch/arm/src/samd5e5/sam_irq.c
+++ b/arch/arm/src/samd5e5/sam_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_SAMD5E5_EIC
diff --git a/arch/arm/src/samd5e5/sam_lowputc.c b/arch/arm/src/samd5e5/sam_lowputc.c
index 6897c13b25c..7268e494674 100644
--- a/arch/arm/src/samd5e5/sam_lowputc.c
+++ b/arch/arm/src/samd5e5/sam_lowputc.c
@@ -30,7 +30,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_pm.h"
 #include "sam_config.h"
 #include "sam_gclk.h"
diff --git a/arch/arm/src/samd5e5/sam_port.c b/arch/arm/src/samd5e5/sam_port.c
index 2c340e4e652..dab14a6e6ef 100644
--- a/arch/arm/src/samd5e5/sam_port.c
+++ b/arch/arm/src/samd5e5/sam_port.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_port.h"
 #include "sam_eic.h"
 
diff --git a/arch/arm/src/samd5e5/sam_progmem.c b/arch/arm/src/samd5e5/sam_progmem.c
index b0862d62fc8..7a03c18440b 100644
--- a/arch/arm/src/samd5e5/sam_progmem.c
+++ b/arch/arm/src/samd5e5/sam_progmem.c
@@ -32,8 +32,7 @@
 #include <nuttx/arch.h>
 #include <arch/samd5e5/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/sam_memorymap.h"
 #include "hardware/sam_nvmctrl.h"
 
diff --git a/arch/arm/src/samd5e5/sam_progmem.h b/arch/arm/src/samd5e5/sam_progmem.h
index 4734c847a79..46bc467825d 100644
--- a/arch/arm/src/samd5e5/sam_progmem.h
+++ b/arch/arm/src/samd5e5/sam_progmem.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_nvmctrl.h"
 
 #include <nuttx/progmem.h>
diff --git a/arch/arm/src/samd5e5/sam_sercom.c b/arch/arm/src/samd5e5/sam_sercom.c
index a7996c0d4b9..cb07d47dcb1 100644
--- a/arch/arm/src/samd5e5/sam_sercom.c
+++ b/arch/arm/src/samd5e5/sam_sercom.c
@@ -28,8 +28,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_config.h"
 
 #include "chip.h"
diff --git a/arch/arm/src/samd5e5/sam_sercom.h b/arch/arm/src/samd5e5/sam_sercom.h
index 0bb36e56f93..b86ab7ae0f1 100644
--- a/arch/arm/src/samd5e5/sam_sercom.h
+++ b/arch/arm/src/samd5e5/sam_sercom.h
@@ -29,7 +29,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_config.h"
 #include "sam_periphclks.h"
 
diff --git a/arch/arm/src/samd5e5/sam_serial.c b/arch/arm/src/samd5e5/sam_serial.c
index 855b7dc3f31..9d1306ac820 100644
--- a/arch/arm/src/samd5e5/sam_serial.c
+++ b/arch/arm/src/samd5e5/sam_serial.c
@@ -40,9 +40,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_config.h"
 #include "sam_usart.h"
 #include "sam_lowputc.h"
diff --git a/arch/arm/src/samd5e5/sam_spi.c b/arch/arm/src/samd5e5/sam_spi.c
index d986790d23f..3d60ccfbea6 100644
--- a/arch/arm/src/samd5e5/sam_spi.c
+++ b/arch/arm/src/samd5e5/sam_spi.c
@@ -41,8 +41,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/sam_pinmap.h"
 #include "sam_gclk.h"
 #include "sam_port.h"
diff --git a/arch/arm/src/samd5e5/sam_start.c b/arch/arm/src/samd5e5/sam_start.c
index e81a11dc4c1..f2814f6fabd 100644
--- a/arch/arm/src/samd5e5/sam_start.c
+++ b/arch/arm/src/samd5e5/sam_start.c
@@ -30,7 +30,6 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/samd5e5/sam_tc.c b/arch/arm/src/samd5e5/sam_tc.c
index 3b5f80f42cb..21073923d34 100644
--- a/arch/arm/src/samd5e5/sam_tc.c
+++ b/arch/arm/src/samd5e5/sam_tc.c
@@ -43,8 +43,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_gclk.h"
 #include "sam_periphclks.h"
 #include "sam_port.h"
diff --git a/arch/arm/src/samd5e5/sam_tickless.c b/arch/arm/src/samd5e5/sam_tickless.c
index 9bfeb4e24ae..dc9a9a836e7 100644
--- a/arch/arm/src/samd5e5/sam_tickless.c
+++ b/arch/arm/src/samd5e5/sam_tickless.c
@@ -74,7 +74,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <nuttx/arch.h>
 
diff --git a/arch/arm/src/samd5e5/sam_timerisr.c b/arch/arm/src/samd5e5/sam_timerisr.c
index 1d15f4798d2..2d51c5ead19 100644
--- a/arch/arm/src/samd5e5/sam_timerisr.c
+++ b/arch/arm/src/samd5e5/sam_timerisr.c
@@ -34,7 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/samd5e5/sam_usart.h b/arch/arm/src/samd5e5/sam_usart.h
index 2e69f600319..a43923535cc 100644
--- a/arch/arm/src/samd5e5/sam_usart.h
+++ b/arch/arm/src/samd5e5/sam_usart.h
@@ -32,7 +32,7 @@
 
 #include <arch/chip/chip.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_usart.h"
 
 #include "sam_config.h"
diff --git a/arch/arm/src/samd5e5/sam_usb.c b/arch/arm/src/samd5e5/sam_usb.c
index c1ef50c082e..308d6a1c65f 100644
--- a/arch/arm/src/samd5e5/sam_usb.c
+++ b/arch/arm/src/samd5e5/sam_usb.c
@@ -89,8 +89,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "hardware/sam_pinmap.h"
 #include "hardware/sam_fuses.h"
diff --git a/arch/arm/src/samd5e5/sam_wdt.c b/arch/arm/src/samd5e5/sam_wdt.c
index 4b205564441..f337a2d2ece 100644
--- a/arch/arm/src/samd5e5/sam_wdt.c
+++ b/arch/arm/src/samd5e5/sam_wdt.c
@@ -38,7 +38,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "sam_periphclks.h"
 #include "sam_wdt.h"
 
diff --git a/arch/arm/src/samv7/sam_afec.c b/arch/arm/src/samv7/sam_afec.c
index 8a97f38a9df..9dad5431211 100644
--- a/arch/arm/src/samv7/sam_afec.c
+++ b/arch/arm/src/samv7/sam_afec.c
@@ -41,8 +41,6 @@
 #include <nuttx/analog/ioctl.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/sam_matrix.h"
 #include "hardware/sam_pinmap.h"
 #include "hardware/sam_pio.h"
diff --git a/arch/arm/src/samv7/sam_allocateheap.c b/arch/arm/src/samv7/sam_allocateheap.c
index c40d109f1ad..aa2f6a7bf47 100644
--- a/arch/arm/src/samv7/sam_allocateheap.c
+++ b/arch/arm/src/samv7/sam_allocateheap.c
@@ -36,9 +36,7 @@
 #include <arch/board/board.h>
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_mpuinit.h"
 #include "sam_periphclks.h"
 
diff --git a/arch/arm/src/samv7/sam_clockconfig.c b/arch/arm/src/samv7/sam_clockconfig.c
index ac50a493274..5380e3c730e 100644
--- a/arch/arm/src/samv7/sam_clockconfig.c
+++ b/arch/arm/src/samv7/sam_clockconfig.c
@@ -30,9 +30,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_clockconfig.h"
 #include "hardware/sam_pmc.h"
 #include "hardware/sam_eefc.h"
diff --git a/arch/arm/src/samv7/sam_dac.c b/arch/arm/src/samv7/sam_dac.c
index 865023dd455..e711c9226b5 100644
--- a/arch/arm/src/samv7/sam_dac.c
+++ b/arch/arm/src/samv7/sam_dac.c
@@ -38,8 +38,6 @@
 #include <nuttx/analog/dac.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/sam_dacc.h"
 #include "hardware/sam_pmc.h"
 #include "hardware/sam_pinmap.h"
diff --git a/arch/arm/src/samv7/sam_eefc.h b/arch/arm/src/samv7/sam_eefc.h
index 65beaa933be..d75661c546c 100644
--- a/arch/arm/src/samv7/sam_eefc.h
+++ b/arch/arm/src/samv7/sam_eefc.h
@@ -27,7 +27,6 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/sam_eefc.h"
 
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index 6ee60a1d4b0..84532e9f7b4 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -59,9 +59,7 @@
 
 #include <arch/samv7/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/sam_pinmap.h"
 #include "hardware/sam_chipid.h"
 #include "sam_gpio.h"
diff --git a/arch/arm/src/samv7/sam_gpio.c b/arch/arm/src/samv7/sam_gpio.c
index cf762020e00..b88b72eee2e 100644
--- a/arch/arm/src/samv7/sam_gpio.c
+++ b/arch/arm/src/samv7/sam_gpio.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_gpio.h"
 #include "hardware/sam_pio.h"
 #include "hardware/sam_matrix.h"
diff --git a/arch/arm/src/samv7/sam_gpioirq.c b/arch/arm/src/samv7/sam_gpioirq.c
index 67f8189b2fd..edbab38f3ae 100644
--- a/arch/arm/src/samv7/sam_gpioirq.c
+++ b/arch/arm/src/samv7/sam_gpioirq.c
@@ -35,9 +35,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pmc.h"
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index ddc0068ed27..e79e2218e91 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam_xdmac.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index 70412a37ca0..fbfc67929ac 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_SAMV7_GPIO_IRQ
diff --git a/arch/arm/src/samv7/sam_lowputc.c b/arch/arm/src/samv7/sam_lowputc.c
index 50d208ffa7e..2fbfdf79f2b 100644
--- a/arch/arm/src/samv7/sam_lowputc.c
+++ b/arch/arm/src/samv7/sam_lowputc.c
@@ -30,8 +30,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_config.h"
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index 3d23705fa8c..49fdd06da8c 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -45,8 +45,6 @@
 #include <nuttx/can/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/sam_matrix.h"
 #include "hardware/sam_chipid.h"
 #include "hardware/sam_pinmap.h"
diff --git a/arch/arm/src/samv7/sam_pck.c b/arch/arm/src/samv7/sam_pck.c
index ed53dfa4c81..4135d421c20 100644
--- a/arch/arm/src/samv7/sam_pck.c
+++ b/arch/arm/src/samv7/sam_pck.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "hardware/sam_pinmap.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 
 #include "sam_pck.h"
diff --git a/arch/arm/src/samv7/sam_progmem.c b/arch/arm/src/samv7/sam_progmem.c
index 02600a602b1..46df88796f2 100644
--- a/arch/arm/src/samv7/sam_progmem.c
+++ b/arch/arm/src/samv7/sam_progmem.c
@@ -31,7 +31,6 @@
 #include <nuttx/semaphore.h>
 #include <arch/samv7/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "barriers.h"
 
diff --git a/arch/arm/src/samv7/sam_progmem.h b/arch/arm/src/samv7/sam_progmem.h
index 9ae71b0a70a..e3a302a6695 100644
--- a/arch/arm/src/samv7/sam_progmem.h
+++ b/arch/arm/src/samv7/sam_progmem.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_eefc.h"
 
 #include <nuttx/progmem.h>
diff --git a/arch/arm/src/samv7/sam_pwm.c b/arch/arm/src/samv7/sam_pwm.c
index b3608d62c43..07d92696623 100644
--- a/arch/arm/src/samv7/sam_pwm.c
+++ b/arch/arm/src/samv7/sam_pwm.c
@@ -36,7 +36,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/timers/pwm.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_config.h"
 #include "sam_pwm.h"
diff --git a/arch/arm/src/samv7/sam_qencoder.c b/arch/arm/src/samv7/sam_qencoder.c
index c6859337093..fa506315b17 100644
--- a/arch/arm/src/samv7/sam_qencoder.c
+++ b/arch/arm/src/samv7/sam_qencoder.c
@@ -38,8 +38,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_tc.h"
 #include "sam_qencoder.h"
 
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index bffa1ba3816..0c22416776d 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -43,7 +43,6 @@
 #include <nuttx/spi/qspi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "barriers.h"
 
 #include "sam_gpio.h"
diff --git a/arch/arm/src/samv7/sam_qspi_spi.c b/arch/arm/src/samv7/sam_qspi_spi.c
index 9fe93745f57..6338f8216d3 100644
--- a/arch/arm/src/samv7/sam_qspi_spi.c
+++ b/arch/arm/src/samv7/sam_qspi_spi.c
@@ -45,8 +45,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_gpio.h"
 #include "sam_xdmac.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c
index 3cd291cc2f6..d86acc06e13 100644
--- a/arch/arm/src/samv7/sam_rswdt.c
+++ b/arch/arm/src/samv7/sam_rswdt.c
@@ -34,7 +34,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_wdt.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAMV7_RSWDT)
diff --git a/arch/arm/src/samv7/sam_serial.c b/arch/arm/src/samv7/sam_serial.c
index 798f36e7192..437806231a0 100644
--- a/arch/arm/src/samv7/sam_serial.c
+++ b/arch/arm/src/samv7/sam_serial.c
@@ -44,7 +44,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sam_config.h"
 #include "hardware/sam_uart.h"
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index fad6b7eacd3..6a77c643361 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -45,8 +45,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_gpio.h"
 #include "sam_xdmac.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index 6465800a4a8..e4b455cf593 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -37,8 +37,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/spi/slave.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_config.h"
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index f18dff366b9..3fe21a89a47 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -46,8 +46,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_gpio.h"
 #include "sam_xdmac.h"
 #include "sam_periphclks.h"
diff --git a/arch/arm/src/samv7/sam_start.c b/arch/arm/src/samv7/sam_start.c
index fae64399b5e..b22b2b8cff5 100644
--- a/arch/arm/src/samv7/sam_start.c
+++ b/arch/arm/src/samv7/sam_start.c
@@ -32,7 +32,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "barriers.h"
 #include "nvic.h"
diff --git a/arch/arm/src/samv7/sam_systemreset.c b/arch/arm/src/samv7/sam_systemreset.c
index f5513b2dc92..02d969ff092 100644
--- a/arch/arm/src/samv7/sam_systemreset.c
+++ b/arch/arm/src/samv7/sam_systemreset.c
@@ -31,7 +31,7 @@
 #include <nuttx/board.h>
 #include <arch/samv7/chip.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/sam_rstc.h"
 
 #ifdef CONFIG_SAMV7_SYSTEMRESET
diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c
index d54e70c6d5f..b1481886330 100644
--- a/arch/arm/src/samv7/sam_tc.c
+++ b/arch/arm/src/samv7/sam_tc.c
@@ -63,7 +63,7 @@
 #include <nuttx/semaphore.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pinmap.h"
 #include "hardware/sam_pmc.h"
diff --git a/arch/arm/src/samv7/sam_timerisr.c b/arch/arm/src/samv7/sam_timerisr.c
index 546f40a54d2..8a1cedea0fa 100644
--- a/arch/arm/src/samv7/sam_timerisr.c
+++ b/arch/arm/src/samv7/sam_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/samv7/sam_trng.c b/arch/arm/src/samv7/sam_trng.c
index 23d70237280..0c73edc6c2f 100644
--- a/arch/arm/src/samv7/sam_trng.c
+++ b/arch/arm/src/samv7/sam_trng.c
@@ -36,9 +36,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "sam_periphclks.h"
 #include "sam_trng.h"
 
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index eb13292e405..3acc6e9aedc 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -66,8 +66,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/sam_pmc.h"
 #include "hardware/sam_pinmap.h"
 
diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c
index 6ce48aa690f..7b5e5a11387 100644
--- a/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/arch/arm/src/samv7/sam_usbdevhs.c
@@ -69,7 +69,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "barriers.h"
 
diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c
index 6de17957b8c..77b3667df00 100644
--- a/arch/arm/src/samv7/sam_wdt.c
+++ b/arch/arm/src/samv7/sam_wdt.c
@@ -34,7 +34,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_wdt.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAMV7_WDT)
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index a125c9a4591..9f38014b27a 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -37,7 +37,6 @@
 #include <nuttx/semaphore.h>
 #include <arch/samv7/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/arm/src/stm32/stm32_1wire.c b/arch/arm/src/stm32/stm32_1wire.c
index 8dfc8ab7aa7..75aef98631b 100644
--- a/arch/arm/src/stm32/stm32_1wire.c
+++ b/arch/arm/src/stm32/stm32_1wire.c
@@ -46,8 +46,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_1wire.h"
 
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index a89e822522d..175dd7a987d 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -44,8 +44,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32/stm32_aes.c b/arch/arm/src/stm32/stm32_aes.c
index 899f93e81bd..fca34a0216a 100644
--- a/arch/arm/src/stm32/stm32_aes.c
+++ b/arch/arm/src/stm32/stm32_aes.c
@@ -38,8 +38,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_aes.h"
diff --git a/arch/arm/src/stm32/stm32_allocateheap.c b/arch/arm/src/stm32/stm32_allocateheap.c
index eeb0f0fd97c..5d47437bb3e 100644
--- a/arch/arm/src/stm32/stm32_allocateheap.c
+++ b/arch/arm/src/stm32/stm32_allocateheap.c
@@ -40,9 +40,7 @@
 #include "chip.h"
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_mpuinit.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index a13640aeafa..6f6cf776f13 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -39,8 +39,6 @@
 #include <nuttx/can/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32/stm32_can_sock.c b/arch/arm/src/stm32/stm32_can_sock.c
index 8b35726215a..10568461a4d 100644
--- a/arch/arm/src/stm32/stm32_can_sock.c
+++ b/arch/arm/src/stm32/stm32_can_sock.c
@@ -44,8 +44,6 @@
 #include <netpacket/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32/stm32_capture.c b/arch/arm/src/stm32/stm32_capture.c
index dae27aa63ec..10b30ac96e8 100644
--- a/arch/arm/src/stm32/stm32_capture.c
+++ b/arch/arm/src/stm32/stm32_capture.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32.h"
 #include "stm32_gpio.h"
 #include "stm32_capture.h"
diff --git a/arch/arm/src/stm32/stm32_comp.c b/arch/arm/src/stm32/stm32_comp.c
index 6988630f37e..cf8d8c6a9c5 100644
--- a/arch/arm/src/stm32/stm32_comp.c
+++ b/arch/arm/src/stm32/stm32_comp.c
@@ -33,7 +33,7 @@
 #include <nuttx/analog/comp.h>
 #include <nuttx/analog/ioctl.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_comp.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32/stm32_cordic.c b/arch/arm/src/stm32/stm32_cordic.c
index 8d3327b46b4..7c6adf4284a 100644
--- a/arch/arm/src/stm32/stm32_cordic.c
+++ b/arch/arm/src/stm32/stm32_cordic.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 #include <nuttx/math/cordic.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "hardware/stm32g4xxxx_cordic.h"
diff --git a/arch/arm/src/stm32/stm32_dac.c b/arch/arm/src/stm32/stm32_dac.c
index 4ff6036f8e2..516f2508758 100644
--- a/arch/arm/src/stm32/stm32_dac.c
+++ b/arch/arm/src/stm32/stm32_dac.c
@@ -37,8 +37,6 @@
 #include <nuttx/analog/dac.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_dac.h"
diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c
index b18593669d2..ec0b630a92d 100644
--- a/arch/arm/src/stm32/stm32_dma2d.c
+++ b/arch/arm/src/stm32/stm32_dma2d.c
@@ -42,7 +42,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "hardware/stm32_ltdc.h"
diff --git a/arch/arm/src/stm32/stm32_dma_v1.c b/arch/arm/src/stm32/stm32_dma_v1.c
index f8bd428a317..aafcdcf9db9 100644
--- a/arch/arm/src/stm32/stm32_dma_v1.c
+++ b/arch/arm/src/stm32/stm32_dma_v1.c
@@ -34,7 +34,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/arm/src/stm32/stm32_dma_v1mux.c b/arch/arm/src/stm32/stm32_dma_v1mux.c
index 300fc1c77ee..aec09c986ca 100644
--- a/arch/arm/src/stm32/stm32_dma_v1mux.c
+++ b/arch/arm/src/stm32/stm32_dma_v1mux.c
@@ -35,8 +35,6 @@
 #include <nuttx/arch.h>
 #include <arch/stm32/chip.h>
 
-#include "arm_arch.h"
-
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32/stm32_dma_v2.c b/arch/arm/src/stm32/stm32_dma_v2.c
index 6abebd89117..a8b9a5e06bb 100644
--- a/arch/arm/src/stm32/stm32_dma_v2.c
+++ b/arch/arm/src/stm32/stm32_dma_v2.c
@@ -35,7 +35,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c
index 01f8745da4a..58ac845a1b6 100644
--- a/arch/arm/src/stm32/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32/stm32_dumpgpio.c
@@ -35,7 +35,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 1873058f5b7..3ba248160ef 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -52,7 +52,6 @@
 #endif
 
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32/stm32_exti_alarm.c b/arch/arm/src/stm32/stm32_exti_alarm.c
index edeff8b77cf..576f898f1a4 100644
--- a/arch/arm/src/stm32/stm32_exti_alarm.c
+++ b/arch/arm/src/stm32/stm32_exti_alarm.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32/stm32_exti_gpio.c b/arch/arm/src/stm32/stm32_exti_gpio.c
index 642b2841dd8..b32b4718985 100644
--- a/arch/arm/src/stm32/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32/stm32_exti_gpio.c
@@ -33,7 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32/stm32_exti_pwr.c b/arch/arm/src/stm32/stm32_exti_pwr.c
index 88f1cec7c26..6b667095bba 100644
--- a/arch/arm/src/stm32/stm32_exti_pwr.c
+++ b/arch/arm/src/stm32/stm32_exti_pwr.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32/stm32_exti_wakeup.c b/arch/arm/src/stm32/stm32_exti_wakeup.c
index ca6c05538a9..183cfe7cc5b 100644
--- a/arch/arm/src/stm32/stm32_exti_wakeup.c
+++ b/arch/arm/src/stm32/stm32_exti_wakeup.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32/stm32_fdcan.c b/arch/arm/src/stm32/stm32_fdcan.c
index e25ca0f276a..22a8b27cf6f 100644
--- a/arch/arm/src/stm32/stm32_fdcan.c
+++ b/arch/arm/src/stm32/stm32_fdcan.c
@@ -40,8 +40,6 @@
 #include <nuttx/can/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_fdcan.h"
 #include "hardware/stm32_pinmap.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32/stm32_fdcan_sock.c b/arch/arm/src/stm32/stm32_fdcan_sock.c
index f5cf125d377..52388a61f5f 100644
--- a/arch/arm/src/stm32/stm32_fdcan_sock.c
+++ b/arch/arm/src/stm32/stm32_fdcan_sock.c
@@ -44,8 +44,6 @@
 #include <netpacket/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_fdcan.h"
 #include "hardware/stm32_pinmap.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32/stm32_foc.c b/arch/arm/src/stm32/stm32_foc.c
index 1015ff42807..3b436492701 100644
--- a/arch/arm/src/stm32/stm32_foc.c
+++ b/arch/arm/src/stm32/stm32_foc.c
@@ -33,8 +33,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32_adc.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32/stm32_gpio.c b/arch/arm/src/stm32/stm32_gpio.c
index c5bc424f762..974aea8c2ac 100644
--- a/arch/arm/src/stm32/stm32_gpio.c
+++ b/arch/arm/src/stm32/stm32_gpio.c
@@ -32,7 +32,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_syscfg.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32/stm32_hall3ph.c b/arch/arm/src/stm32/stm32_hall3ph.c
index 4d6ae7117e1..6a997b872d0 100644
--- a/arch/arm/src/stm32/stm32_hall3ph.c
+++ b/arch/arm/src/stm32/stm32_hall3ph.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_hall3ph.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_hciuart.c b/arch/arm/src/stm32/stm32_hciuart.c
index 923728aaa9c..3a3412b8e64 100644
--- a/arch/arm/src/stm32/stm32_hciuart.c
+++ b/arch/arm/src/stm32/stm32_hciuart.c
@@ -41,9 +41,7 @@
 #include <nuttx/wireless/bluetooth/bt_uart.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "stm32_uart.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 62990bbe660..79a00c4772f 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -71,8 +71,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_waste.h"
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index d97dfc58049..10089614c01 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -99,8 +99,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_waste.h"
diff --git a/arch/arm/src/stm32/stm32_i2c_v2.c b/arch/arm/src/stm32/stm32_i2c_v2.c
index 0780122982a..4b3a7bc128a 100644
--- a/arch/arm/src/stm32/stm32_i2c_v2.c
+++ b/arch/arm/src/stm32/stm32_i2c_v2.c
@@ -241,8 +241,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32/stm32_i2s.c b/arch/arm/src/stm32/stm32_i2s.c
index a650827a89f..665bc65d8df 100644
--- a/arch/arm/src/stm32/stm32_i2s.c
+++ b/arch/arm/src/stm32/stm32_i2s.c
@@ -68,8 +68,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_dma.h"
 #include "stm32_spi.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index 9fea7a2fbe9..86474b405e7 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -38,7 +38,6 @@
 #ifdef CONFIG_ARCH_RAMVECTORS
 #  include "ram_vectors.h"
 #endif
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 
diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c
index f0042c24da9..eac39d14434 100644
--- a/arch/arm/src/stm32/stm32_iwdg.c
+++ b/arch/arm/src/stm32/stm32_iwdg.c
@@ -36,7 +36,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "hardware/stm32_dbgmcu.h"
 #include "stm32_wdg.h"
diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c
index 1aadae9411b..bba8476cbfb 100644
--- a/arch/arm/src/stm32/stm32_lowputc.c
+++ b/arch/arm/src/stm32/stm32_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "stm32.h"
diff --git a/arch/arm/src/stm32/stm32_lse.c b/arch/arm/src/stm32/stm32_lse.c
index 60b01b5d830..6c56e044a54 100644
--- a/arch/arm/src/stm32/stm32_lse.c
+++ b/arch/arm/src/stm32/stm32_lse.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 #include "stm32_rcc.h"
 #include "stm32_waste.h"
diff --git a/arch/arm/src/stm32/stm32_lsi.c b/arch/arm/src/stm32/stm32_lsi.c
index 50a3409db98..09daedfadf7 100644
--- a/arch/arm/src/stm32/stm32_lsi.c
+++ b/arch/arm/src/stm32/stm32_lsi.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c
index fe6581de11d..820163f9c68 100644
--- a/arch/arm/src/stm32/stm32_ltdc.c
+++ b/arch/arm/src/stm32/stm32_ltdc.c
@@ -42,7 +42,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "hardware/stm32_ltdc.h"
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 64fecdcf3d7..0cf5065a993 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -44,9 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_otgfs.h"
 
 #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32_OTGFS))
diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c
index 35713cc6744..afda392928d 100644
--- a/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/arch/arm/src/stm32/stm32_otgfshost.c
@@ -50,9 +50,7 @@
 #include "chip.h"             /* Includes default GPIO settings */
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_gpio.h"
 #include "stm32_usbhost.h"
 
diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c
index d0d8575ada1..5b2eb48905e 100644
--- a/arch/arm/src/stm32/stm32_otghsdev.c
+++ b/arch/arm/src/stm32/stm32_otghsdev.c
@@ -44,9 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_otghs.h"
 
 #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32_OTGHS))
diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c
index 1f96b9123c8..a76c41dbbaa 100644
--- a/arch/arm/src/stm32/stm32_otghshost.c
+++ b/arch/arm/src/stm32/stm32_otghshost.c
@@ -50,9 +50,7 @@
 #include "chip.h"             /* Includes default GPIO settings */
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_gpio.h"
 #include "stm32_usbhost.h"
 
diff --git a/arch/arm/src/stm32/stm32_pmsleep.c b/arch/arm/src/stm32/stm32_pmsleep.c
index 6907b404eaf..a034feca23e 100644
--- a/arch/arm/src/stm32/stm32_pmsleep.c
+++ b/arch/arm/src/stm32/stm32_pmsleep.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/arch/arm/src/stm32/stm32_pmstandby.c b/arch/arm/src/stm32/stm32_pmstandby.c
index 8f218745948..c789fb2abbc 100644
--- a/arch/arm/src/stm32/stm32_pmstandby.c
+++ b/arch/arm/src/stm32/stm32_pmstandby.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/arch/arm/src/stm32/stm32_pmstop.c b/arch/arm/src/stm32/stm32_pmstop.c
index e403354e0b5..44b06dd32f7 100644
--- a/arch/arm/src/stm32/stm32_pmstop.c
+++ b/arch/arm/src/stm32/stm32_pmstop.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index 2d1716d0fb5..81d4f962a43 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -35,8 +35,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_pwm.h"
 #include "stm32.h"
diff --git a/arch/arm/src/stm32/stm32_pwr.c b/arch/arm/src/stm32/stm32_pwr.c
index 82bc75a0391..518537cd1c5 100644
--- a/arch/arm/src/stm32/stm32_pwr.c
+++ b/arch/arm/src/stm32/stm32_pwr.c
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 
 #if defined(CONFIG_STM32_PWR)
diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c
index 0fb1feee114..495c0b3e006 100644
--- a/arch/arm/src/stm32/stm32_qencoder.c
+++ b/arch/arm/src/stm32/stm32_qencoder.c
@@ -38,8 +38,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32.h"
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
diff --git a/arch/arm/src/stm32/stm32_rcc.c b/arch/arm/src/stm32/stm32_rcc.c
index 9e2f4147fb0..850ac21ed58 100644
--- a/arch/arm/src/stm32/stm32_rcc.c
+++ b/arch/arm/src/stm32/stm32_rcc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32/stm32_rcc.h b/arch/arm/src/stm32/stm32_rcc.h
index 5efc4bd0d5c..bb9e3e9f245 100644
--- a/arch/arm/src/stm32/stm32_rcc.h
+++ b/arch/arm/src/stm32/stm32_rcc.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #if defined(CONFIG_STM32_STM32L15XX)
diff --git a/arch/arm/src/stm32/stm32_rng.c b/arch/arm/src/stm32/stm32_rng.c
index b90beed15d6..260d7efae70 100644
--- a/arch/arm/src/stm32/stm32_rng.c
+++ b/arch/arm/src/stm32/stm32_rng.c
@@ -35,7 +35,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "arm_arch.h"
 #include "hardware/stm32_rng.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c
index 9b3ed1cf120..f0b1b792a83 100644
--- a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c
@@ -33,8 +33,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_rtc.h"
 
diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c
index d49c89a9aac..a13d4d387d8 100644
--- a/arch/arm/src/stm32/stm32_rtcc.c
+++ b/arch/arm/src/stm32/stm32_rtcc.c
@@ -35,8 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32/stm32_rtcounter.c b/arch/arm/src/stm32/stm32_rtcounter.c
index 4352c111bdd..07c3759187a 100644
--- a/arch/arm/src/stm32/stm32_rtcounter.c
+++ b/arch/arm/src/stm32/stm32_rtcounter.c
@@ -52,8 +52,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 #include "stm32_rcc.h"
 #include "stm32_rtc.h"
diff --git a/arch/arm/src/stm32/stm32_sdadc.c b/arch/arm/src/stm32/stm32_sdadc.c
index 3ce2e9119e0..b2260f389e5 100644
--- a/arch/arm/src/stm32/stm32_sdadc.c
+++ b/arch/arm/src/stm32/stm32_sdadc.c
@@ -61,8 +61,6 @@
 #include <nuttx/analog/ioctl.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_dma.h"
@@ -1382,7 +1380,7 @@ struct adc_dev_s *stm32_sdadcinitialize(int intf,
   /* Check channel list in order */
 
   DEBUGASSERT((cchannels <= SDADC_MAX_SAMPLES) && (cchannels > 0));
-  for (i = 0; i < cchannels - 1; i ++)
+  for (i = 0; i < cchannels - 1; i++)
     {
       if (chanlist[i] >= chanlist[i + 1])
         {
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index cce6936f778..c25dddcb6c2 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_dma.h"
 #include "stm32_sdio.h"
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index 6f474760e4a..5e9d7ea5c8c 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -49,7 +49,6 @@
 #include "stm32_uart.h"
 #include "stm32_dma.h"
 #include "stm32_rcc.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 915fe970cdc..8f8e0c11ef1 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -64,8 +64,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c
index 026ae5eb286..7e0b52543a1 100644
--- a/arch/arm/src/stm32/stm32_start.c
+++ b/arch/arm/src/stm32/stm32_start.c
@@ -30,7 +30,6 @@
 
 #include <nuttx/init.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 #include "mpu.h"
diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c
index ac7f6783d7e..2214fb2c9e3 100644
--- a/arch/arm/src/stm32/stm32_tickless.c
+++ b/arch/arm/src/stm32/stm32_tickless.c
@@ -89,8 +89,7 @@
 #include <nuttx/arch.h>
 #include <debug.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_tim.h"
 
 #ifdef CONFIG_SCHED_TICKLESS
diff --git a/arch/arm/src/stm32/stm32_tim.c b/arch/arm/src/stm32/stm32_tim.c
index 4608fe72f02..a6a66751d7b 100644
--- a/arch/arm/src/stm32/stm32_tim.c
+++ b/arch/arm/src/stm32/stm32_tim.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32.h"
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
diff --git a/arch/arm/src/stm32/stm32_timerisr.c b/arch/arm/src/stm32/stm32_timerisr.c
index 6fdae660186..0c5b2c6bf91 100644
--- a/arch/arm/src/stm32/stm32_timerisr.c
+++ b/arch/arm/src/stm32/stm32_timerisr.c
@@ -34,7 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "systick.h"
 
 #include "chip.h"
diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c
index 838a515b989..bd70f54fa59 100644
--- a/arch/arm/src/stm32/stm32_usbdev.c
+++ b/arch/arm/src/stm32/stm32_usbdev.c
@@ -46,7 +46,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_syscfg.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c
index 002049384f1..75dda3dc039 100644
--- a/arch/arm/src/stm32/stm32_wwdg.c
+++ b/arch/arm/src/stm32/stm32_wwdg.c
@@ -34,7 +34,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/stm32_dbgmcu.h"
 #include "stm32_wdg.h"
 
diff --git a/arch/arm/src/stm32/stm32f10xxf30xx_flash.c b/arch/arm/src/stm32/stm32f10xxf30xx_flash.c
index f95d129a23f..d2e3618df8a 100644
--- a/arch/arm/src/stm32/stm32f10xxf30xx_flash.c
+++ b/arch/arm/src/stm32/stm32f10xxf30xx_flash.c
@@ -41,8 +41,7 @@
 #include "stm32_flash.h"
 #include "stm32_rcc.h"
 #include "stm32_waste.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /* Only for the STM32F[1|3]0xx family. */
 
diff --git a/arch/arm/src/stm32/stm32f20xxf40xx_flash.c b/arch/arm/src/stm32/stm32f20xxf40xx_flash.c
index e9476850c27..fd1b0cd98da 100644
--- a/arch/arm/src/stm32/stm32f20xxf40xx_flash.c
+++ b/arch/arm/src/stm32/stm32f20xxf40xx_flash.c
@@ -41,8 +41,7 @@
 #include "stm32_flash.h"
 #include "stm32_rcc.h"
 #include "stm32_waste.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /* Only for the STM32F[2|4]0xx family. */
 
diff --git a/arch/arm/src/stm32/stm32f40xxx_i2c.c b/arch/arm/src/stm32/stm32f40xxx_i2c.c
index c0db693ee22..8415967ecad 100644
--- a/arch/arm/src/stm32/stm32f40xxx_i2c.c
+++ b/arch/arm/src/stm32/stm32f40xxx_i2c.c
@@ -70,8 +70,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_waste.h"
diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
index af42ab9d847..6426c933cea 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
@@ -36,8 +36,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/time.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32/stm32l15xx_flash.c b/arch/arm/src/stm32/stm32l15xx_flash.c
index ec0fb3edcb7..cfb0ed640e0 100644
--- a/arch/arm/src/stm32/stm32l15xx_flash.c
+++ b/arch/arm/src/stm32/stm32l15xx_flash.c
@@ -44,8 +44,7 @@
 #include "stm32_flash.h"
 #include "stm32_rcc.h"
 #include "stm32_waste.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /* Only for the STM32L15xx family. */
 
diff --git a/arch/arm/src/stm32/stm32l15xxx_rtcc.c b/arch/arm/src/stm32/stm32l15xxx_rtcc.c
index c028a1db214..e2632afd82f 100644
--- a/arch/arm/src/stm32/stm32l15xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32l15xxx_rtcc.c
@@ -37,8 +37,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_adc.c b/arch/arm/src/stm32f0l0g0/stm32_adc.c
index e07f611be8e..3797027fe98 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_adc.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_adc.c
@@ -44,8 +44,6 @@
 #include <nuttx/semaphore.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_aes.c b/arch/arm/src/stm32f0l0g0/stm32_aes.c
index 7611ad78082..44e253b9f1f 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_aes.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_aes.c
@@ -38,8 +38,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_aes.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c
index d0c303f25c5..f5dfb2a2e37 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c
@@ -36,7 +36,6 @@
 
 #include <arch/chip/chip.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c b/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c
index 16322df9882..2c3731e4490 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c
@@ -33,7 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_gpio.c b/arch/arm/src/stm32f0l0g0/stm32_gpio.c
index 6ff70d0d86e..5e05bcac505 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_gpio.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_gpio.c
@@ -33,8 +33,7 @@
 #include <arch/irq.h>
 #include <arch/stm32f0l0g0/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 
diff --git a/arch/arm/src/stm32f0l0g0/stm32_hsi48.c b/arch/arm/src/stm32f0l0g0/stm32_hsi48.c
index 448e730dcae..1f5dbea9ae0 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_hsi48.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_hsi48.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/stm32_rcc.h"
 #include "hardware/stm32_crs.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_i2c.c b/arch/arm/src/stm32f0l0g0/stm32_i2c.c
index 80dc64b4a26..b1cb004cad9 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_i2c.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_i2c.c
@@ -242,8 +242,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_irq.c b/arch/arm/src/stm32f0l0g0/stm32_irq.c
index 7eb3c62a655..4a7063f0962 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_irq.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_irq.c
@@ -33,7 +33,6 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /* #include "stm32_irq.h" */
diff --git a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c
index 3b3b01f82eb..2f98090e393 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c
index ba2b52a7125..1ae533806bc 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c
@@ -27,8 +27,6 @@
 #include <stdint.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "hardware/stm32_pinmap.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_lse.c b/arch/arm/src/stm32f0l0g0/stm32_lse.c
index ebd544170f2..bf9fbde7b46 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_lse.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_lse.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 #include "stm32_rcc.h"
 
diff --git a/arch/arm/src/stm32f0l0g0/stm32_pwm.c b/arch/arm/src/stm32f0l0g0/stm32_pwm.c
index 02b21e98b14..b3af7e1c72e 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_pwm.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_pwm.c
@@ -56,8 +56,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_pwm.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_rcc.c b/arch/arm/src/stm32f0l0g0/stm32_rcc.c
index 6a4c0143149..1bb56e196cb 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_rcc.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_rcc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/stm32_flash.h"
 #include "stm32_rcc.h"
 #include "stm32_hsi48.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_rcc.h b/arch/arm/src/stm32f0l0g0/stm32_rcc.h
index 0ad59ae6216..47d042383a4 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_rcc.h
+++ b/arch/arm/src/stm32f0l0g0/stm32_rcc.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "hardware/stm32_rcc.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_rng.c b/arch/arm/src/stm32f0l0g0/stm32_rng.c
index 82c7e420f28..9f79d7a5347 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_rng.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_rng.c
@@ -35,7 +35,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "arm_arch.h"
 #include "hardware/stm32_rng.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c
index b440c310a02..cf32ab96e9b 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c
@@ -43,7 +43,6 @@
 #  include <termios.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c
index 60aad9578b8..8a8e00bc659 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c
@@ -43,9 +43,7 @@
 #  include <termios.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "hardware/stm32_pinmap.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_spi.c b/arch/arm/src/stm32f0l0g0/stm32_spi.c
index 6b3cbd6392c..dcfe07f8006 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_spi.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_spi.c
@@ -71,8 +71,6 @@
 #include <nuttx/power/pm.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_start.c b/arch/arm/src/stm32f0l0g0/stm32_start.c
index 705d6965332..3a242255e01 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_start.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_start.c
@@ -31,9 +31,7 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_rcc.h"
 #include "stm32_lowputc.h"
 #include "stm32_start.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_tim.c b/arch/arm/src/stm32f0l0g0/stm32_tim.c
index a2e081b73ef..6642ebaad87 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_tim.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_tim.c
@@ -53,8 +53,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c b/arch/arm/src/stm32f0l0g0/stm32_timerisr.c
index 17630f6e0dc..0a7d1aaefbe 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f0l0g0/stm32_usbdev.c b/arch/arm/src/stm32f0l0g0/stm32_usbdev.c
index 1999714a2c6..c5b522d2d3f 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_usbdev.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_usbdev.c
@@ -46,7 +46,6 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/stm32_rcc.h"
 #include "hardware/stm32_usbdev.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c b/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c
index 5f409ead9c0..254f888134a 100644
--- a/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c
+++ b/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c
@@ -30,7 +30,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "hardware/stm32_syscfg.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c b/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c
index d34160d25c4..9bc833bde82 100644
--- a/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c
+++ b/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 
 #if defined(CONFIG_STM32F0L0G0_PWR)
diff --git a/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c b/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c
index a7944158101..840653a8558 100644
--- a/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c
+++ b/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 
 #if defined(CONFIG_STM32F0L0G0_PWR)
diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c
index 0c766b31930..d6d4d8d89c9 100644
--- a/arch/arm/src/stm32f7/stm32_adc.c
+++ b/arch/arm/src/stm32f7/stm32_adc.c
@@ -47,8 +47,6 @@
 #include <nuttx/analog/ioctl.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_tim.h"
diff --git a/arch/arm/src/stm32f7/stm32_allocateheap.c b/arch/arm/src/stm32f7/stm32_allocateheap.c
index df9705b5cbc..94eab306053 100644
--- a/arch/arm/src/stm32f7/stm32_allocateheap.c
+++ b/arch/arm/src/stm32f7/stm32_allocateheap.c
@@ -39,9 +39,7 @@
 #include <arch/board/board.h>
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/stm32_memorymap.h"
 #include "stm32_mpuinit.h"
 #include "stm32_dtcm.h"
diff --git a/arch/arm/src/stm32f7/stm32_can.c b/arch/arm/src/stm32f7/stm32_can.c
index fb53cb44bcd..45b631f5cab 100644
--- a/arch/arm/src/stm32f7/stm32_can.c
+++ b/arch/arm/src/stm32f7/stm32_can.c
@@ -39,8 +39,6 @@
 #include <nuttx/can/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32f7/stm32_capture.c b/arch/arm/src/stm32f7/stm32_capture.c
index 7b17db99c27..c0a5e055082 100644
--- a/arch/arm/src/stm32f7/stm32_capture.c
+++ b/arch/arm/src/stm32f7/stm32_capture.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_gpio.h"
 #include "stm32_capture.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index 03969c64c9c..771d642d167 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -36,8 +36,6 @@
 #include <nuttx/semaphore.h>
 #include <arch/stm32f7/chip.h>
 
-#include "arm_arch.h"
-
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32f7/stm32_dma2d.c b/arch/arm/src/stm32f7/stm32_dma2d.c
index e6bc1eebb3c..7c0f8e20941 100644
--- a/arch/arm/src/stm32f7/stm32_dma2d.c
+++ b/arch/arm/src/stm32f7/stm32_dma2d.c
@@ -41,7 +41,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/stm32_ltdc.h"
 #include "hardware/stm32_dma2d.h"
diff --git a/arch/arm/src/stm32f7/stm32_dumpgpio.c b/arch/arm/src/stm32f7/stm32_dumpgpio.c
index 19b187950c8..bf14735c4b5 100644
--- a/arch/arm/src/stm32f7/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32f7/stm32_dumpgpio.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <arch/stm32f7/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32f7/stm32_exti_alarm.c b/arch/arm/src/stm32f7/stm32_exti_alarm.c
index 53de0bd3034..94efa91863b 100644
--- a/arch/arm/src/stm32f7/stm32_exti_alarm.c
+++ b/arch/arm/src/stm32f7/stm32_exti_alarm.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_exti_gpio.c b/arch/arm/src/stm32f7/stm32_exti_gpio.c
index 6fa9a87b5c5..92c374b32e4 100644
--- a/arch/arm/src/stm32f7/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32f7/stm32_exti_gpio.c
@@ -33,7 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32f7/stm32_exti_pwr.c b/arch/arm/src/stm32f7/stm32_exti_pwr.c
index 4f5a08e59e1..66f28d26b13 100644
--- a/arch/arm/src/stm32f7/stm32_exti_pwr.c
+++ b/arch/arm/src/stm32f7/stm32_exti_pwr.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32f7/stm32_exti_wakeup.c b/arch/arm/src/stm32f7/stm32_exti_wakeup.c
index 10e13301433..3f0bef21a35 100644
--- a/arch/arm/src/stm32f7/stm32_exti_wakeup.c
+++ b/arch/arm/src/stm32f7/stm32_exti_wakeup.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32f7/stm32_flash.c b/arch/arm/src/stm32f7/stm32_flash.c
index 7e5966dada5..efa82129aa1 100644
--- a/arch/arm/src/stm32f7/stm32_flash.c
+++ b/arch/arm/src/stm32f7/stm32_flash.c
@@ -61,7 +61,7 @@
 #include "barriers.h"
 
 #include "hardware/stm32_flash.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_fmc.c b/arch/arm/src/stm32f7/stm32_fmc.c
index c9855aec754..4a6e72fa959 100644
--- a/arch/arm/src/stm32f7/stm32_fmc.c
+++ b/arch/arm/src/stm32f7/stm32_fmc.c
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_fmc.h"
 #include "stm32_rcc.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_gpio.c b/arch/arm/src/stm32f7/stm32_gpio.c
index 162776b2de2..d310b7a18e9 100644
--- a/arch/arm/src/stm32f7/stm32_gpio.c
+++ b/arch/arm/src/stm32f7/stm32_gpio.c
@@ -33,7 +33,7 @@
 #include <nuttx/irq.h>
 #include <arch/stm32f7/chip.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/stm32_syscfg.h"
 #include "stm32_gpio.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index 00573864e1a..cac650088f2 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -254,8 +254,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index 1515fbe362b..7b98677c1e1 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -36,7 +36,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_STM32F7_GPIO_IRQ
diff --git a/arch/arm/src/stm32f7/stm32_lowputc.c b/arch/arm/src/stm32f7/stm32_lowputc.c
index ee1f67b7a0a..f8b7cf8e4ee 100644
--- a/arch/arm/src/stm32f7/stm32_lowputc.c
+++ b/arch/arm/src/stm32f7/stm32_lowputc.c
@@ -27,8 +27,6 @@
 #include <stdint.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "hardware/stm32_pinmap.h"
diff --git a/arch/arm/src/stm32f7/stm32_lse.c b/arch/arm/src/stm32f7/stm32_lse.c
index 7aaacf84e10..ad934a42ce1 100644
--- a/arch/arm/src/stm32f7/stm32_lse.c
+++ b/arch/arm/src/stm32f7/stm32_lse.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_lsi.c b/arch/arm/src/stm32f7/stm32_lsi.c
index a3905d4c070..a0b39a9efc2 100644
--- a/arch/arm/src/stm32f7/stm32_lsi.c
+++ b/arch/arm/src/stm32f7/stm32_lsi.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_ltdc.c b/arch/arm/src/stm32f7/stm32_ltdc.c
index 1ca8f91cbc6..890318689d2 100644
--- a/arch/arm/src/stm32f7/stm32_ltdc.c
+++ b/arch/arm/src/stm32f7/stm32_ltdc.c
@@ -41,7 +41,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/stm32_ltdc.h"
 #include "hardware/stm32_dma2d.h"
diff --git a/arch/arm/src/stm32f7/stm32_otgdev.c b/arch/arm/src/stm32f7/stm32_otgdev.c
index 7884d1fda1b..f503feb1455 100644
--- a/arch/arm/src/stm32f7/stm32_otgdev.c
+++ b/arch/arm/src/stm32f7/stm32_otgdev.c
@@ -46,7 +46,6 @@
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32F7_OTGFS) || \
diff --git a/arch/arm/src/stm32f7/stm32_otghost.c b/arch/arm/src/stm32f7/stm32_otghost.c
index 4f91b55f698..e19fb9bbdad 100644
--- a/arch/arm/src/stm32f7/stm32_otghost.c
+++ b/arch/arm/src/stm32f7/stm32_otghost.c
@@ -49,9 +49,7 @@
 #include "chip.h"             /* Includes default GPIO settings */
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_otg.h"
 #include "stm32_usbhost.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_pmsleep.c b/arch/arm/src/stm32f7/stm32_pmsleep.c
index d5776a69b0d..509b7c42e79 100644
--- a/arch/arm/src/stm32f7/stm32_pmsleep.c
+++ b/arch/arm/src/stm32f7/stm32_pmsleep.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/arch/arm/src/stm32f7/stm32_pmstandby.c b/arch/arm/src/stm32f7/stm32_pmstandby.c
index e7b1872c131..f510d035d14 100644
--- a/arch/arm/src/stm32f7/stm32_pmstandby.c
+++ b/arch/arm/src/stm32f7/stm32_pmstandby.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
diff --git a/arch/arm/src/stm32f7/stm32_pmstop.c b/arch/arm/src/stm32f7/stm32_pmstop.c
index 88f77bdfd8e..24b1ac569b1 100644
--- a/arch/arm/src/stm32f7/stm32_pmstop.c
+++ b/arch/arm/src/stm32f7/stm32_pmstop.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/arch/arm/src/stm32f7/stm32_pwm.c b/arch/arm/src/stm32f7/stm32_pwm.c
index 436ff5ba7a3..c52270e4d1f 100644
--- a/arch/arm/src/stm32f7/stm32_pwm.c
+++ b/arch/arm/src/stm32f7/stm32_pwm.c
@@ -35,8 +35,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_rcc.h"
 #include "chip.h"
 #include "stm32_pwm.h"
diff --git a/arch/arm/src/stm32f7/stm32_pwr.c b/arch/arm/src/stm32f7/stm32_pwr.c
index 0579e205b79..83b5ecb8eb7 100644
--- a/arch/arm/src/stm32f7/stm32_pwr.c
+++ b/arch/arm/src/stm32f7/stm32_pwr.c
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 
 #if defined(CONFIG_STM32F7_PWR)
diff --git a/arch/arm/src/stm32f7/stm32_qencoder.c b/arch/arm/src/stm32f7/stm32_qencoder.c
index b4a07e56e37..c6949693ace 100644
--- a/arch/arm/src/stm32f7/stm32_qencoder.c
+++ b/arch/arm/src/stm32f7/stm32_qencoder.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c
index 129e8a85a4a..473896c5974 100644
--- a/arch/arm/src/stm32f7/stm32_qspi.c
+++ b/arch/arm/src/stm32f7/stm32_qspi.c
@@ -46,7 +46,6 @@
 #include <nuttx/spi/qspi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "barriers.h"
 
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32f7/stm32_rcc.c b/arch/arm/src/stm32f7/stm32_rcc.c
index 1fef26c3b79..3605bb6327e 100644
--- a/arch/arm/src/stm32f7/stm32_rcc.c
+++ b/arch/arm/src/stm32f7/stm32_rcc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/stm32_flash.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32f7/stm32_rcc.h b/arch/arm/src/stm32f7/stm32_rcc.h
index 3d9e2d68e89..ae960de3c77 100644
--- a/arch/arm/src/stm32f7/stm32_rcc.h
+++ b/arch/arm/src/stm32f7/stm32_rcc.h
@@ -27,8 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/stm32_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_rng.c b/arch/arm/src/stm32f7/stm32_rng.c
index 302cfc49021..975441affba 100644
--- a/arch/arm/src/stm32f7/stm32_rng.c
+++ b/arch/arm/src/stm32f7/stm32_rng.c
@@ -35,7 +35,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "arm_arch.h"
 #include "hardware/stm32_rng.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c
index 6ec1cb56bef..868631b13a2 100644
--- a/arch/arm/src/stm32f7/stm32_rtc.c
+++ b/arch/arm/src/stm32f7/stm32_rtc.c
@@ -34,8 +34,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/time.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
index f78db23167d..b3e441d80a8 100644
--- a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
@@ -33,8 +33,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_rtc.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_sai.c b/arch/arm/src/stm32f7/stm32_sai.c
index 15a39a53dd0..07370c85f3e 100644
--- a/arch/arm/src/stm32f7/stm32_sai.c
+++ b/arch/arm/src/stm32f7/stm32_sai.c
@@ -59,8 +59,7 @@
 #include <nuttx/audio/i2s.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_dma.h"
 #include "stm32_gpio.h"
 #include "stm32_sai.h"
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index d83eb2dc2fa..7237a8d347e 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -44,8 +44,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_dtcm.h"
 #include "stm32_dma.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c
index ba0a0cd405e..1b9d9b27f2f 100644
--- a/arch/arm/src/stm32f7/stm32_serial.c
+++ b/arch/arm/src/stm32f7/stm32_serial.c
@@ -43,9 +43,7 @@
 #  include <termios.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "hardware/stm32_pinmap.h"
diff --git a/arch/arm/src/stm32f7/stm32_spi.c b/arch/arm/src/stm32f7/stm32_spi.c
index ce373fdc9b4..37dc67da809 100644
--- a/arch/arm/src/stm32f7/stm32_spi.c
+++ b/arch/arm/src/stm32f7/stm32_spi.c
@@ -66,8 +66,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32f7/stm32_start.c b/arch/arm/src/stm32f7/stm32_start.c
index ab30641c3ab..159e2d2eca9 100644
--- a/arch/arm/src/stm32f7/stm32_start.c
+++ b/arch/arm/src/stm32f7/stm32_start.c
@@ -32,7 +32,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 #include "mpu.h"
diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c
index 8e127788f60..31f0c097b69 100644
--- a/arch/arm/src/stm32f7/stm32_tickless.c
+++ b/arch/arm/src/stm32f7/stm32_tickless.c
@@ -89,8 +89,7 @@
 #include <nuttx/arch.h>
 #include <debug.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_tim.h"
 #include "stm32_dbgmcu.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_tim.c b/arch/arm/src/stm32f7/stm32_tim.c
index 4016e7a4484..ed89ce5ed4b 100644
--- a/arch/arm/src/stm32f7/stm32_tim.c
+++ b/arch/arm/src/stm32f7/stm32_tim.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_timerisr.c b/arch/arm/src/stm32f7/stm32_timerisr.c
index 7e56262a8cd..8c70d1c3c24 100644
--- a/arch/arm/src/stm32f7/stm32_timerisr.c
+++ b/arch/arm/src/stm32f7/stm32_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32h7/stm32_allocateheap.c b/arch/arm/src/stm32h7/stm32_allocateheap.c
index 25197501316..af82e0ce343 100644
--- a/arch/arm/src/stm32h7/stm32_allocateheap.c
+++ b/arch/arm/src/stm32h7/stm32_allocateheap.c
@@ -41,9 +41,7 @@
 #include <arch/board/board.h>
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/stm32_memorymap.h"
 #include "stm32_mpuinit.h"
 #include "stm32_dtcm.h"
diff --git a/arch/arm/src/stm32h7/stm32_dma.c b/arch/arm/src/stm32h7/stm32_dma.c
index e2cf7912181..fcabd0593df 100644
--- a/arch/arm/src/stm32h7/stm32_dma.c
+++ b/arch/arm/src/stm32h7/stm32_dma.c
@@ -35,8 +35,6 @@
 #include <nuttx/arch.h>
 #include <arch/stm32h7/chip.h>
 
-#include "arm_arch.h"
-
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "stm32_dma.h"
diff --git a/arch/arm/src/stm32h7/stm32_exti_alarm.c b/arch/arm/src/stm32h7/stm32_exti_alarm.c
index a4ed9ff808e..4e9824e6923 100644
--- a/arch/arm/src/stm32h7/stm32_exti_alarm.c
+++ b/arch/arm/src/stm32h7/stm32_exti_alarm.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_exti_gpio.c b/arch/arm/src/stm32h7/stm32_exti_gpio.c
index 0c02f9da8be..6e0ccc79b06 100644
--- a/arch/arm/src/stm32h7/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32h7/stm32_exti_gpio.c
@@ -33,7 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32h7/stm32_exti_wakeup.c b/arch/arm/src/stm32h7/stm32_exti_wakeup.c
index 81a28f9d63c..5fd102e77f6 100644
--- a/arch/arm/src/stm32h7/stm32_exti_wakeup.c
+++ b/arch/arm/src/stm32h7/stm32_exti_wakeup.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32h7/stm32_flash.c b/arch/arm/src/stm32h7/stm32_flash.c
index b35f0e04558..28ea69f8828 100644
--- a/arch/arm/src/stm32h7/stm32_flash.c
+++ b/arch/arm/src/stm32h7/stm32_flash.c
@@ -67,7 +67,7 @@
 #include "barriers.h"
 
 #include "hardware/stm32_flash.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32_gpio.c b/arch/arm/src/stm32h7/stm32_gpio.c
index cf5180a8c83..09c2a6e7f17 100644
--- a/arch/arm/src/stm32h7/stm32_gpio.c
+++ b/arch/arm/src/stm32h7/stm32_gpio.c
@@ -33,8 +33,7 @@
 #include <nuttx/irq.h>
 #include <arch/stm32h7/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/stm32_syscfg.h"
 #include "stm32_gpio.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_i2c.c b/arch/arm/src/stm32h7/stm32_i2c.c
index 3e5b40f6a6f..2d19d4c8a02 100644
--- a/arch/arm/src/stm32h7/stm32_i2c.c
+++ b/arch/arm/src/stm32h7/stm32_i2c.c
@@ -224,8 +224,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c
index c4edc414f49..a4cae3dd135 100644
--- a/arch/arm/src/stm32h7/stm32_irq.c
+++ b/arch/arm/src/stm32h7/stm32_irq.c
@@ -36,7 +36,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_STM32H7_GPIO_IRQ
diff --git a/arch/arm/src/stm32h7/stm32_iwdg.c b/arch/arm/src/stm32h7/stm32_iwdg.c
index 859c346188f..0e953376e20 100644
--- a/arch/arm/src/stm32h7/stm32_iwdg.c
+++ b/arch/arm/src/stm32h7/stm32_iwdg.c
@@ -35,7 +35,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_wdg.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_lowputc.c b/arch/arm/src/stm32h7/stm32_lowputc.c
index 61a983fed30..f00c7a6ac54 100644
--- a/arch/arm/src/stm32h7/stm32_lowputc.c
+++ b/arch/arm/src/stm32h7/stm32_lowputc.c
@@ -27,8 +27,6 @@
 #include <stdint.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "hardware/stm32_pinmap.h"
diff --git a/arch/arm/src/stm32h7/stm32_lptim.c b/arch/arm/src/stm32h7/stm32_lptim.c
index a00ae222765..5dd46162897 100644
--- a/arch/arm/src/stm32h7/stm32_lptim.c
+++ b/arch/arm/src/stm32h7/stm32_lptim.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_lptim.h"
diff --git a/arch/arm/src/stm32h7/stm32_lse.c b/arch/arm/src/stm32h7/stm32_lse.c
index 5c5ee68f6d5..0d9862d4d39 100644
--- a/arch/arm/src/stm32h7/stm32_lse.c
+++ b/arch/arm/src/stm32h7/stm32_lse.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 #include "stm32_dbgmcu.h"
diff --git a/arch/arm/src/stm32h7/stm32_lsi.c b/arch/arm/src/stm32h7/stm32_lsi.c
index 8db98fbbb04..2eb3fcc8bfe 100644
--- a/arch/arm/src/stm32h7/stm32_lsi.c
+++ b/arch/arm/src/stm32h7/stm32_lsi.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32h7/stm32_otgdev.c b/arch/arm/src/stm32h7/stm32_otgdev.c
index 44c413e5fad..c122d7bfd83 100644
--- a/arch/arm/src/stm32h7/stm32_otgdev.c
+++ b/arch/arm/src/stm32h7/stm32_otgdev.c
@@ -48,7 +48,6 @@
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32H7_OTGFS) || \
diff --git a/arch/arm/src/stm32h7/stm32_otghost.c b/arch/arm/src/stm32h7/stm32_otghost.c
index 12f3c8b3189..fcee622b157 100644
--- a/arch/arm/src/stm32h7/stm32_otghost.c
+++ b/arch/arm/src/stm32h7/stm32_otghost.c
@@ -50,9 +50,7 @@
 #include "chip.h"             /* Includes default GPIO settings */
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/stm32_pwr.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
diff --git a/arch/arm/src/stm32h7/stm32_pmsleep.c b/arch/arm/src/stm32h7/stm32_pmsleep.c
index 1d307bc80f8..f4465b4c230 100644
--- a/arch/arm/src/stm32h7/stm32_pmsleep.c
+++ b/arch/arm/src/stm32h7/stm32_pmsleep.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/arch/arm/src/stm32h7/stm32_pmstandby.c b/arch/arm/src/stm32h7/stm32_pmstandby.c
index ed9ab7034e2..01b3a543ffa 100644
--- a/arch/arm/src/stm32h7/stm32_pmstandby.c
+++ b/arch/arm/src/stm32h7/stm32_pmstandby.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
diff --git a/arch/arm/src/stm32h7/stm32_pmstop.c b/arch/arm/src/stm32h7/stm32_pmstop.c
index 63757ecc266..817b35f6160 100644
--- a/arch/arm/src/stm32h7/stm32_pmstop.c
+++ b/arch/arm/src/stm32h7/stm32_pmstop.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/arch/arm/src/stm32h7/stm32_pwm.c b/arch/arm/src/stm32h7/stm32_pwm.c
index e94bdfe900b..a3696978d0f 100644
--- a/arch/arm/src/stm32h7/stm32_pwm.c
+++ b/arch/arm/src/stm32h7/stm32_pwm.c
@@ -35,8 +35,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_pwm.h"
 #include "stm32.h"
diff --git a/arch/arm/src/stm32h7/stm32_pwr.c b/arch/arm/src/stm32h7/stm32_pwr.c
index 26a3786a8f2..0419c413be9 100644
--- a/arch/arm/src/stm32h7/stm32_pwr.c
+++ b/arch/arm/src/stm32h7/stm32_pwr.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 
 #include "barriers.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 #include "stm32_gpio.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_qencoder.c b/arch/arm/src/stm32h7/stm32_qencoder.c
index 5a97e03822e..ac93f240ead 100644
--- a/arch/arm/src/stm32h7/stm32_qencoder.c
+++ b/arch/arm/src/stm32h7/stm32_qencoder.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
 #include "stm32_qencoder.h"
diff --git a/arch/arm/src/stm32h7/stm32_qspi.c b/arch/arm/src/stm32h7/stm32_qspi.c
index 0d9cd01ddc1..db08782c064 100644
--- a/arch/arm/src/stm32h7/stm32_qspi.c
+++ b/arch/arm/src/stm32h7/stm32_qspi.c
@@ -46,7 +46,6 @@
 #include <nuttx/spi/qspi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "barriers.h"
 
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32h7/stm32_rcc.c b/arch/arm/src/stm32h7/stm32_rcc.c
index de24be81e0e..cd6574246e4 100644
--- a/arch/arm/src/stm32h7/stm32_rcc.c
+++ b/arch/arm/src/stm32h7/stm32_rcc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/stm32_flash.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32h7/stm32_rcc.h b/arch/arm/src/stm32h7/stm32_rcc.h
index 00972c64e95..678f0c3b180 100644
--- a/arch/arm/src/stm32h7/stm32_rcc.h
+++ b/arch/arm/src/stm32h7/stm32_rcc.h
@@ -27,8 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/stm32_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32h7/stm32_rtc.c b/arch/arm/src/stm32h7/stm32_rtc.c
index 63b52413496..7712aaf6c2f 100644
--- a/arch/arm/src/stm32h7/stm32_rtc.c
+++ b/arch/arm/src/stm32h7/stm32_rtc.c
@@ -34,8 +34,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/time.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c
index 4166c958428..95450eef7a1 100644
--- a/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c
@@ -33,8 +33,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_rtc.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c
index 6cba0b5b531..1f81d5605ad 100644
--- a/arch/arm/src/stm32h7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32h7/stm32_sdmmc.c
@@ -46,8 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_dtcm.h"
 #include "stm32_dma.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32h7/stm32_serial.c b/arch/arm/src/stm32h7/stm32_serial.c
index c25b3194ea8..cf368c59c6d 100644
--- a/arch/arm/src/stm32h7/stm32_serial.c
+++ b/arch/arm/src/stm32h7/stm32_serial.c
@@ -44,9 +44,7 @@
 #  include <termios.h>
 #endif
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "hardware/stm32_pinmap.h"
diff --git a/arch/arm/src/stm32h7/stm32_spi.c b/arch/arm/src/stm32h7/stm32_spi.c
index e67fa5c38e6..b9f4d2d1e0c 100644
--- a/arch/arm/src/stm32h7/stm32_spi.c
+++ b/arch/arm/src/stm32h7/stm32_spi.c
@@ -67,8 +67,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32h7/stm32_spi_slave.c b/arch/arm/src/stm32h7/stm32_spi_slave.c
index f21370b4ad8..1a5b3c3fe90 100644
--- a/arch/arm/src/stm32h7/stm32_spi_slave.c
+++ b/arch/arm/src/stm32h7/stm32_spi_slave.c
@@ -44,8 +44,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32h7/stm32_start.c b/arch/arm/src/stm32h7/stm32_start.c
index b1c1535ae82..a8732f7eda9 100644
--- a/arch/arm/src/stm32h7/stm32_start.c
+++ b/arch/arm/src/stm32h7/stm32_start.c
@@ -32,7 +32,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "barriers.h"
 #include "nvic.h"
diff --git a/arch/arm/src/stm32h7/stm32_tim.c b/arch/arm/src/stm32h7/stm32_tim.c
index aec9c46e2a2..50765c25c73 100644
--- a/arch/arm/src/stm32h7/stm32_tim.c
+++ b/arch/arm/src/stm32h7/stm32_tim.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
diff --git a/arch/arm/src/stm32h7/stm32_timerisr.c b/arch/arm/src/stm32h7/stm32_timerisr.c
index 19b41d86645..2bfac34d0dd 100644
--- a/arch/arm/src/stm32h7/stm32_timerisr.c
+++ b/arch/arm/src/stm32h7/stm32_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32h7/stm32_wwdg.c b/arch/arm/src/stm32h7/stm32_wwdg.c
index ea7155fc1dc..498436dcdb5 100644
--- a/arch/arm/src/stm32h7/stm32_wwdg.c
+++ b/arch/arm/src/stm32h7/stm32_wwdg.c
@@ -34,7 +34,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_wdg.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_STM32H7_WWDG)
diff --git a/arch/arm/src/stm32l4/stm32l4_1wire.c b/arch/arm/src/stm32l4/stm32l4_1wire.c
index d52ea8385bd..d1bb30d3f74 100644
--- a/arch/arm/src/stm32l4/stm32l4_1wire.c
+++ b/arch/arm/src/stm32l4/stm32l4_1wire.c
@@ -48,8 +48,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l4_rcc.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_1wire.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_allocateheap.c b/arch/arm/src/stm32l4/stm32l4_allocateheap.c
index 022295156db..fb01c4c11e1 100644
--- a/arch/arm/src/stm32l4/stm32l4_allocateheap.c
+++ b/arch/arm/src/stm32l4/stm32l4_allocateheap.c
@@ -38,7 +38,6 @@
 
 #include "chip.h"
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4_mpuinit.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index c78c1de799d..ff72681c87b 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -38,8 +38,6 @@
 #include <nuttx/can/can.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l4.h"
 #include "stm32l4_can.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_comp.c b/arch/arm/src/stm32l4/stm32l4_comp.c
index 3932efb01b1..eaa82a913bf 100644
--- a/arch/arm/src/stm32l4/stm32l4_comp.c
+++ b/arch/arm/src/stm32l4/stm32l4_comp.c
@@ -51,7 +51,7 @@
 #include "stm32l4_comp.h"
 #include "stm32l4_exti.h"
 #include "stm32l4_gpio.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <errno.h>
 
diff --git a/arch/arm/src/stm32l4/stm32l4_dac.c b/arch/arm/src/stm32l4/stm32l4_dac.c
index 07abc3cfad4..9a57ebea4a9 100644
--- a/arch/arm/src/stm32l4/stm32l4_dac.c
+++ b/arch/arm/src/stm32l4/stm32l4_dac.c
@@ -37,8 +37,6 @@
 #include <nuttx/analog/dac.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l4.h"
 #include "stm32l4_dac.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_dumpgpio.c b/arch/arm/src/stm32l4/stm32l4_dumpgpio.c
index adb62ec42ce..4a4169afffd 100644
--- a/arch/arm/src/stm32l4/stm32l4_dumpgpio.c
+++ b/arch/arm/src/stm32l4/stm32l4_dumpgpio.c
@@ -35,7 +35,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_rcc.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_alarm.c b/arch/arm/src/stm32l4/stm32l4_exti_alarm.c
index 834e9394f0b..ff8ec75ac44 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_alarm.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_alarm.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_exti.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_comp.c b/arch/arm/src/stm32l4/stm32l4_exti_comp.c
index 36226834b13..d5c3c8ef3c1 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_comp.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_comp.c
@@ -42,7 +42,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_comp.h"
 #include "stm32l4_exti.h"
 #include "hardware/stm32l4_exti.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
index b6492deeaf1..76992a948d6 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
@@ -33,7 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_exti.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_pwr.c b/arch/arm/src/stm32l4/stm32l4_exti_pwr.c
index 59f17e3a17a..2e464a33d38 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_pwr.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_pwr.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_exti.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c b/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c
index f50b794b766..30c26555993 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c
@@ -32,7 +32,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_exti.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_firewall.c b/arch/arm/src/stm32l4/stm32l4_firewall.c
index d3254a931cd..3e7dc8786f5 100644
--- a/arch/arm/src/stm32l4/stm32l4_firewall.c
+++ b/arch/arm/src/stm32l4/stm32l4_firewall.c
@@ -28,7 +28,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/stm32l4_syscfg.h"
 
 #include "stm32l4_firewall.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_flash.c b/arch/arm/src/stm32l4/stm32l4_flash.c
index 25cd420b605..555021d893d 100644
--- a/arch/arm/src/stm32l4/stm32l4_flash.c
+++ b/arch/arm/src/stm32l4/stm32l4_flash.c
@@ -45,8 +45,7 @@
 #include "stm32l4_rcc.h"
 #include "stm32l4_waste.h"
 #include "stm32l4_flash.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #if !(defined(CONFIG_STM32L4_STM32L4X3) || defined(CONFIG_STM32L4_STM32L4X5) || \
       defined(CONFIG_STM32L4_STM32L4X6) || defined(CONFIG_STM32L4_STM32L4XR))
diff --git a/arch/arm/src/stm32l4/stm32l4_gpio.c b/arch/arm/src/stm32l4/stm32l4_gpio.c
index 87272b9cacf..3b8b2541e5f 100644
--- a/arch/arm/src/stm32l4/stm32l4_gpio.c
+++ b/arch/arm/src/stm32l4/stm32l4_gpio.c
@@ -33,8 +33,7 @@
 #include <arch/irq.h>
 #include <arch/stm32l4/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_hsi48.c b/arch/arm/src/stm32l4/stm32l4_hsi48.c
index 58fc7cc2013..ebf33752f1c 100644
--- a/arch/arm/src/stm32l4/stm32l4_hsi48.c
+++ b/arch/arm/src/stm32l4/stm32l4_hsi48.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_rcc.h"
 #include "hardware/stm32l4_crs.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index 7e44ac24cc8..37a12d2b51c 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -281,8 +281,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_rcc.h"
 #include "stm32l4_i2c.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index 5e8997edcba..7a81e18a14e 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_iwdg.c b/arch/arm/src/stm32l4/stm32l4_iwdg.c
index 266ed39f6eb..c35a510c73a 100644
--- a/arch/arm/src/stm32l4/stm32l4_iwdg.c
+++ b/arch/arm/src/stm32l4/stm32l4_iwdg.c
@@ -35,7 +35,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_rcc.h"
 #include "stm32l4_dbgmcu.h"
 #include "stm32l4_wdg.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_lowputc.c b/arch/arm/src/stm32l4/stm32l4_lowputc.c
index b66da7a34a5..705d062cf41 100644
--- a/arch/arm/src/stm32l4/stm32l4_lowputc.c
+++ b/arch/arm/src/stm32l4/stm32l4_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "stm32l4.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_lse.c b/arch/arm/src/stm32l4/stm32l4_lse.c
index 6d73202a9b6..05290066ecc 100644
--- a/arch/arm/src/stm32l4/stm32l4_lse.c
+++ b/arch/arm/src/stm32l4/stm32l4_lse.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l4_pwr.h"
 #include "stm32l4_rcc.h"
 #include "stm32l4_waste.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_lsi.c b/arch/arm/src/stm32l4/stm32l4_lsi.c
index b10398f8e3c..167a4af47ad 100644
--- a/arch/arm/src/stm32l4/stm32l4_lsi.c
+++ b/arch/arm/src/stm32l4/stm32l4_lsi.c
@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
index 89b98923ac3..640509fc9a6 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
@@ -43,9 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32l4_otgfs.h"
 #include "stm32l4_pwr.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
index 088b34502f5..d5376e2ac03 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
@@ -49,9 +49,7 @@
 #include "chip.h"             /* Includes default GPIO settings */
 #include <arch/board/board.h> /* May redefine GPIO settings */
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32l4_usbhost.h"
 
 #if defined(CONFIG_USBHOST) && defined(CONFIG_STM32L4_OTGFS)
diff --git a/arch/arm/src/stm32l4/stm32l4_pmlpr.c b/arch/arm/src/stm32l4/stm32l4_pmlpr.c
index ff945077a2b..99d71584415 100644
--- a/arch/arm/src/stm32l4/stm32l4_pmlpr.c
+++ b/arch/arm/src/stm32l4/stm32l4_pmlpr.c
@@ -42,7 +42,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32l4_pwr.h"
 #include "stm32l4_pm.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_pmsleep.c b/arch/arm/src/stm32l4/stm32l4_pmsleep.c
index 7e448a9fa97..7885bdc8737 100644
--- a/arch/arm/src/stm32l4/stm32l4_pmsleep.c
+++ b/arch/arm/src/stm32l4/stm32l4_pmsleep.c
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32l4_pwr.h"
 #include "stm32l4_pm.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_pmstandby.c b/arch/arm/src/stm32l4/stm32l4_pmstandby.c
index 7b717bf2eb4..113227af2bc 100644
--- a/arch/arm/src/stm32l4/stm32l4_pmstandby.c
+++ b/arch/arm/src/stm32l4/stm32l4_pmstandby.c
@@ -42,7 +42,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32l4_pwr.h"
 #include "stm32l4_pm.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_pmstop.c b/arch/arm/src/stm32l4/stm32l4_pmstop.c
index f17b008c5c0..5b06770ff17 100644
--- a/arch/arm/src/stm32l4/stm32l4_pmstop.c
+++ b/arch/arm/src/stm32l4/stm32l4_pmstop.c
@@ -42,7 +42,7 @@
 
 #include <stdbool.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32l4_pwr.h"
 #include "stm32l4_pm.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
index 4209effeab2..d44d3831ae1 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -36,8 +36,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l4_pwm.h"
 #include "stm32l4.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_pwr.c b/arch/arm/src/stm32l4/stm32l4_pwr.c
index 71a3ad7afa6..674790cc09d 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwr.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwr.c
@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_pwr.h"
 #include "stm32l4_rcc.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_qencoder.c b/arch/arm/src/stm32l4/stm32l4_qencoder.c
index 30b16347511..77fd52d9f81 100644
--- a/arch/arm/src/stm32l4/stm32l4_qencoder.c
+++ b/arch/arm/src/stm32l4/stm32l4_qencoder.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32l4.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_tim.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 0c3128193d8..706c5108805 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -44,7 +44,6 @@
 #include <nuttx/spi/qspi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "barriers.h"
 
 #include "stm32l4_gpio.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_rcc.c b/arch/arm/src/stm32l4/stm32l4_rcc.c
index 2ee735fe335..f00882afc1c 100644
--- a/arch/arm/src/stm32l4/stm32l4_rcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rcc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l4_rcc.h"
 #include "stm32l4_flash.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_rcc.h b/arch/arm/src/stm32l4/stm32l4_rcc.h
index e5e842c0ea2..405a919ff11 100644
--- a/arch/arm/src/stm32l4/stm32l4_rcc.h
+++ b/arch/arm/src/stm32l4/stm32l4_rcc.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #if defined(CONFIG_STM32L4_STM32L4X3)
diff --git a/arch/arm/src/stm32l4/stm32l4_rng.c b/arch/arm/src/stm32l4/stm32l4_rng.c
index f69d0266b29..30a2ca0e31e 100644
--- a/arch/arm/src/stm32l4/stm32l4_rng.c
+++ b/arch/arm/src/stm32l4/stm32l4_rng.c
@@ -35,7 +35,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "arm_arch.h"
 #include "hardware/stm32l4_rng.h"
 #include "arm_internal.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_rtc.c b/arch/arm/src/stm32l4/stm32l4_rtc.c
index 57ec9e1d6f3..4aab80b6028 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtc.c
@@ -38,8 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l4_rcc.h"
 #include "stm32l4_pwr.h"
 #include "stm32l4_exti.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
index 008da817da0..32c43865371 100644
--- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c
+++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
@@ -43,8 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l4_dma.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_sdmmc.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c b/arch/arm/src/stm32l4/stm32l4_serial.c
index 457329c294b..54bafba31eb 100644
--- a/arch/arm/src/stm32l4/stm32l4_serial.c
+++ b/arch/arm/src/stm32l4/stm32l4_serial.c
@@ -50,7 +50,6 @@
 #include "stm32l4_uart.h"
 #include "stm32l4_dma.h"
 #include "stm32l4_rcc.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index 5c8f1d874ae..593d67136de 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -70,8 +70,6 @@
 #include <nuttx/power/pm.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l4.h"
 #include "stm32l4_gpio.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_start.c b/arch/arm/src/stm32l4/stm32l4_start.c
index 2002cf0b605..400844ae8a1 100644
--- a/arch/arm/src/stm32l4/stm32l4_start.c
+++ b/arch/arm/src/stm32l4/stm32l4_start.c
@@ -31,7 +31,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_tim.c b/arch/arm/src/stm32l4/stm32l4_tim.c
index f6ca85ff76b..d3bb3a55bda 100644
--- a/arch/arm/src/stm32l4/stm32l4_tim.c
+++ b/arch/arm/src/stm32l4/stm32l4_tim.c
@@ -37,8 +37,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32l4.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_tim.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_timerisr.c b/arch/arm/src/stm32l4/stm32l4_timerisr.c
index 3a0dcc6af59..c1dc26c2dfc 100644
--- a/arch/arm/src/stm32l4/stm32l4_timerisr.c
+++ b/arch/arm/src/stm32l4/stm32l4_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l4.h"
 
diff --git a/arch/arm/src/stm32l4/stm32l4_usbdev.c b/arch/arm/src/stm32l4/stm32l4_usbdev.c
index 2934cf9f2c6..1844048da16 100644
--- a/arch/arm/src/stm32l4/stm32l4_usbdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_usbdev.c
@@ -41,7 +41,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_usbdev.h"
diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
index 62e8120dcbc..7d2b422b325 100644
--- a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
+++ b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
@@ -35,7 +35,6 @@
 #include <arch/irq.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/arm/src/stm32l4/stm32l4xrxx_dma.c b/arch/arm/src/stm32l4/stm32l4xrxx_dma.c
index 6b10fe50177..538ceccb438 100644
--- a/arch/arm/src/stm32l4/stm32l4xrxx_dma.c
+++ b/arch/arm/src/stm32l4/stm32l4xrxx_dma.c
@@ -35,8 +35,6 @@
 #include <nuttx/arch.h>
 #include <arch/stm32l4/chip.h>
 
-#include "arm_arch.h"
-
 #include "arm_internal.h"
 #include "sched/sched.h"
 #include "stm32l4_dma.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_allocateheap.c b/arch/arm/src/stm32l5/stm32l5_allocateheap.c
index 1f0851fb72a..7d253f7700b 100644
--- a/arch/arm/src/stm32l5/stm32l5_allocateheap.c
+++ b/arch/arm/src/stm32l5/stm32l5_allocateheap.c
@@ -38,7 +38,6 @@
 
 #include "chip.h"
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l5_mpuinit.h"
 
diff --git a/arch/arm/src/stm32l5/stm32l5_dumpgpio.c b/arch/arm/src/stm32l5/stm32l5_dumpgpio.c
index 7f3a1f2ba05..675ce10243b 100644
--- a/arch/arm/src/stm32l5/stm32l5_dumpgpio.c
+++ b/arch/arm/src/stm32l5/stm32l5_dumpgpio.c
@@ -35,7 +35,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l5_gpio.h"
 #include "stm32l5_rcc.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_exti_gpio.c b/arch/arm/src/stm32l5/stm32l5_exti_gpio.c
index 98b9f6a172f..dcb3da360b7 100644
--- a/arch/arm/src/stm32l5/stm32l5_exti_gpio.c
+++ b/arch/arm/src/stm32l5/stm32l5_exti_gpio.c
@@ -34,7 +34,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l5_gpio.h"
 #include "stm32l5_exti.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_flash.c b/arch/arm/src/stm32l5/stm32l5_flash.c
index 91aa0df3e8e..9bdd1c75911 100644
--- a/arch/arm/src/stm32l5/stm32l5_flash.c
+++ b/arch/arm/src/stm32l5/stm32l5_flash.c
@@ -44,8 +44,7 @@
 #include "stm32l5_rcc.h"
 #include "stm32l5_waste.h"
 #include "stm32l5_flash.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #if !(defined(CONFIG_STM32L5_STM32L562XX))
 #  error "Unrecognized STM32 chip"
diff --git a/arch/arm/src/stm32l5/stm32l5_gpio.c b/arch/arm/src/stm32l5/stm32l5_gpio.c
index 1053f32491a..85b8469a2c4 100644
--- a/arch/arm/src/stm32l5/stm32l5_gpio.c
+++ b/arch/arm/src/stm32l5/stm32l5_gpio.c
@@ -33,8 +33,7 @@
 #include <arch/irq.h>
 #include <arch/stm32l5/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l5_gpio.h"
 
diff --git a/arch/arm/src/stm32l5/stm32l5_irq.c b/arch/arm/src/stm32l5/stm32l5_irq.c
index b03f3ebe99c..ca543dad77c 100644
--- a/arch/arm/src/stm32l5/stm32l5_irq.c
+++ b/arch/arm/src/stm32l5/stm32l5_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l5.h"
 
diff --git a/arch/arm/src/stm32l5/stm32l5_lowputc.c b/arch/arm/src/stm32l5/stm32l5_lowputc.c
index 18be5e2f8ba..1f0ef09c13c 100644
--- a/arch/arm/src/stm32l5/stm32l5_lowputc.c
+++ b/arch/arm/src/stm32l5/stm32l5_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "stm32l5.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_lse.c b/arch/arm/src/stm32l5/stm32l5_lse.c
index 026afecf24d..ff754ba52e6 100644
--- a/arch/arm/src/stm32l5/stm32l5_lse.c
+++ b/arch/arm/src/stm32l5/stm32l5_lse.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l5_pwr.h"
 #include "stm32l5_rcc.h"
 #include "stm32l5_waste.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_lsi.c b/arch/arm/src/stm32l5/stm32l5_lsi.c
index 7da5d1ee7b6..c8541304192 100644
--- a/arch/arm/src/stm32l5/stm32l5_lsi.c
+++ b/arch/arm/src/stm32l5/stm32l5_lsi.c
@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l5_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32l5/stm32l5_pwr.c b/arch/arm/src/stm32l5/stm32l5_pwr.c
index 6d05fe50227..b9c49977905 100644
--- a/arch/arm/src/stm32l5/stm32l5_pwr.c
+++ b/arch/arm/src/stm32l5/stm32l5_pwr.c
@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l5_pwr.h"
 #include "stm32l5_rcc.h"
 
diff --git a/arch/arm/src/stm32l5/stm32l5_rcc.c b/arch/arm/src/stm32l5/stm32l5_rcc.c
index 5ab9ff7ba87..f214ba7770e 100644
--- a/arch/arm/src/stm32l5/stm32l5_rcc.c
+++ b/arch/arm/src/stm32l5/stm32l5_rcc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l5_rcc.h"
 #include "stm32l5_flash.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_rcc.h b/arch/arm/src/stm32l5/stm32l5_rcc.h
index b1ce5acbc20..f855535d10c 100644
--- a/arch/arm/src/stm32l5/stm32l5_rcc.h
+++ b/arch/arm/src/stm32l5/stm32l5_rcc.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #if defined(CONFIG_STM32L5_STM32L562XX)
diff --git a/arch/arm/src/stm32l5/stm32l5_serial.c b/arch/arm/src/stm32l5/stm32l5_serial.c
index c962f410bb7..ecf4a3da964 100644
--- a/arch/arm/src/stm32l5/stm32l5_serial.c
+++ b/arch/arm/src/stm32l5/stm32l5_serial.c
@@ -53,7 +53,6 @@
 #  include "stm32l5_dma.h"
 #endif
 #include "stm32l5_rcc.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32l5/stm32l5_spi.c b/arch/arm/src/stm32l5/stm32l5_spi.c
index adb251aa612..30978203247 100644
--- a/arch/arm/src/stm32l5/stm32l5_spi.c
+++ b/arch/arm/src/stm32l5/stm32l5_spi.c
@@ -71,8 +71,6 @@
 #include <nuttx/power/pm.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l5.h"
 #include "stm32l5_gpio.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_start.c b/arch/arm/src/stm32l5/stm32l5_start.c
index 8041bbd69fb..28d55790bb9 100644
--- a/arch/arm/src/stm32l5/stm32l5_start.c
+++ b/arch/arm/src/stm32l5/stm32l5_start.c
@@ -31,7 +31,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/stm32l5/stm32l5_tim.c b/arch/arm/src/stm32l5/stm32l5_tim.c
index c2379d90428..e6d8065f4bb 100644
--- a/arch/arm/src/stm32l5/stm32l5_tim.c
+++ b/arch/arm/src/stm32l5/stm32l5_tim.c
@@ -38,8 +38,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32l5.h"
 #include "stm32l5_gpio.h"
 #include "stm32l5_tim.h"
diff --git a/arch/arm/src/stm32l5/stm32l5_timerisr.c b/arch/arm/src/stm32l5/stm32l5_timerisr.c
index 9ba23db0cc9..28720a21d1a 100644
--- a/arch/arm/src/stm32l5/stm32l5_timerisr.c
+++ b/arch/arm/src/stm32l5/stm32l5_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32l5.h"
 
diff --git a/arch/arm/src/stm32u5/stm32_allocateheap.c b/arch/arm/src/stm32u5/stm32_allocateheap.c
index c034965eef5..0a6ec395784 100644
--- a/arch/arm/src/stm32u5/stm32_allocateheap.c
+++ b/arch/arm/src/stm32u5/stm32_allocateheap.c
@@ -38,7 +38,6 @@
 
 #include "chip.h"
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_mpuinit.h"
 
diff --git a/arch/arm/src/stm32u5/stm32_dumpgpio.c b/arch/arm/src/stm32u5/stm32_dumpgpio.c
index ab40be487eb..57aa7697ce5 100644
--- a/arch/arm/src/stm32u5/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32u5/stm32_dumpgpio.c
@@ -35,7 +35,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/arch/arm/src/stm32u5/stm32_exti_gpio.c b/arch/arm/src/stm32u5/stm32_exti_gpio.c
index 2ffe5255d15..cffde5a8c21 100644
--- a/arch/arm/src/stm32u5/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32u5/stm32_exti_gpio.c
@@ -34,7 +34,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
diff --git a/arch/arm/src/stm32u5/stm32_flash.c b/arch/arm/src/stm32u5/stm32_flash.c
index e29781ec274..a202f211918 100644
--- a/arch/arm/src/stm32u5/stm32_flash.c
+++ b/arch/arm/src/stm32u5/stm32_flash.c
@@ -44,8 +44,7 @@
 #include "stm32_rcc.h"
 #include "stm32_waste.h"
 #include "stm32_flash.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #if !(defined(CONFIG_STM32U5_STM32U585XX))
 #  error "Unrecognized STM32 chip"
diff --git a/arch/arm/src/stm32u5/stm32_gpio.c b/arch/arm/src/stm32u5/stm32_gpio.c
index 2b5fb6a2550..e7040378fed 100644
--- a/arch/arm/src/stm32u5/stm32_gpio.c
+++ b/arch/arm/src/stm32u5/stm32_gpio.c
@@ -33,8 +33,7 @@
 #include <arch/irq.h>
 #include <arch/stm32u5/chip.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 
diff --git a/arch/arm/src/stm32u5/stm32_irq.c b/arch/arm/src/stm32u5/stm32_irq.c
index 61579bd58cd..4d375b11d79 100644
--- a/arch/arm/src/stm32u5/stm32_irq.c
+++ b/arch/arm/src/stm32u5/stm32_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 
diff --git a/arch/arm/src/stm32u5/stm32_lowputc.c b/arch/arm/src/stm32u5/stm32_lowputc.c
index bc9278e1164..18e0dc44259 100644
--- a/arch/arm/src/stm32u5/stm32_lowputc.c
+++ b/arch/arm/src/stm32u5/stm32_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 #include "stm32.h"
diff --git a/arch/arm/src/stm32u5/stm32_lse.c b/arch/arm/src/stm32u5/stm32_lse.c
index 8afcebed84d..ed22eeae139 100644
--- a/arch/arm/src/stm32u5/stm32_lse.c
+++ b/arch/arm/src/stm32u5/stm32_lse.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 #include "stm32_rcc.h"
 #include "stm32_waste.h"
diff --git a/arch/arm/src/stm32u5/stm32_lsi.c b/arch/arm/src/stm32u5/stm32_lsi.c
index 071f1c283f4..4c83e505de1 100644
--- a/arch/arm/src/stm32u5/stm32_lsi.c
+++ b/arch/arm/src/stm32u5/stm32_lsi.c
@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_rcc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32u5/stm32_pwr.c b/arch/arm/src/stm32u5/stm32_pwr.c
index 4994b89e6aa..62ee3e1159b 100644
--- a/arch/arm/src/stm32u5/stm32_pwr.c
+++ b/arch/arm/src/stm32u5/stm32_pwr.c
@@ -30,7 +30,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwr.h"
 #include "stm32_rcc.h"
 
diff --git a/arch/arm/src/stm32u5/stm32_rcc.c b/arch/arm/src/stm32u5/stm32_rcc.c
index 184e68577d0..18fb91b391e 100644
--- a/arch/arm/src/stm32u5/stm32_rcc.c
+++ b/arch/arm/src/stm32u5/stm32_rcc.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_flash.h"
diff --git a/arch/arm/src/stm32u5/stm32_rcc.h b/arch/arm/src/stm32u5/stm32_rcc.h
index 0967817c028..253f0d05a06 100644
--- a/arch/arm/src/stm32u5/stm32_rcc.h
+++ b/arch/arm/src/stm32u5/stm32_rcc.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #if defined(CONFIG_STM32U5_STM32U585XX)
diff --git a/arch/arm/src/stm32u5/stm32_serial.c b/arch/arm/src/stm32u5/stm32_serial.c
index 91576fb3939..a2e0ff36611 100644
--- a/arch/arm/src/stm32u5/stm32_serial.c
+++ b/arch/arm/src/stm32u5/stm32_serial.c
@@ -53,7 +53,6 @@
 #  include "stm32_dma.h"
 #endif
 #include "stm32_rcc.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32u5/stm32_spi.c b/arch/arm/src/stm32u5/stm32_spi.c
index 353df2c0a22..79d65941cae 100644
--- a/arch/arm/src/stm32u5/stm32_spi.c
+++ b/arch/arm/src/stm32u5/stm32_spi.c
@@ -67,8 +67,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32u5/stm32_start.c b/arch/arm/src/stm32u5/stm32_start.c
index 67420ec9e17..3a91c9e467a 100644
--- a/arch/arm/src/stm32u5/stm32_start.c
+++ b/arch/arm/src/stm32u5/stm32_start.c
@@ -31,7 +31,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nvic.h"
 
diff --git a/arch/arm/src/stm32u5/stm32_tim.c b/arch/arm/src/stm32u5/stm32_tim.c
index 74965410eb7..90b4bc561c2 100644
--- a/arch/arm/src/stm32u5/stm32_tim.c
+++ b/arch/arm/src/stm32u5/stm32_tim.c
@@ -38,8 +38,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "stm32.h"
 #include "stm32_gpio.h"
 #include "stm32_tim.h"
diff --git a/arch/arm/src/stm32u5/stm32_timerisr.c b/arch/arm/src/stm32u5/stm32_timerisr.c
index a13f3920536..55585c6a1a1 100644
--- a/arch/arm/src/stm32u5/stm32_timerisr.c
+++ b/arch/arm/src/stm32u5/stm32_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c
index 5b23d78a935..9b8a98341d5 100644
--- a/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/arch/arm/src/str71x/str71x_decodeirq.c
@@ -34,7 +34,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_irq.c b/arch/arm/src/str71x/str71x_irq.c
index 8fee73dc878..fa2cee74c47 100644
--- a/arch/arm/src/str71x/str71x_irq.c
+++ b/arch/arm/src/str71x/str71x_irq.c
@@ -33,7 +33,6 @@
 
 #include "arm.h"
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "str71x.h"
 
diff --git a/arch/arm/src/str71x/str71x_lowputc.c b/arch/arm/src/str71x/str71x_lowputc.c
index 7242fa3107c..f9e8e2289ce 100644
--- a/arch/arm/src/str71x/str71x_lowputc.c
+++ b/arch/arm/src/str71x/str71x_lowputc.c
@@ -26,9 +26,7 @@
 #include <stdint.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "str71x.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_prccu.c b/arch/arm/src/str71x/str71x_prccu.c
index 76da0e13688..1fd08bcd4e5 100644
--- a/arch/arm/src/str71x/str71x_prccu.c
+++ b/arch/arm/src/str71x/str71x_prccu.c
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "str71x.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index 7f91160ea6c..1e694a5e0d9 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -38,9 +38,7 @@
 #include <nuttx/serial/serial.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "str71x.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_timerisr.c b/arch/arm/src/str71x/str71x_timerisr.c
index 0eb96ca1590..cb2ef4d4ad2 100644
--- a/arch/arm/src/str71x/str71x_timerisr.c
+++ b/arch/arm/src/str71x/str71x_timerisr.c
@@ -33,10 +33,8 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-
 #include "str71x.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_xti.c b/arch/arm/src/str71x/str71x_xti.c
index 5b1364a8153..8e1e5a099e6 100644
--- a/arch/arm/src/str71x/str71x_xti.c
+++ b/arch/arm/src/str71x/str71x_xti.c
@@ -34,7 +34,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "str71x.h"
 
diff --git a/arch/arm/src/tiva/cc13xx/cc13x0_rom.c b/arch/arm/src/tiva/cc13xx/cc13x0_rom.c
index 40ad9f28cd6..71f530dfe69 100644
--- a/arch/arm/src/tiva/cc13xx/cc13x0_rom.c
+++ b/arch/arm/src/tiva/cc13xx/cc13x0_rom.c
@@ -45,8 +45,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/tiva_adi2_refsys.h"
 #include "hardware/tiva_adi3_refsys.h"
 #include "hardware/tiva_adi4_aux.h"
diff --git a/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c b/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c
index fc83b8b77e3..0dce2a3cbaa 100644
--- a/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c
+++ b/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c
@@ -45,8 +45,7 @@
  ****************************************************************************/
 
 #include <stdint.h>
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/tiva_aux_sysif.h"
 #include "cc13xx/cc13x2_aux_sysif.h"
 
diff --git a/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c b/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c
index e7b4c7499f9..fdb742001e9 100644
--- a/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c
+++ b/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c
@@ -45,8 +45,7 @@
 
 #include <stdint.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/tiva_adi2_refsys.h"
 #include "hardware/tiva_adi3_refsys.h"
 #include "hardware/tiva_adi4_aux.h"
diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c b/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c
index bde6b9b771a..fcac27cd499 100644
--- a/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c
+++ b/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c
@@ -32,7 +32,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c b/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c
index 36251a551e5..da065636a33 100644
--- a/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c
+++ b/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c
@@ -34,9 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "irq/irq.h"
 
 #include "tiva_gpio.h"
diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c
index 48afc9138e3..ffd5bfb3f3d 100644
--- a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c
+++ b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c
@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/tiva_prcm.h"
 #include "cc13xx/cc13xx_prcm.h"
 
diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h
index 3355e993472..1adad523d0b 100644
--- a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h
+++ b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h
@@ -52,7 +52,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/tiva_prcm.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_start.c b/arch/arm/src/tiva/cc13xx/cc13xx_start.c
index f96824aa59a..f077e90693d 100644
--- a/arch/arm/src/tiva/cc13xx/cc13xx_start.c
+++ b/arch/arm/src/tiva/cc13xx/cc13xx_start.c
@@ -32,9 +32,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
 #include "tiva_lowputc.h"
diff --git a/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c b/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c
index 2feaae60406..833d0830710 100644
--- a/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c
+++ b/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c
@@ -31,7 +31,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "chip.h"
 #include "tiva_sysctrl.h"
diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h b/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h
index e9c2c5a24ff..f66df12f3c0 100644
--- a/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h
+++ b/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/tiva_sysctrl.h"
 
diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h b/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h
index 69261ff0894..4c2a0d513d4 100644
--- a/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h
+++ b/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/tiva_sysctrl.h"
 
diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c b/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c
index c4cf2385475..c2f80badfd4 100644
--- a/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c
+++ b/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c
@@ -35,9 +35,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-
 #include "arm_internal.h"
-#include "arm_arch.h"
 #include "irq/irq.h"
 
 #include "tiva_gpio.h"
diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_start.c b/arch/arm/src/tiva/common/lmxx_tm4c_start.c
index 1911260a718..716856ee6c5 100644
--- a/arch/arm/src/tiva/common/lmxx_tm4c_start.c
+++ b/arch/arm/src/tiva/common/lmxx_tm4c_start.c
@@ -32,9 +32,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "tiva_lowputc.h"
 #include "tiva_sysctrl.h"
 #include "tiva_userspace.h"
diff --git a/arch/arm/src/tiva/common/tiva_adclib.c b/arch/arm/src/tiva/common/tiva_adclib.c
index 2e0808c8b75..3ba066a8931 100644
--- a/arch/arm/src/tiva/common/tiva_adclib.c
+++ b/arch/arm/src/tiva/common/tiva_adclib.c
@@ -69,7 +69,6 @@
 #include <nuttx/analog/adc.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "tiva_adc.h"
diff --git a/arch/arm/src/tiva/common/tiva_adclow.c b/arch/arm/src/tiva/common/tiva_adclow.c
index e5c24ecbde9..c05a5656f44 100644
--- a/arch/arm/src/tiva/common/tiva_adclow.c
+++ b/arch/arm/src/tiva/common/tiva_adclow.c
@@ -80,7 +80,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "tiva_adc.h"
diff --git a/arch/arm/src/tiva/common/tiva_allocateheap.c b/arch/arm/src/tiva/common/tiva_allocateheap.c
index 8dbda588846..67f9211738d 100644
--- a/arch/arm/src/tiva/common/tiva_allocateheap.c
+++ b/arch/arm/src/tiva/common/tiva_allocateheap.c
@@ -36,7 +36,6 @@
 #include <arch/board/board.h>
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_mpuinit.h"
 
diff --git a/arch/arm/src/tiva/common/tiva_dumpgpio.c b/arch/arm/src/tiva/common/tiva_dumpgpio.c
index 6e9fa7cc85b..84c0946e42e 100644
--- a/arch/arm/src/tiva/common/tiva_dumpgpio.c
+++ b/arch/arm/src/tiva/common/tiva_dumpgpio.c
@@ -38,8 +38,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 
diff --git a/arch/arm/src/tiva/common/tiva_eeprom.c b/arch/arm/src/tiva/common/tiva_eeprom.c
index 16fadbce84e..ec087329d2d 100644
--- a/arch/arm/src/tiva/common/tiva_eeprom.c
+++ b/arch/arm/src/tiva/common/tiva_eeprom.c
@@ -30,7 +30,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/tiva_sysctrl.h"
 #include "tiva_eeprom.h"
diff --git a/arch/arm/src/tiva/common/tiva_flash.c b/arch/arm/src/tiva/common/tiva_flash.c
index e8087980ac7..e59e8c40d76 100644
--- a/arch/arm/src/tiva/common/tiva_flash.c
+++ b/arch/arm/src/tiva/common/tiva_flash.c
@@ -34,7 +34,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "tiva_flash.h"
diff --git a/arch/arm/src/tiva/common/tiva_hciuart.c b/arch/arm/src/tiva/common/tiva_hciuart.c
index 33b67088018..5529eba5910 100644
--- a/arch/arm/src/tiva/common/tiva_hciuart.c
+++ b/arch/arm/src/tiva/common/tiva_hciuart.c
@@ -40,9 +40,7 @@
 #include <nuttx/wireless/bluetooth/bt_uart.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "tiva_hciuart.h"
 #include "tiva_enablepwr.h"
diff --git a/arch/arm/src/tiva/common/tiva_i2c.c b/arch/arm/src/tiva/common/tiva_i2c.c
index 25a15c4134d..545ede4d4e8 100644
--- a/arch/arm/src/tiva/common/tiva_i2c.c
+++ b/arch/arm/src/tiva/common/tiva_i2c.c
@@ -42,8 +42,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
 #include "tiva_gpio.h"
diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c
index f8d86d317f6..a7b655c2995 100644
--- a/arch/arm/src/tiva/common/tiva_irq.c
+++ b/arch/arm/src/tiva/common/tiva_irq.c
@@ -35,9 +35,7 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "tiva_gpio.h"
 
diff --git a/arch/arm/src/tiva/common/tiva_lowputc.c b/arch/arm/src/tiva/common/tiva_lowputc.c
index 7499238ea65..fceb01945dc 100644
--- a/arch/arm/src/tiva/common/tiva_lowputc.c
+++ b/arch/arm/src/tiva/common/tiva_lowputc.c
@@ -28,9 +28,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
 #include "tiva_periphrdy.h"
diff --git a/arch/arm/src/tiva/common/tiva_pwm.c b/arch/arm/src/tiva/common/tiva_pwm.c
index bc32402f659..d7358a6234b 100644
--- a/arch/arm/src/tiva/common/tiva_pwm.c
+++ b/arch/arm/src/tiva/common/tiva_pwm.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/timers/pwm.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "tiva_pwm.h"
 #include "tiva_enablepwr.h"
diff --git a/arch/arm/src/tiva/common/tiva_qencoder.c b/arch/arm/src/tiva/common/tiva_qencoder.c
index f11be1a5707..b0079f73398 100644
--- a/arch/arm/src/tiva/common/tiva_qencoder.c
+++ b/arch/arm/src/tiva/common/tiva_qencoder.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/sensors/qencoder.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "tiva_qencoder.h"
 #include "tiva_enablepwr.h"
diff --git a/arch/arm/src/tiva/common/tiva_serial.c b/arch/arm/src/tiva/common/tiva_serial.c
index 65489a91e8c..3123df73392 100644
--- a/arch/arm/src/tiva/common/tiva_serial.c
+++ b/arch/arm/src/tiva/common/tiva_serial.c
@@ -41,9 +41,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "tiva_lowputc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/common/tiva_ssi.c b/arch/arm/src/tiva/common/tiva_ssi.c
index e497f6122e7..9f5c43a7549 100644
--- a/arch/arm/src/tiva/common/tiva_ssi.c
+++ b/arch/arm/src/tiva/common/tiva_ssi.c
@@ -40,8 +40,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
diff --git a/arch/arm/src/tiva/common/tiva_timerisr.c b/arch/arm/src/tiva/common/tiva_timerisr.c
index 2d7d4b292c1..2e3dbda6b68 100644
--- a/arch/arm/src/tiva/common/tiva_timerisr.c
+++ b/arch/arm/src/tiva/common/tiva_timerisr.c
@@ -33,8 +33,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/common/tiva_timerlib.c b/arch/arm/src/tiva/common/tiva_timerlib.c
index 379e0c3309c..5849620a547 100644
--- a/arch/arm/src/tiva/common/tiva_timerlib.c
+++ b/arch/arm/src/tiva/common/tiva_timerlib.c
@@ -35,7 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/tiva_sysctrl.h"
 #include "hardware/tiva_timer.h"
 
diff --git a/arch/arm/src/tiva/lm/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c
index 51121f8363a..b53691cde64 100644
--- a/arch/arm/src/tiva/lm/lm3s_ethernet.c
+++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c
@@ -50,8 +50,7 @@
 #endif
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "tiva_ethernet.h"
 #include "hardware/tiva_pinmap.h"
diff --git a/arch/arm/src/tiva/lm/lm3s_gpio.c b/arch/arm/src/tiva/lm/lm3s_gpio.c
index 0f356565fca..155058c338c 100644
--- a/arch/arm/src/tiva/lm/lm3s_gpio.c
+++ b/arch/arm/src/tiva/lm/lm3s_gpio.c
@@ -32,7 +32,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
 #include "tiva_gpio.h"
diff --git a/arch/arm/src/tiva/lm/lm4f_gpio.c b/arch/arm/src/tiva/lm/lm4f_gpio.c
index 1f8fe6786db..ae5bc112428 100644
--- a/arch/arm/src/tiva/lm/lm4f_gpio.c
+++ b/arch/arm/src/tiva/lm/lm4f_gpio.c
@@ -32,7 +32,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
 #include "tiva_gpio.h"
diff --git a/arch/arm/src/tiva/tiva_chipinfo.h b/arch/arm/src/tiva/tiva_chipinfo.h
index f908da2146e..fb90bd5a256 100644
--- a/arch/arm/src/tiva/tiva_chipinfo.h
+++ b/arch/arm/src/tiva/tiva_chipinfo.h
@@ -49,7 +49,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/tiva_fcfg1.h"
 
 /* Currently only applies to the CC13x0 and CC13x2 families */
diff --git a/arch/arm/src/tiva/tiva_periphrdy.h b/arch/arm/src/tiva/tiva_periphrdy.h
index 02d2d1685c5..7c01bebe3b8 100644
--- a/arch/arm/src/tiva/tiva_periphrdy.h
+++ b/arch/arm/src/tiva/tiva_periphrdy.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/tiva_sysctrl.h"
 
diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h
index b8032bb82f9..384c6ebe63e 100644
--- a/arch/arm/src/tiva/tiva_timer.h
+++ b/arch/arm/src/tiva/tiva_timer.h
@@ -32,7 +32,7 @@
 
 #include <arch/tiva/chip.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/tiva_timer.h"
 
diff --git a/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c b/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
index 6e25dcf40b3..885aa32e1b8 100644
--- a/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
+++ b/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c
@@ -31,7 +31,6 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "chip.h"
 #include "tiva_sysctrl.h"
diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
index a48815e6fd8..8567e3dd4b2 100644
--- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
@@ -54,7 +54,6 @@
 #endif
 
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "tiva_sysctrl.h"
diff --git a/arch/arm/src/tiva/tm4c/tm4c_gpio.c b/arch/arm/src/tiva/tm4c/tm4c_gpio.c
index 1bae1362e14..4236b206a29 100644
--- a/arch/arm/src/tiva/tm4c/tm4c_gpio.c
+++ b/arch/arm/src/tiva/tm4c/tm4c_gpio.c
@@ -32,7 +32,7 @@
 
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_enablepwr.h"
 #include "tiva_enableclks.h"
 #include "tiva_gpio.h"
diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c
index 3b1f1ec972c..c9e7958b373 100644
--- a/arch/arm/src/tms570/tms570_boot.c
+++ b/arch/arm/src/tms570/tms570_boot.c
@@ -57,7 +57,6 @@
 #include "fpu.h"
 #include "sctlr.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #include <nuttx/init.h>
 
diff --git a/arch/arm/src/tms570/tms570_clockconfig.c b/arch/arm/src/tms570/tms570_clockconfig.c
index 0b19f14c8c5..c79123b6aa8 100644
--- a/arch/arm/src/tms570/tms570_clockconfig.c
+++ b/arch/arm/src/tms570/tms570_clockconfig.c
@@ -48,8 +48,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/tms570_esm.h"
 #include "hardware/tms570_sys.h"
 #include "hardware/tms570_sys2.h"
diff --git a/arch/arm/src/tms570/tms570_esm.c b/arch/arm/src/tms570/tms570_esm.c
index 63a6c556582..aa62b959aa4 100644
--- a/arch/arm/src/tms570/tms570_esm.c
+++ b/arch/arm/src/tms570/tms570_esm.c
@@ -54,8 +54,6 @@
 #include <arch/irq.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/tms570_esm.h"
 #include "tms570_esm.h"
 
diff --git a/arch/arm/src/tms570/tms570_gio.c b/arch/arm/src/tms570/tms570_gio.c
index a1b05997002..f905cfe1254 100644
--- a/arch/arm/src/tms570/tms570_gio.c
+++ b/arch/arm/src/tms570/tms570_gio.c
@@ -34,8 +34,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/tms570_gio.h"
 #include "tms570_gio.h"
 
diff --git a/arch/arm/src/tms570/tms570_gioirq.c b/arch/arm/src/tms570/tms570_gioirq.c
index 4b86fbdee94..a8e848f4cdd 100644
--- a/arch/arm/src/tms570/tms570_gioirq.c
+++ b/arch/arm/src/tms570/tms570_gioirq.c
@@ -35,9 +35,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "tms570_gio.h"
 #include "hardware/tms570_gio.h"
 
diff --git a/arch/arm/src/tms570/tms570_irq.c b/arch/arm/src/tms570/tms570_irq.c
index 99c12da81ba..06f0fb8eee8 100644
--- a/arch/arm/src/tms570/tms570_irq.c
+++ b/arch/arm/src/tms570/tms570_irq.c
@@ -33,9 +33,7 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/tms570_vim.h"
 #include "tms570_gio.h"
 #include "tms570_esm.h"
diff --git a/arch/arm/src/tms570/tms570_lowputc.c b/arch/arm/src/tms570/tms570_lowputc.c
index 4da39da855d..1889c26f410 100644
--- a/arch/arm/src/tms570/tms570_lowputc.c
+++ b/arch/arm/src/tms570/tms570_lowputc.c
@@ -53,8 +53,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/tms570_sci.h"
 #include "hardware/tms570_iomm.h"
 #include "tms570_lowputc.h"
diff --git a/arch/arm/src/tms570/tms570_selftest.c b/arch/arm/src/tms570/tms570_selftest.c
index c2cf7a8c723..1d8c49a2596 100644
--- a/arch/arm/src/tms570/tms570_selftest.c
+++ b/arch/arm/src/tms570/tms570_selftest.c
@@ -50,8 +50,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "hardware/tms570_sys.h"
 #include "hardware/tms570_pbist.h"
 #include "tms570_selftest.h"
diff --git a/arch/arm/src/tms570/tms570_serial.c b/arch/arm/src/tms570/tms570_serial.c
index 7e3e4a4af13..551b96c4b1f 100644
--- a/arch/arm/src/tms570/tms570_serial.c
+++ b/arch/arm/src/tms570/tms570_serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/tms570_sci.h"
 #include "tms570_lowputc.h"
 
diff --git a/arch/arm/src/tms570/tms570_timerisr.c b/arch/arm/src/tms570/tms570_timerisr.c
index 8ecfe2bfd9a..e56f290cfc9 100644
--- a/arch/arm/src/tms570/tms570_timerisr.c
+++ b/arch/arm/src/tms570/tms570_timerisr.c
@@ -29,8 +29,6 @@
 #include <nuttx/arch.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "hardware/tms570_rti.h"
 
 #include <arch/board/board.h>
diff --git a/arch/arm/src/xmc4/xmc4_allocateheap.c b/arch/arm/src/xmc4/xmc4_allocateheap.c
index aad838e45e5..6bd71b087e5 100644
--- a/arch/arm/src/xmc4/xmc4_allocateheap.c
+++ b/arch/arm/src/xmc4/xmc4_allocateheap.c
@@ -36,7 +36,6 @@
 #include <arch/board/board.h>
 
 #include "mpu.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "xmc4_mpuinit.h"
 
diff --git a/arch/arm/src/xmc4/xmc4_clockconfig.c b/arch/arm/src/xmc4/xmc4_clockconfig.c
index f9d9f74c0dd..f802adf2130 100644
--- a/arch/arm/src/xmc4/xmc4_clockconfig.c
+++ b/arch/arm/src/xmc4/xmc4_clockconfig.c
@@ -55,7 +55,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/xmc4_scu.h"
 #include "xmc4_clockconfig.h"
 #include "hardware/xmc4_ports.h"
diff --git a/arch/arm/src/xmc4/xmc4_clockutils.c b/arch/arm/src/xmc4/xmc4_clockutils.c
index aaee07328ed..37bd65b99d1 100644
--- a/arch/arm/src/xmc4/xmc4_clockutils.c
+++ b/arch/arm/src/xmc4/xmc4_clockutils.c
@@ -55,7 +55,7 @@
 
 #include <nuttx/config.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/xmc4_scu.h"
 #include "xmc4_clockconfig.h"
 
diff --git a/arch/arm/src/xmc4/xmc4_clrpend.c b/arch/arm/src/xmc4/xmc4_clrpend.c
index 62cda3f43c8..2648663a9c9 100644
--- a/arch/arm/src/xmc4/xmc4_clrpend.c
+++ b/arch/arm/src/xmc4/xmc4_clrpend.c
@@ -27,7 +27,7 @@
 #include <arch/irq.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/xmc4/xmc4_gpio.c b/arch/arm/src/xmc4/xmc4_gpio.c
index cad8da63f5f..8b94e1ddd77 100644
--- a/arch/arm/src/xmc4/xmc4_gpio.c
+++ b/arch/arm/src/xmc4/xmc4_gpio.c
@@ -31,9 +31,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "hardware/xmc4_ports.h"
 #include "xmc4_gpio.h"
 
diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c
index 4295a675efb..d64106f02f2 100644
--- a/arch/arm/src/xmc4/xmc4_irq.c
+++ b/arch/arm/src/xmc4/xmc4_irq.c
@@ -35,7 +35,6 @@
 
 #include "nvic.h"
 #include "ram_vectors.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/xmc4/xmc4_lowputc.c b/arch/arm/src/xmc4/xmc4_lowputc.c
index 703f547b6af..e464f9068f2 100644
--- a/arch/arm/src/xmc4/xmc4_lowputc.c
+++ b/arch/arm/src/xmc4/xmc4_lowputc.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
 
 #include <assert.h>
 #include <debug.h>
diff --git a/arch/arm/src/xmc4/xmc4_serial.c b/arch/arm/src/xmc4/xmc4_serial.c
index 024b9fd2eee..7b8a17e5e66 100644
--- a/arch/arm/src/xmc4/xmc4_serial.c
+++ b/arch/arm/src/xmc4/xmc4_serial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "chip.h"
 #include "xmc4_config.h"
 #include "hardware/xmc4_usic.h"
diff --git a/arch/arm/src/xmc4/xmc4_spi.c b/arch/arm/src/xmc4/xmc4_spi.c
index b539f7e9558..cefc66ec1a6 100644
--- a/arch/arm/src/xmc4/xmc4_spi.c
+++ b/arch/arm/src/xmc4/xmc4_spi.c
@@ -44,8 +44,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "xmc4_gpio.h"
 #include "xmc4_spi.h"
diff --git a/arch/arm/src/xmc4/xmc4_start.c b/arch/arm/src/xmc4/xmc4_start.c
index 21682115e1d..11d3968e751 100644
--- a/arch/arm/src/xmc4/xmc4_start.c
+++ b/arch/arm/src/xmc4/xmc4_start.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/xmc4_flash.h"
 
diff --git a/arch/arm/src/xmc4/xmc4_timerisr.c b/arch/arm/src/xmc4/xmc4_timerisr.c
index a4adf4b6b43..c0861f507b6 100644
--- a/arch/arm/src/xmc4/xmc4_timerisr.c
+++ b/arch/arm/src/xmc4/xmc4_timerisr.c
@@ -34,8 +34,6 @@
 #include "nvic.h"
 #include "clock/clock.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/xmc4/xmc4_usic.c b/arch/arm/src/xmc4/xmc4_usic.c
index 30fee7f02a1..edf513fba23 100644
--- a/arch/arm/src/xmc4/xmc4_usic.c
+++ b/arch/arm/src/xmc4/xmc4_usic.c
@@ -60,7 +60,7 @@
 
 #include <arch/xmc4/chip.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/xmc4_usic.h"
 #include "hardware/xmc4_scu.h"
 #include "xmc4_clockconfig.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_clkinit.c b/arch/avr/src/at32uc3/at32uc3_clkinit.c
index cdcb74125ff..db62c3436c0 100644
--- a/arch/avr/src/at32uc3/at32uc3_clkinit.c
+++ b/arch/avr/src/at32uc3/at32uc3_clkinit.c
@@ -26,8 +26,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
-
 #include "at32uc3_config.h"
 #include "up_internal.h"
 #include "at32uc3.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_gpio.c b/arch/avr/src/at32uc3/at32uc3_gpio.c
index 49a4fcb01c1..7eaed32fe8f 100644
--- a/arch/avr/src/at32uc3/at32uc3_gpio.c
+++ b/arch/avr/src/at32uc3/at32uc3_gpio.c
@@ -31,7 +31,6 @@
 #include "up_internal.h"
 #include "at32uc3.h"
 
-#include "up_arch.h"
 #include "chip.h"
 #include "at32uc3_gpio.h"
 
diff --git a/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
index 9cfb0c2dc1a..0fcdb3a6205 100644
--- a/arch/avr/src/at32uc3/at32uc3_gpioirq.c
+++ b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
@@ -33,7 +33,7 @@
 
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 #include "irq/irq.h"
 #include "at32uc3.h"
 #include "at32uc3_gpio.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_irq.c b/arch/avr/src/at32uc3/at32uc3_irq.c
index 1324a063372..262421bf7e5 100644
--- a/arch/avr/src/at32uc3/at32uc3_irq.c
+++ b/arch/avr/src/at32uc3/at32uc3_irq.c
@@ -34,7 +34,6 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "at32uc3.h"
 
diff --git a/arch/avr/src/at32uc3/at32uc3_lowconsole.c b/arch/avr/src/at32uc3/at32uc3_lowconsole.c
index 3a969e342d4..b7fbf50d439 100644
--- a/arch/avr/src/at32uc3/at32uc3_lowconsole.c
+++ b/arch/avr/src/at32uc3/at32uc3_lowconsole.c
@@ -31,7 +31,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "at32uc3.h"
 #include "at32uc3_pm.h"
diff --git a/arch/avr/src/at32uc3/at32uc3_serial.c b/arch/avr/src/at32uc3/at32uc3_serial.c
index a7141196256..cf0007ff131 100644
--- a/arch/avr/src/at32uc3/at32uc3_serial.c
+++ b/arch/avr/src/at32uc3/at32uc3_serial.c
@@ -42,7 +42,6 @@
 #include "at32uc3_config.h"
 #include "chip.h"
 #include "at32uc3_usart.h"
-#include "up_arch.h"
 #include "up_internal.h"
 #include "at32uc3.h"
 
diff --git a/arch/avr/src/at32uc3/at32uc3_timerisr.c b/arch/avr/src/at32uc3/at32uc3_timerisr.c
index 5fc56bc983b..f08c9fb83d3 100644
--- a/arch/avr/src/at32uc3/at32uc3_timerisr.c
+++ b/arch/avr/src/at32uc3/at32uc3_timerisr.c
@@ -29,8 +29,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
-
+#include "up_internal.h"
 #include "chip.h"
 #include "at32uc3.h"
 #include "at32uc3_pm.h"
diff --git a/arch/avr/src/at90usb/at90usb_lowconsole.c b/arch/avr/src/at90usb/at90usb_lowconsole.c
index 31c7ac462aa..d896f4e3c70 100644
--- a/arch/avr/src/at90usb/at90usb_lowconsole.c
+++ b/arch/avr/src/at90usb/at90usb_lowconsole.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 #include <avr/io.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "at90usb.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/at90usb/at90usb_serial.c b/arch/avr/src/at90usb/at90usb_serial.c
index 3c63556071e..4f9cdc9cba9 100644
--- a/arch/avr/src/at90usb/at90usb_serial.c
+++ b/arch/avr/src/at90usb/at90usb_serial.c
@@ -40,7 +40,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "at90usb.h"
 
diff --git a/arch/avr/src/at90usb/at90usb_timerisr.c b/arch/avr/src/at90usb/at90usb_timerisr.c
index eb12df3f045..5859d4c17e7 100644
--- a/arch/avr/src/at90usb/at90usb_timerisr.c
+++ b/arch/avr/src/at90usb/at90usb_timerisr.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 #include <avr/io.h>
 
-#include "up_arch.h"
-
+#include "up_internal.h"
 #include "at90usb.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/at90usb/at90usb_usbdev.c b/arch/avr/src/at90usb/at90usb_usbdev.c
index f40b42fef07..42239889c59 100644
--- a/arch/avr/src/at90usb/at90usb_usbdev.c
+++ b/arch/avr/src/at90usb/at90usb_usbdev.c
@@ -46,7 +46,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/atmega/atmega_lowconsole.c b/arch/avr/src/atmega/atmega_lowconsole.c
index 642ddcb8a83..36c7edc33a1 100644
--- a/arch/avr/src/atmega/atmega_lowconsole.c
+++ b/arch/avr/src/atmega/atmega_lowconsole.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 #include <avr/io.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "atmega.h"
 
diff --git a/arch/avr/src/atmega/atmega_serial.c b/arch/avr/src/atmega/atmega_serial.c
index e8ff7afb8ea..3f36b220763 100644
--- a/arch/avr/src/atmega/atmega_serial.c
+++ b/arch/avr/src/atmega/atmega_serial.c
@@ -40,7 +40,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "atmega.h"
 
diff --git a/arch/avr/src/atmega/atmega_timerisr.c b/arch/avr/src/atmega/atmega_timerisr.c
index 3b465824483..bc7e4f58b69 100644
--- a/arch/avr/src/atmega/atmega_timerisr.c
+++ b/arch/avr/src/atmega/atmega_timerisr.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 #include <avr/io.h>
 
-#include "up_arch.h"
-
+#include "up_internal.h"
 #include "atmega.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/avr/up_createstack.c b/arch/avr/src/avr/up_createstack.c
index 1f697bf8d56..24b83de6c64 100644
--- a/arch/avr/src/avr/up_createstack.c
+++ b/arch/avr/src/avr/up_createstack.c
@@ -38,7 +38,6 @@
 #include <nuttx/tls.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/avr/up_doirq.c b/arch/avr/src/avr/up_doirq.c
index 4156eaa875f..ce412ea1040 100644
--- a/arch/avr/src/avr/up_doirq.c
+++ b/arch/avr/src/avr/up_doirq.c
@@ -32,7 +32,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index 6688331e9b1..ff6a080cd24 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -34,7 +34,6 @@
 #include <nuttx/syslog/syslog.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/avr/src/avr/up_initialstate.c b/arch/avr/src/avr/up_initialstate.c
index 19d14f6e901..92f31b1c725 100644
--- a/arch/avr/src/avr/up_initialstate.c
+++ b/arch/avr/src/avr/up_initialstate.c
@@ -33,7 +33,6 @@
 #include <avr/io.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/avr/src/avr/up_irq.c b/arch/avr/src/avr/up_irq.c
index 121f2ee7f86..eb530dc0aea 100644
--- a/arch/avr/src/avr/up_irq.c
+++ b/arch/avr/src/avr/up_irq.c
@@ -33,7 +33,6 @@
 #include <arch/irq.h>
 #include <avr/io.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/avr/up_schedulesigaction.c b/arch/avr/src/avr/up_schedulesigaction.c
index a24aa8794e7..eced7aa732e 100644
--- a/arch/avr/src/avr/up_schedulesigaction.c
+++ b/arch/avr/src/avr/up_schedulesigaction.c
@@ -34,7 +34,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/avr/src/avr/up_sigdeliver.c b/arch/avr/src/avr/up_sigdeliver.c
index 9d34f3c4ccb..36d6c456e76 100644
--- a/arch/avr/src/avr/up_sigdeliver.c
+++ b/arch/avr/src/avr/up_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index 41cd0484c61..71478734595 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -42,8 +42,6 @@
 #include <avr/power.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
 #include "avr.h"
 
diff --git a/arch/avr/src/avr32/up_createstack.c b/arch/avr/src/avr32/up_createstack.c
index 0ab6201a302..3b7a7435f67 100644
--- a/arch/avr/src/avr32/up_createstack.c
+++ b/arch/avr/src/avr32/up_createstack.c
@@ -38,7 +38,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/avr32/up_doirq.c b/arch/avr/src/avr32/up_doirq.c
index 823254e0b51..39b2bcf3a01 100644
--- a/arch/avr/src/avr32/up_doirq.c
+++ b/arch/avr/src/avr32/up_doirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index 780933e5a93..1a03da96000 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -34,7 +34,6 @@
 #include <nuttx/syslog/syslog.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/avr/src/avr32/up_initialstate.c b/arch/avr/src/avr32/up_initialstate.c
index ee118ff2e06..f2555a5c014 100644
--- a/arch/avr/src/avr32/up_initialstate.c
+++ b/arch/avr/src/avr32/up_initialstate.c
@@ -31,7 +31,6 @@
 #include <nuttx/arch.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/avr/src/avr32/up_nommuhead.S b/arch/avr/src/avr32/up_nommuhead.S
index 82f1cd2d1cd..d8b0d0cdb5b 100644
--- a/arch/avr/src/avr32/up_nommuhead.S
+++ b/arch/avr/src/avr32/up_nommuhead.S
@@ -26,7 +26,6 @@
 #include <arch/avr32/avr32.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * External Symbols
diff --git a/arch/avr/src/avr32/up_schedulesigaction.c b/arch/avr/src/avr32/up_schedulesigaction.c
index 7a8227df5ae..6ca76e44fc1 100644
--- a/arch/avr/src/avr32/up_schedulesigaction.c
+++ b/arch/avr/src/avr32/up_schedulesigaction.c
@@ -34,7 +34,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/avr/src/avr32/up_sigdeliver.c b/arch/avr/src/avr32/up_sigdeliver.c
index 38bba235161..78aa0bc390f 100644
--- a/arch/avr/src/avr32/up_sigdeliver.c
+++ b/arch/avr/src/avr32/up_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/avr/src/common/up_allocateheap.c b/arch/avr/src/common/up_allocateheap.c
index 1b6c9d99dce..86fce5d5351 100644
--- a/arch/avr/src/common/up_allocateheap.c
+++ b/arch/avr/src/common/up_allocateheap.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/common/up_arch.h b/arch/avr/src/common/up_arch.h
deleted file mode 100644
index 01341896bd8..00000000000
--- a/arch/avr/src/common/up_arch.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- * arch/avr/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_AVR_SRC_COMMON_UP_ARCH_H
-#define __ARCH_AVR_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_AVR_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index bf3f4686c1c..2af547cca1a 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -37,7 +37,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index dbbf85c0327..77ed532f219 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h
index 6918f90cfd7..3812317f846 100644
--- a/arch/avr/src/common/up_internal.h
+++ b/arch/avr/src/common/up_internal.h
@@ -55,6 +55,13 @@
 #define INTSTACK_COLOR 's'
 #define HEAP_COLOR     'h'
 
+#define getreg8(a)     (*(volatile uint8_t *)(a))
+#define putreg8(v,a)   (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)    (*(volatile uint16_t *)(a))
+#define putreg16(v,a)  (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)    (*(volatile uint32_t *)(a))
+#define putreg32(v,a)  (*(volatile uint32_t *)(a) = (v))
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -106,6 +113,11 @@ extern uint32_t _ebss;            /* End+1 of .bss */
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
 
 /* Defined in files with the same name as the function */
 
diff --git a/arch/avr/src/common/up_modifyreg16.c b/arch/avr/src/common/up_modifyreg16.c
index ced9ea2895a..4044e619b3a 100644
--- a/arch/avr/src/common/up_modifyreg16.c
+++ b/arch/avr/src/common/up_modifyreg16.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/common/up_modifyreg32.c b/arch/avr/src/common/up_modifyreg32.c
index c8b4120a4a4..46fa49a7da2 100644
--- a/arch/avr/src/common/up_modifyreg32.c
+++ b/arch/avr/src/common/up_modifyreg32.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/common/up_modifyreg8.c b/arch/avr/src/common/up_modifyreg8.c
index ffeab284a8e..b2c9a7b76b9 100644
--- a/arch/avr/src/common/up_modifyreg8.c
+++ b/arch/avr/src/common/up_modifyreg8.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/ceva/src/common/up_arch.h b/arch/ceva/src/common/up_arch.h
deleted file mode 100644
index d168eab53d1..00000000000
--- a/arch/ceva/src/common/up_arch.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
- * arch/ceva/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_CEVA_SRC_COMMON_UP_ARCH_H
-#define __ARCH_CEVA_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_CEVA_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/ceva/src/common/up_heap.c b/arch/ceva/src/common/up_heap.c
index 33588bb7221..20c2fb39c30 100644
--- a/arch/ceva/src/common/up_heap.c
+++ b/arch/ceva/src/common/up_heap.c
@@ -31,7 +31,6 @@
 #include <nuttx/kmalloc.h>
 
 #include "mpu.h"
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/ceva/src/common/up_initialize.c b/arch/ceva/src/common/up_initialize.c
index 2974a43a1e3..7b5c4a5fc28 100644
--- a/arch/ceva/src/common/up_initialize.c
+++ b/arch/ceva/src/common/up_initialize.c
@@ -24,7 +24,6 @@
 
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/ceva/src/common/up_internal.h b/arch/ceva/src/common/up_internal.h
index 2ded122561b..2e14a400054 100644
--- a/arch/ceva/src/common/up_internal.h
+++ b/arch/ceva/src/common/up_internal.h
@@ -98,6 +98,13 @@
 #define INTSTACK_COLOR 0xdeadbeef
 #define HEAP_COLOR     'h'
 
+#define getreg8(a)     (*(volatile uint8_t *)(a))
+#define putreg8(v,a)   (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)    (*(volatile uint16_t *)(a))
+#define putreg16(v,a)  (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)    (*(volatile uint32_t *)(a))
+#define putreg32(v,a)  (*(volatile uint32_t *)(a) = (v))
+
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -213,6 +220,11 @@ EXTERN char _eheap4;
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
 
 /* Context switching */
 
diff --git a/arch/ceva/src/common/up_modifyreg16.c b/arch/ceva/src/common/up_modifyreg16.c
index 69d7fd854e6..c067e8b2f49 100644
--- a/arch/ceva/src/common/up_modifyreg16.c
+++ b/arch/ceva/src/common/up_modifyreg16.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/ceva/src/common/up_modifyreg32.c b/arch/ceva/src/common/up_modifyreg32.c
index f07acc2c16b..a2dd2d3483a 100644
--- a/arch/ceva/src/common/up_modifyreg32.c
+++ b/arch/ceva/src/common/up_modifyreg32.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/ceva/src/common/up_modifyreg8.c b/arch/ceva/src/common/up_modifyreg8.c
index ba5aaee9f07..2bd746b2fa8 100644
--- a/arch/ceva/src/common/up_modifyreg8.c
+++ b/arch/ceva/src/common/up_modifyreg8.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/hc/src/common/up_allocateheap.c b/arch/hc/src/common/up_allocateheap.c
index b9caab794e1..e4371f7cdc6 100644
--- a/arch/hc/src/common/up_allocateheap.c
+++ b/arch/hc/src/common/up_allocateheap.c
@@ -30,7 +30,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/hc/src/common/up_arch.h b/arch/hc/src/common/up_arch.h
deleted file mode 100644
index 37b0f8533b5..00000000000
--- a/arch/hc/src/common/up_arch.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
- * arch/hc/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_HC_SRC_COMMON_UP_ARCH_H
-#define __ARCH_HC_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-#include <arch/board/board.h>
-#include "chip.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_HC_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/hc/src/common/up_createstack.c b/arch/hc/src/common/up_createstack.c
index f98dd4ab6c0..6fcac4ba426 100644
--- a/arch/hc/src/common/up_createstack.c
+++ b/arch/hc/src/common/up_createstack.c
@@ -35,7 +35,6 @@
 #include <nuttx/tls.h>
 #include <nuttx/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/hc/src/common/up_doirq.c b/arch/hc/src/common/up_doirq.c
index 725baa2bd1e..c2073b9ddb1 100644
--- a/arch/hc/src/common/up_doirq.c
+++ b/arch/hc/src/common/up_doirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index 28b9399b035..9c920995e7f 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h
index 72fa526340b..8daeda9775b 100644
--- a/arch/hc/src/common/up_internal.h
+++ b/arch/hc/src/common/up_internal.h
@@ -82,6 +82,13 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
+#define getreg8(a)          (*(volatile uint8_t *)(a))
+#define putreg8(v,a)        (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)         (*(volatile uint16_t *)(a))
+#define putreg16(v,a)       (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)         (*(volatile uint32_t *)(a))
+#define putreg32(v,a)       (*(volatile uint32_t *)(a) = (v))
+
 /* Macros to handle saving and restore interrupt state.  In the current CPU12
  * model, the state is copied from the stack to the TCB, but only
  * a referenced is passed to get the state from the TCB.
@@ -131,6 +138,12 @@ extern uint32_t g_intstacktop;
  * Public Functions Prototypes
  ****************************************************************************/
 
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
+
 /* Context switching functions */
 
 void up_copystate(uint8_t *dest, uint8_t *src);
diff --git a/arch/hc/src/common/up_modifyreg16.c b/arch/hc/src/common/up_modifyreg16.c
index 95ced9b0d3c..898bae29d08 100644
--- a/arch/hc/src/common/up_modifyreg16.c
+++ b/arch/hc/src/common/up_modifyreg16.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/hc/src/common/up_modifyreg32.c b/arch/hc/src/common/up_modifyreg32.c
index 6d398e1ac7a..647d8dfe899 100644
--- a/arch/hc/src/common/up_modifyreg32.c
+++ b/arch/hc/src/common/up_modifyreg32.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/hc/src/common/up_modifyreg8.c b/arch/hc/src/common/up_modifyreg8.c
index fd634f9e7c2..439d0f00ab6 100644
--- a/arch/hc/src/common/up_modifyreg8.c
+++ b/arch/hc/src/common/up_modifyreg8.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index 484fac60d27..0dd13ab3eaa 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -37,7 +37,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c
index 1bd15975446..766d9b6cbf7 100644
--- a/arch/hc/src/m9s12/m9s12_dumpgpio.c
+++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -35,7 +35,7 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 #include "m9s12.h"
 #include "m9s12_pim.h"
 #include "m9s12_mebi.h"
diff --git a/arch/hc/src/m9s12/m9s12_gpio.c b/arch/hc/src/m9s12/m9s12_gpio.c
index 8d9a83e802b..f0a1bd5e77b 100644
--- a/arch/hc/src/m9s12/m9s12_gpio.c
+++ b/arch/hc/src/m9s12/m9s12_gpio.c
@@ -32,7 +32,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 #include "m9s12.h"
 #include "m9s12_pim.h"
 #include "m9s12_mebi.h"
diff --git a/arch/hc/src/m9s12/m9s12_gpioirq.c b/arch/hc/src/m9s12/m9s12_gpioirq.c
index 4bcf33ba489..33798afc7ef 100644
--- a/arch/hc/src/m9s12/m9s12_gpioirq.c
+++ b/arch/hc/src/m9s12/m9s12_gpioirq.c
@@ -30,7 +30,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 #include "m9s12.h"
 #include "m9s12_pim.h"
 #include "m9s12_mebi.h"
diff --git a/arch/hc/src/m9s12/m9s12_irq.c b/arch/hc/src/m9s12/m9s12_irq.c
index e41162073ab..60c28a44858 100644
--- a/arch/hc/src/m9s12/m9s12_irq.c
+++ b/arch/hc/src/m9s12/m9s12_irq.c
@@ -31,7 +31,6 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "m9s12.h"
 
diff --git a/arch/hc/src/m9s12/m9s12_timerisr.c b/arch/hc/src/m9s12/m9s12_timerisr.c
index 1d289db9dcc..463898d78af 100644
--- a/arch/hc/src/m9s12/m9s12_timerisr.c
+++ b/arch/hc/src/m9s12/m9s12_timerisr.c
@@ -33,8 +33,6 @@
 
 #include "clock/clock.h"
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
 #include "m9s12.h"
 #include "m9s12_crg.h"
diff --git a/arch/mips/src/common/mips_allocateheap.c b/arch/mips/src/common/mips_allocateheap.c
index 81e5e3c8fea..bf09120c23d 100644
--- a/arch/mips/src/common/mips_allocateheap.c
+++ b/arch/mips/src/common/mips_allocateheap.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
 
 /****************************************************************************
diff --git a/arch/mips/src/common/mips_arch.h b/arch/mips/src/common/mips_arch.h
deleted file mode 100644
index cf5ff0b11b9..00000000000
--- a/arch/mips/src/common/mips_arch.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- * arch/mips/src/common/mips_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef ___ARCH_MIPS_SRC_COMMON_MIPS_ARCH_H
-#define ___ARCH_MIPS_SRC_COMMON_MIPS_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_MIPS_SRC_COMMON_MIPS_ARCH_H */
diff --git a/arch/mips/src/common/mips_createstack.c b/arch/mips/src/common/mips_createstack.c
index 118e88f3da7..eab5cf76fd6 100644
--- a/arch/mips/src/common/mips_createstack.c
+++ b/arch/mips/src/common/mips_createstack.c
@@ -36,7 +36,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
 
 /****************************************************************************
diff --git a/arch/mips/src/common/mips_initialize.c b/arch/mips/src/common/mips_initialize.c
index 8c8ee2dd8bd..76aa98a848e 100644
--- a/arch/mips/src/common/mips_initialize.c
+++ b/arch/mips/src/common/mips_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
 
 /****************************************************************************
diff --git a/arch/mips/src/common/mips_internal.h b/arch/mips/src/common/mips_internal.h
index 297ad6220ce..9452b0eb504 100644
--- a/arch/mips/src/common/mips_internal.h
+++ b/arch/mips/src/common/mips_internal.h
@@ -85,6 +85,13 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
+#define getreg8(a)          (*(volatile uint8_t *)(a))
+#define putreg8(v,a)        (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)         (*(volatile uint16_t *)(a))
+#define putreg16(v,a)       (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)         (*(volatile uint32_t *)(a))
+#define putreg32(v,a)       (*(volatile uint32_t *)(a) = (v))
+
 /* In the MIPS model, the state is copied from the stack to the TCB, but
  * only a referenced is passed to get the state from the TCB.
  */
@@ -178,6 +185,12 @@ extern uint32_t _bmxdupba_address;  /* BMX register setting */
  * functions prototyped in include/nuttx/arch.h.
  */
 
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
+
 /* Context switching */
 
 void up_copystate(uint32_t *dest, uint32_t *src);
diff --git a/arch/mips/src/common/mips_modifyreg16.c b/arch/mips/src/common/mips_modifyreg16.c
index efed98ea488..ed203f2ec66 100644
--- a/arch/mips/src/common/mips_modifyreg16.c
+++ b/arch/mips/src/common/mips_modifyreg16.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/common/mips_modifyreg32.c b/arch/mips/src/common/mips_modifyreg32.c
index 931c26caf09..06f4c3dcccf 100644
--- a/arch/mips/src/common/mips_modifyreg32.c
+++ b/arch/mips/src/common/mips_modifyreg32.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/common/mips_modifyreg8.c b/arch/mips/src/common/mips_modifyreg8.c
index 4f5b0e66915..35293a140a2 100644
--- a/arch/mips/src/common/mips_modifyreg8.c
+++ b/arch/mips/src/common/mips_modifyreg8.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/mips32/mips_assert.c b/arch/mips/src/mips32/mips_assert.c
index fd8fb6ddff4..f273b8139e8 100644
--- a/arch/mips/src/mips32/mips_assert.c
+++ b/arch/mips/src/mips32/mips_assert.c
@@ -37,7 +37,6 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "sched/sched.h"
 #include "mips_internal.h"
 
diff --git a/arch/mips/src/mips32/mips_cache.S b/arch/mips/src/mips32/mips_cache.S
index 3febbe66758..d47e7e46d84 100644
--- a/arch/mips/src/mips32/mips_cache.S
+++ b/arch/mips/src/mips32/mips_cache.S
@@ -28,7 +28,7 @@
 #include <arch/mips32/registers.h>
 #include <arch/mips32/cp0.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/mips/src/mips32/mips_doirq.c b/arch/mips/src/mips32/mips_doirq.c
index 9739132d692..500bc63dfb2 100644
--- a/arch/mips/src/mips32/mips_doirq.c
+++ b/arch/mips/src/mips32/mips_doirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/mips/src/mips32/mips_dumpstate.c b/arch/mips/src/mips32/mips_dumpstate.c
index d148f8fa72a..19f212c55c7 100644
--- a/arch/mips/src/mips32/mips_dumpstate.c
+++ b/arch/mips/src/mips32/mips_dumpstate.c
@@ -35,7 +35,6 @@
 #include <nuttx/syslog/syslog.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "sched/sched.h"
 #include "mips_internal.h"
 
diff --git a/arch/mips/src/mips32/mips_initialstate.c b/arch/mips/src/mips32/mips_initialstate.c
index 1c0d2f08128..9ad52f142c1 100644
--- a/arch/mips/src/mips32/mips_initialstate.c
+++ b/arch/mips/src/mips32/mips_initialstate.c
@@ -33,7 +33,6 @@
 #include <arch/mips32/cp0.h>
 
 #include "mips_internal.h"
-#include "mips_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/mips/src/mips32/mips_schedulesigaction.c b/arch/mips/src/mips32/mips_schedulesigaction.c
index f2495e41205..e20021fe877 100644
--- a/arch/mips/src/mips32/mips_schedulesigaction.c
+++ b/arch/mips/src/mips32/mips_schedulesigaction.c
@@ -35,7 +35,6 @@
 
 #include "sched/sched.h"
 #include "mips_internal.h"
-#include "mips_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/mips/src/mips32/mips_sigdeliver.c b/arch/mips/src/mips32/mips_sigdeliver.c
index f0f0234ebdf..c50b1477192 100644
--- a/arch/mips/src/mips32/mips_sigdeliver.c
+++ b/arch/mips/src/mips32/mips_sigdeliver.c
@@ -38,7 +38,6 @@
 
 #include "sched/sched.h"
 #include "mips_internal.h"
-#include "mips_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/mips/src/pic32mx/pic32mx_decodeirq.c b/arch/mips/src/pic32mx/pic32mx_decodeirq.c
index 19a6e648f0b..93743b8615c 100644
--- a/arch/mips/src/pic32mx/pic32mx_decodeirq.c
+++ b/arch/mips/src/pic32mx/pic32mx_decodeirq.c
@@ -34,8 +34,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
-
+#include "mips_internal.h"
 #include "pic32mx_int.h"
 #include "pic32mx.h"
 
diff --git a/arch/mips/src/pic32mx/pic32mx_ethernet.c b/arch/mips/src/pic32mx/pic32mx_ethernet.c
index 697bef66f7c..26d5734c7ad 100644
--- a/arch/mips/src/pic32mx/pic32mx_ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx_ethernet.c
@@ -53,7 +53,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "pic32mx_config.h"
 #include "pic32mx_ethernet.h"
 #include "pic32mx.h"
diff --git a/arch/mips/src/pic32mx/pic32mx_exception.c b/arch/mips/src/pic32mx/pic32mx_exception.c
index cdbc623f929..f44980acda9 100644
--- a/arch/mips/src/pic32mx/pic32mx_exception.c
+++ b/arch/mips/src/pic32mx/pic32mx_exception.c
@@ -35,8 +35,7 @@
 #include <arch/board/board.h>
 #include <arch/pic32mx/cp0.h>
 
-#include "mips_arch.h"
-
+#include "mips_internal.h"
 #include "pic32mx_int.h"
 #include "pic32mx.h"
 
diff --git a/arch/mips/src/pic32mx/pic32mx_gpio.c b/arch/mips/src/pic32mx/pic32mx_gpio.c
index d5fe7e74046..0afaa899e04 100644
--- a/arch/mips/src/pic32mx/pic32mx_gpio.c
+++ b/arch/mips/src/pic32mx/pic32mx_gpio.c
@@ -32,7 +32,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "chip.h"
 #include "pic32mx_ioport.h"
 #include "pic32mx.h"
@@ -302,7 +302,7 @@ void pic32mx_dumpgpio(uint32_t pinset, const char *msg)
 
       sched_lock();
       gpioinfo("IOPORT%c pinset: %04x base: %08x -- %s\n",
-               'A'+port, pinset, base, msg);
+               'A' + port, pinset, base, msg);
       gpioinfo("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
                getreg32(base + PIC32MX_IOPORT_TRIS_OFFSET),
                getreg32(base + PIC32MX_IOPORT_PORT_OFFSET),
diff --git a/arch/mips/src/pic32mx/pic32mx_gpioirq.c b/arch/mips/src/pic32mx/pic32mx_gpioirq.c
index 718802d26f0..2c23f90c49c 100644
--- a/arch/mips/src/pic32mx/pic32mx_gpioirq.c
+++ b/arch/mips/src/pic32mx/pic32mx_gpioirq.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "pic32mx_gpio.h"
 #include "pic32mx.h"
 
diff --git a/arch/mips/src/pic32mx/pic32mx_irq.c b/arch/mips/src/pic32mx/pic32mx_irq.c
index 5d24be729d1..d9b4ca78cda 100644
--- a/arch/mips/src/pic32mx/pic32mx_irq.c
+++ b/arch/mips/src/pic32mx/pic32mx_irq.c
@@ -35,9 +35,7 @@
 #include <arch/irq.h>
 #include <arch/pic32mx/cp0.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx_int.h"
 #include "pic32mx.h"
 
diff --git a/arch/mips/src/pic32mx/pic32mx_lowconsole.c b/arch/mips/src/pic32mx/pic32mx_lowconsole.c
index b9925b741c1..538247bffe1 100644
--- a/arch/mips/src/pic32mx/pic32mx_lowconsole.c
+++ b/arch/mips/src/pic32mx/pic32mx_lowconsole.c
@@ -30,9 +30,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx_config.h"
 #include "pic32mx.h"
 
diff --git a/arch/mips/src/pic32mx/pic32mx_lowinit.c b/arch/mips/src/pic32mx/pic32mx_lowinit.c
index 5660e9a1e97..384e1b2a990 100644
--- a/arch/mips/src/pic32mx/pic32mx_lowinit.c
+++ b/arch/mips/src/pic32mx/pic32mx_lowinit.c
@@ -30,8 +30,6 @@
 #include <arch/pic32mx/cp0.h>
 
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "chip.h"
 #include "pic32mx.h"
 #include "pic32mx_bmx.h"
diff --git a/arch/mips/src/pic32mx/pic32mx_serial.c b/arch/mips/src/pic32mx/pic32mx_serial.c
index b510aaa7110..2df05c112c1 100644
--- a/arch/mips/src/pic32mx/pic32mx_serial.c
+++ b/arch/mips/src/pic32mx/pic32mx_serial.c
@@ -43,9 +43,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx_config.h"
 #include "chip.h"
 #include "pic32mx_uart.h"
diff --git a/arch/mips/src/pic32mx/pic32mx_spi.c b/arch/mips/src/pic32mx/pic32mx_spi.c
index 238a74d4f5e..52c62ac1d2c 100644
--- a/arch/mips/src/pic32mx/pic32mx_spi.c
+++ b/arch/mips/src/pic32mx/pic32mx_spi.c
@@ -39,8 +39,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "chip.h"
 #include "pic32mx.h"
 #include "pic32mx_spi.h"
diff --git a/arch/mips/src/pic32mx/pic32mx_timerisr.c b/arch/mips/src/pic32mx/pic32mx_timerisr.c
index 59560df75ce..0b00dee304c 100644
--- a/arch/mips/src/pic32mx/pic32mx_timerisr.c
+++ b/arch/mips/src/pic32mx/pic32mx_timerisr.c
@@ -33,8 +33,6 @@
 
 #include "clock/clock.h"
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "pic32mx_config.h"
 #include "pic32mx_timer.h"
 #include "pic32mx_int.h"
diff --git a/arch/mips/src/pic32mx/pic32mx_usbdev.c b/arch/mips/src/pic32mx/pic32mx_usbdev.c
index f248f56c30a..14d85ccecd7 100644
--- a/arch/mips/src/pic32mx/pic32mx_usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx_usbdev.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "pic32mx.h"
 #include "pic32mx_usbotg.h"
 
diff --git a/arch/mips/src/pic32mz/pic32mz_decodeirq.c b/arch/mips/src/pic32mz/pic32mz_decodeirq.c
index 62187fa1f2b..9b53cc53c78 100644
--- a/arch/mips/src/pic32mz/pic32mz_decodeirq.c
+++ b/arch/mips/src/pic32mz/pic32mz_decodeirq.c
@@ -34,9 +34,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "hardware/pic32mz_int.h"
 
 #include "group/group.h"
diff --git a/arch/mips/src/pic32mz/pic32mz_dma.c b/arch/mips/src/pic32mz/pic32mz_dma.c
index da7b1b90566..3fc8cf21731 100644
--- a/arch/mips/src/pic32mz/pic32mz_dma.c
+++ b/arch/mips/src/pic32mz/pic32mz_dma.c
@@ -33,7 +33,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/mips/src/pic32mz/pic32mz_ethernet.c b/arch/mips/src/pic32mz/pic32mz_ethernet.c
index 62bdcc44ba0..15f60d4f6fd 100644
--- a/arch/mips/src/pic32mz/pic32mz_ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz_ethernet.c
@@ -51,9 +51,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_config.h"
 #include "hardware/pic32mz_ethernet.h"
 
diff --git a/arch/mips/src/pic32mz/pic32mz_exception.c b/arch/mips/src/pic32mz/pic32mz_exception.c
index 09c1442ef70..9f40b5f3578 100644
--- a/arch/mips/src/pic32mz/pic32mz_exception.c
+++ b/arch/mips/src/pic32mz/pic32mz_exception.c
@@ -35,9 +35,7 @@
 #include <arch/board/board.h>
 #include <arch/pic32mz/cp0.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "hardware/pic32mz_int.h"
 
 /****************************************************************************
diff --git a/arch/mips/src/pic32mz/pic32mz_gpio.c b/arch/mips/src/pic32mz/pic32mz_gpio.c
index 3d8bfc00eaf..5a45ff6413c 100644
--- a/arch/mips/src/pic32mz/pic32mz_gpio.c
+++ b/arch/mips/src/pic32mz/pic32mz_gpio.c
@@ -32,8 +32,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
-
+#include "mips_internal.h"
 #include "hardware/pic32mz_ioport.h"
 #include "pic32mz_gpio.h"
 
@@ -339,7 +338,7 @@ void pic32mz_dumpgpio(pinset_t pinset, const char *msg)
 
       sched_lock();
       gpioinfo("IOPORT%c pinset: %04x base: %08x -- %s\n",
-               'A'+port, pinset, base, msg);
+               'A' + port, pinset, base, msg);
       gpioinfo("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
                getreg32(base + PIC32MZ_IOPORT_TRIS_OFFSET),
                getreg32(base + PIC32MZ_IOPORT_PORT_OFFSET),
diff --git a/arch/mips/src/pic32mz/pic32mz_gpioirq.c b/arch/mips/src/pic32mz/pic32mz_gpioirq.c
index 217f2aab357..1ca378917fa 100644
--- a/arch/mips/src/pic32mz/pic32mz_gpioirq.c
+++ b/arch/mips/src/pic32mz/pic32mz_gpioirq.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 #include <arch/pic32mz/irq.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
 #include "hardware/pic32mz_ioport.h"
 #include "pic32mz_gpio.h"
diff --git a/arch/mips/src/pic32mz/pic32mz_i2c.c b/arch/mips/src/pic32mz/pic32mz_i2c.c
index e40b803625c..823e2dbc945 100644
--- a/arch/mips/src/pic32mz/pic32mz_i2c.c
+++ b/arch/mips/src/pic32mz/pic32mz_i2c.c
@@ -42,8 +42,6 @@
 #include <arch/board/board.h>
 
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "hardware/pic32mz_i2c.h"
 #include "pic32mz_i2c.h"
 
diff --git a/arch/mips/src/pic32mz/pic32mz_irq.c b/arch/mips/src/pic32mz/pic32mz_irq.c
index c1e5dcaaf62..012c947dca4 100644
--- a/arch/mips/src/pic32mz/pic32mz_irq.c
+++ b/arch/mips/src/pic32mz/pic32mz_irq.c
@@ -35,9 +35,7 @@
 #include <arch/irq.h>
 #include <arch/pic32mz/cp0.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "hardware/pic32mz_int.h"
 #include "pic32mz_gpio.h"
 
diff --git a/arch/mips/src/pic32mz/pic32mz_lowconsole.c b/arch/mips/src/pic32mz/pic32mz_lowconsole.c
index 6d1ae6190e0..52537d0d088 100644
--- a/arch/mips/src/pic32mz/pic32mz_lowconsole.c
+++ b/arch/mips/src/pic32mz/pic32mz_lowconsole.c
@@ -29,9 +29,7 @@
 
 #include <arch/irq.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_config.h"
 #include "hardware/pic32mz_uart.h"
 #include "hardware/pic32mz_pps.h"
diff --git a/arch/mips/src/pic32mz/pic32mz_lowinit.c b/arch/mips/src/pic32mz/pic32mz_lowinit.c
index 021874285d7..2325d294862 100644
--- a/arch/mips/src/pic32mz/pic32mz_lowinit.c
+++ b/arch/mips/src/pic32mz/pic32mz_lowinit.c
@@ -31,8 +31,6 @@
 #include <arch/board/board.h>
 
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "hardware/pic32mz_features.h"
 #include "hardware/pic32mz_prefetch.h"
 #include "hardware/pic32mz_osc.h"
diff --git a/arch/mips/src/pic32mz/pic32mz_serial.c b/arch/mips/src/pic32mz/pic32mz_serial.c
index d224b458c15..1a163baaad9 100644
--- a/arch/mips/src/pic32mz/pic32mz_serial.c
+++ b/arch/mips/src/pic32mz/pic32mz_serial.c
@@ -43,9 +43,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_config.h"
 #include "hardware/pic32mz_uart.h"
 #include "pic32mz_lowconsole.h"
diff --git a/arch/mips/src/pic32mz/pic32mz_spi.c b/arch/mips/src/pic32mz/pic32mz_spi.c
index 7a16b97fac6..7340b47399e 100644
--- a/arch/mips/src/pic32mz/pic32mz_spi.c
+++ b/arch/mips/src/pic32mz/pic32mz_spi.c
@@ -39,8 +39,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "hardware/pic32mz_spi.h"
 #include "hardware/pic32mz_pps.h"
 #include "pic32mz_spi.h"
diff --git a/arch/mips/src/pic32mz/pic32mz_timer.c b/arch/mips/src/pic32mz/pic32mz_timer.c
index 95ed9903e02..3342d5d2109 100644
--- a/arch/mips/src/pic32mz/pic32mz_timer.c
+++ b/arch/mips/src/pic32mz/pic32mz_timer.c
@@ -38,8 +38,6 @@
 #include <arch/board/board.h>
 
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "hardware/pic32mz_timer.h"
 #include "pic32mz_timer.h"
 #include "pic32mz_gpio.h"
diff --git a/arch/mips/src/pic32mz/pic32mz_timerisr.c b/arch/mips/src/pic32mz/pic32mz_timerisr.c
index ffd30404643..1d8ca424100 100644
--- a/arch/mips/src/pic32mz/pic32mz_timerisr.c
+++ b/arch/mips/src/pic32mz/pic32mz_timerisr.c
@@ -33,8 +33,6 @@
 
 #include "clock/clock.h"
 #include "mips_internal.h"
-#include "mips_arch.h"
-
 #include "pic32mz_config.h"
 #include "hardware/pic32mz_timer.h"
 #include "hardware/pic32mz_int.h"
diff --git a/arch/or1k/src/common/up_allocateheap.c b/arch/or1k/src/common/up_allocateheap.c
index 165fc2cfbe2..c501967ef11 100644
--- a/arch/or1k/src/common/up_allocateheap.c
+++ b/arch/or1k/src/common/up_allocateheap.c
@@ -35,7 +35,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/or1k/src/common/up_arch.h b/arch/or1k/src/common/up_arch.h
deleted file mode 100644
index ddb5f49bd5a..00000000000
--- a/arch/or1k/src/common/up_arch.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
- * arch/or1k/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef ___ARCH_OR1K_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_OR1K_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_OR1K_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/or1k/src/common/up_assert.c b/arch/or1k/src/common/up_assert.c
index c9bd20022d1..9f016407e1a 100644
--- a/arch/or1k/src/common/up_assert.c
+++ b/arch/or1k/src/common/up_assert.c
@@ -37,7 +37,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/or1k/src/common/up_createstack.c b/arch/or1k/src/common/up_createstack.c
index b0df4133495..b65531b760c 100644
--- a/arch/or1k/src/common/up_createstack.c
+++ b/arch/or1k/src/common/up_createstack.c
@@ -37,7 +37,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/or1k/src/common/up_doirq.c b/arch/or1k/src/common/up_doirq.c
index 4b36bbd620e..6f24fab03ab 100644
--- a/arch/or1k/src/common/up_doirq.c
+++ b/arch/or1k/src/common/up_doirq.c
@@ -32,7 +32,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/or1k/src/common/up_initialstate.c b/arch/or1k/src/common/up_initialstate.c
index f45aeea1bf4..502f04d9c50 100644
--- a/arch/or1k/src/common/up_initialstate.c
+++ b/arch/or1k/src/common/up_initialstate.c
@@ -46,7 +46,6 @@
 #include <nuttx/arch.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 
 #include <arch/spr.h>
 
diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h
index 7467267016b..01f18e50918 100644
--- a/arch/or1k/src/common/up_internal.h
+++ b/arch/or1k/src/common/up_internal.h
@@ -103,6 +103,13 @@
 #define INTSTACK_COLOR 0x1bad1dea
 #define HEAP_COLOR     'h'
 
+#define getreg8(a)     (*(volatile uint8_t *)(a))
+#define putreg8(v,a)   (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)    (*(volatile uint16_t *)(a))
+#define putreg16(v,a)  (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)    (*(volatile uint32_t *)(a))
+#define putreg32(v,a)  (*(volatile uint32_t *)(a) = (v))
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -218,6 +225,11 @@ EXTERN uint32_t _eramfuncs;       /* Copy destination end address in RAM */
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
 
 /* Low level initialization provided by board-level logic *******************/
 
diff --git a/arch/or1k/src/common/up_modifyreg16.c b/arch/or1k/src/common/up_modifyreg16.c
index 9778c548709..32bfc5aa631 100644
--- a/arch/or1k/src/common/up_modifyreg16.c
+++ b/arch/or1k/src/common/up_modifyreg16.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/or1k/src/common/up_modifyreg32.c b/arch/or1k/src/common/up_modifyreg32.c
index ca8e2d7a131..002426b4834 100644
--- a/arch/or1k/src/common/up_modifyreg32.c
+++ b/arch/or1k/src/common/up_modifyreg32.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/or1k/src/common/up_modifyreg8.c b/arch/or1k/src/common/up_modifyreg8.c
index 8b20abd9287..eb035f0ab3f 100644
--- a/arch/or1k/src/common/up_modifyreg8.c
+++ b/arch/or1k/src/common/up_modifyreg8.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/or1k/src/common/up_schedulesigaction.c b/arch/or1k/src/common/up_schedulesigaction.c
index fcb2afcd613..f6fc52b1bc1 100644
--- a/arch/or1k/src/common/up_schedulesigaction.c
+++ b/arch/or1k/src/common/up_schedulesigaction.c
@@ -33,7 +33,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/or1k/src/common/up_timer.c b/arch/or1k/src/common/up_timer.c
index 1c1799e7b28..234cda2c45a 100644
--- a/arch/or1k/src/common/up_timer.c
+++ b/arch/or1k/src/common/up_timer.c
@@ -49,7 +49,6 @@
 
 #include "clock/clock.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/or1k/src/mor1kx/mor1kx_serial.c b/arch/or1k/src/mor1kx/mor1kx_serial.c
index 627ee36d8bb..3cf6cd3c1e2 100644
--- a/arch/or1k/src/mor1kx/mor1kx_serial.c
+++ b/arch/or1k/src/mor1kx/mor1kx_serial.c
@@ -38,7 +38,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/or1k/src/mor1kx/up_irq.c b/arch/or1k/src/mor1kx/up_irq.c
index 34b4f37aea0..4dbeab19242 100644
--- a/arch/or1k/src/mor1kx/up_irq.c
+++ b/arch/or1k/src/mor1kx/up_irq.c
@@ -33,7 +33,6 @@
 #include <arch/irq.h>
 #include <arch/spr.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/common/up_allocateheap.c b/arch/renesas/src/common/up_allocateheap.c
index 23c16c217c5..548c09335d0 100644
--- a/arch/renesas/src/common/up_allocateheap.c
+++ b/arch/renesas/src/common/up_allocateheap.c
@@ -29,8 +29,8 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
+#include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/common/up_arch.h b/arch/renesas/src/common/up_arch.h
deleted file mode 100644
index 160541dc963..00000000000
--- a/arch/renesas/src/common/up_arch.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
- * arch/renesas/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef ___ARCH_RENESAS_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_RENESAS_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-#include <arch/board/board.h>
-#include "chip.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-#endif
-
-#endif /* ___ARCH_RENESAS_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/renesas/src/common/up_assert.c b/arch/renesas/src/common/up_assert.c
index 80049de9fe1..1bff3444a58 100644
--- a/arch/renesas/src/common/up_assert.c
+++ b/arch/renesas/src/common/up_assert.c
@@ -32,12 +32,13 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
+#include <arch/board/board.h>
+
 #include <nuttx/syslog/syslog.h>
 #include <nuttx/usb/usbdev_trace.h>
 
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/renesas/src/common/up_createstack.c b/arch/renesas/src/common/up_createstack.c
index 673a192b023..19678c14ec9 100644
--- a/arch/renesas/src/common/up_createstack.c
+++ b/arch/renesas/src/common/up_createstack.c
@@ -34,8 +34,8 @@
 #include <nuttx/arch.h>
 #include <nuttx/tls.h>
 #include <nuttx/board.h>
+#include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/common/up_doirq.c b/arch/renesas/src/common/up_doirq.c
index b2a2ab9de1a..885a81534fb 100644
--- a/arch/renesas/src/common/up_doirq.c
+++ b/arch/renesas/src/common/up_doirq.c
@@ -30,10 +30,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
+#include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
index 7050372c1c9..43a7a4a7c5b 100644
--- a/arch/renesas/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h
index da00a773d3f..d18741a6423 100644
--- a/arch/renesas/src/common/up_internal.h
+++ b/arch/renesas/src/common/up_internal.h
@@ -87,7 +87,14 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
-#define up_savestate(regs)    up_copystate(regs, (uint32_t *)g_current_regs)
+#define up_savestate(regs)  up_copystate(regs, (uint32_t *)g_current_regs)
+
+#define getreg8(a)          (*(volatile uint8_t *)(a))
+#define putreg8(v,a)        (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)         (*(volatile uint16_t *)(a))
+#define putreg16(v,a)       (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)         (*(volatile uint32_t *)(a))
+#define putreg32(v,a)       (*(volatile uint32_t *)(a) = (v))
 
 /****************************************************************************
  * Public Types
diff --git a/arch/renesas/src/m16c/m16c_dumpstate.c b/arch/renesas/src/m16c/m16c_dumpstate.c
index fc8220b1fe0..e4acb4a86f5 100644
--- a/arch/renesas/src/m16c/m16c_dumpstate.c
+++ b/arch/renesas/src/m16c/m16c_dumpstate.c
@@ -31,7 +31,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/syslog/syslog.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/renesas/src/m16c/m16c_initialstate.c b/arch/renesas/src/m16c/m16c_initialstate.c
index b3f172f460e..600cb9ec180 100644
--- a/arch/renesas/src/m16c/m16c_initialstate.c
+++ b/arch/renesas/src/m16c/m16c_initialstate.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/renesas/src/m16c/m16c_lowputc.c b/arch/renesas/src/m16c/m16c_lowputc.c
index 9b09ac6b639..bd9004241df 100644
--- a/arch/renesas/src/m16c/m16c_lowputc.c
+++ b/arch/renesas/src/m16c/m16c_lowputc.c
@@ -28,10 +28,7 @@
 #include <nuttx/arch.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
-#include "up_internal.h"
 #include "m16c_uart.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/m16c/m16c_schedulesigaction.c b/arch/renesas/src/m16c/m16c_schedulesigaction.c
index 7ef55ce49c8..7f7def82451 100644
--- a/arch/renesas/src/m16c/m16c_schedulesigaction.c
+++ b/arch/renesas/src/m16c/m16c_schedulesigaction.c
@@ -33,7 +33,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/renesas/src/m16c/m16c_serial.c b/arch/renesas/src/m16c/m16c_serial.c
index ff2a3fe2a29..1d0d3a8dea5 100644
--- a/arch/renesas/src/m16c/m16c_serial.c
+++ b/arch/renesas/src/m16c/m16c_serial.c
@@ -38,7 +38,6 @@
 #include <nuttx/serial/serial.h>
 
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 #include "m16c_uart.h"
 
diff --git a/arch/renesas/src/m16c/m16c_sigdeliver.c b/arch/renesas/src/m16c/m16c_sigdeliver.c
index 8c51c39bf10..3ccc5a83b9e 100644
--- a/arch/renesas/src/m16c/m16c_sigdeliver.c
+++ b/arch/renesas/src/m16c/m16c_sigdeliver.c
@@ -35,7 +35,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/renesas/src/m16c/m16c_timerisr.c b/arch/renesas/src/m16c/m16c_timerisr.c
index 565cc2a5a23..ccd40caaa45 100644
--- a/arch/renesas/src/m16c/m16c_timerisr.c
+++ b/arch/renesas/src/m16c/m16c_timerisr.c
@@ -33,8 +33,6 @@
 
 #include "clock/clock.h"
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
 #include "m16c_timer.h"
 
diff --git a/arch/renesas/src/rx65n/rx65n_dtc.c b/arch/renesas/src/rx65n/rx65n_dtc.c
index a2cb9a751cf..5165e11f259 100644
--- a/arch/renesas/src/rx65n/rx65n_dtc.c
+++ b/arch/renesas/src/rx65n/rx65n_dtc.c
@@ -36,10 +36,7 @@
 #include <nuttx/semaphore.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
-#include "up_arch.h"
 #include "rx65n_definitions.h"
 #include "rx65n_dtc.h"
 
diff --git a/arch/renesas/src/rx65n/rx65n_dumpstate.c b/arch/renesas/src/rx65n/rx65n_dumpstate.c
index fdb8cd1775a..2596b8f257e 100644
--- a/arch/renesas/src/rx65n/rx65n_dumpstate.c
+++ b/arch/renesas/src/rx65n/rx65n_dumpstate.c
@@ -32,7 +32,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/syslog/syslog.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "sched/sched.h"
 #include "chip.h"
diff --git a/arch/renesas/src/rx65n/rx65n_eth.c b/arch/renesas/src/rx65n/rx65n_eth.c
index f0d0b671182..43ed70c7334 100644
--- a/arch/renesas/src/rx65n/rx65n_eth.c
+++ b/arch/renesas/src/rx65n/rx65n_eth.c
@@ -56,9 +56,7 @@
 #endif
 
 #include "up_internal.h"
-
 #include "chip.h"
-#include "up_arch.h"
 #include "rx65n_definitions.h"
 #include "rx65n_eth.h"
 #include "rx65n_cmt.h"
diff --git a/arch/renesas/src/rx65n/rx65n_hardware_setup.c b/arch/renesas/src/rx65n/rx65n_hardware_setup.c
index 274be019b7b..25580e258df 100644
--- a/arch/renesas/src/rx65n/rx65n_hardware_setup.c
+++ b/arch/renesas/src/rx65n/rx65n_hardware_setup.c
@@ -28,7 +28,6 @@
 #include "rx65n_port.h"
 #include "rx65n_sci.h"
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 #include "rx65n_definitions.h"
 
diff --git a/arch/renesas/src/rx65n/rx65n_head.S b/arch/renesas/src/rx65n/rx65n_head.S
index 905a06fa98c..f765fa6de49 100644
--- a/arch/renesas/src/rx65n/rx65n_head.S
+++ b/arch/renesas/src/rx65n/rx65n_head.S
@@ -27,7 +27,6 @@
 #include <arch/irq.h>                  /* IRQ definitions */
 #include "chip.h"                      /* Chip-specific settings */
 #include "up_internal.h"
-#include "up_arch.h"
 
 /*****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/renesas/src/rx65n/rx65n_initialstate.c b/arch/renesas/src/rx65n/rx65n_initialstate.c
index 62863f5de0e..cd07fb3451b 100644
--- a/arch/renesas/src/rx65n/rx65n_initialstate.c
+++ b/arch/renesas/src/rx65n/rx65n_initialstate.c
@@ -30,7 +30,6 @@
 
 #include "chip/chip.h"
 #include "up_internal.h"
-#include "up_arch.h"
 #include "arch/rx65n/irq.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/rx65n/rx65n_irq.c b/arch/renesas/src/rx65n/rx65n_irq.c
index d4cd4541c30..b02ba9a1515 100644
--- a/arch/renesas/src/rx65n/rx65n_irq.c
+++ b/arch/renesas/src/rx65n/rx65n_irq.c
@@ -28,7 +28,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include "arch/rx65n/iodefine.h"
-
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/rx65n/rx65n_lowputc.c b/arch/renesas/src/rx65n/rx65n_lowputc.c
index 28c8c3be9fe..4f6c2907a46 100644
--- a/arch/renesas/src/rx65n/rx65n_lowputc.c
+++ b/arch/renesas/src/rx65n/rx65n_lowputc.c
@@ -29,7 +29,6 @@
 
 #include "chip.h"
 #include "up_internal.h"
-#include "up_arch.h"
 #include "rx65n_definitions.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/rx65n/rx65n_riic.c b/arch/renesas/src/rx65n/rx65n_riic.c
index 2fdd7578156..6baff6cb72e 100644
--- a/arch/renesas/src/rx65n/rx65n_riic.c
+++ b/arch/renesas/src/rx65n/rx65n_riic.c
@@ -34,7 +34,7 @@
 #include <arch/board/rx65n_gpio.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include "up_arch.h"
+#include "up_internal.h"
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/renesas/src/rx65n/rx65n_rspi.c b/arch/renesas/src/rx65n/rx65n_rspi.c
index 35086c2f005..0ed4e263a2f 100644
--- a/arch/renesas/src/rx65n/rx65n_rspi.c
+++ b/arch/renesas/src/rx65n/rx65n_rspi.c
@@ -40,10 +40,7 @@
 #include <arch/board/board.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
-#include "up_arch.h"
 #include "rx65n_definitions.h"
 #include "rx65n_rspi.h"
 #include "rx65n_dtc.h"
diff --git a/arch/renesas/src/rx65n/rx65n_rspi_sw.c b/arch/renesas/src/rx65n/rx65n_rspi_sw.c
index 13546d44a9a..3dc4734abf5 100644
--- a/arch/renesas/src/rx65n/rx65n_rspi_sw.c
+++ b/arch/renesas/src/rx65n/rx65n_rspi_sw.c
@@ -40,10 +40,7 @@
 #include <arch/board/board.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
-#include "up_arch.h"
 #include "rx65n_definitions.h"
 #include "rx65n_rspi.h"
 
diff --git a/arch/renesas/src/rx65n/rx65n_rtc.c b/arch/renesas/src/rx65n/rx65n_rtc.c
index 1196df16ab8..7f000609c60 100644
--- a/arch/renesas/src/rx65n/rx65n_rtc.c
+++ b/arch/renesas/src/rx65n/rx65n_rtc.c
@@ -35,8 +35,7 @@
 #include <nuttx/compiler.h>
 #include <arch/board/board.h>
 #include <rx65n_rtc.h>
-#include "up_arch.h"
-
+#include "up_internal.h"
 #include "nuttx/compiler.h"
 #ifdef CONFIG_RX65N_RTC
 
diff --git a/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c b/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c
index bb5cfa04ce3..cab2a382a7c 100644
--- a/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c
+++ b/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c
@@ -33,7 +33,7 @@
 #include <nuttx/timers/rtc.h>
 #include "chip.h"
 #include <rx65n_rtc.h>
-#include "up_arch.h"
+#include "up_internal.h"
 
 #ifdef CONFIG_RTC_DRIVER
 
diff --git a/arch/renesas/src/rx65n/rx65n_schedulesigaction.c b/arch/renesas/src/rx65n/rx65n_schedulesigaction.c
index 045ee9e3cbd..4fb80dcb5d3 100644
--- a/arch/renesas/src/rx65n/rx65n_schedulesigaction.c
+++ b/arch/renesas/src/rx65n/rx65n_schedulesigaction.c
@@ -33,7 +33,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/renesas/src/rx65n/rx65n_sci.c b/arch/renesas/src/rx65n/rx65n_sci.c
index 0ed8110f8f9..5c5cee5fab2 100644
--- a/arch/renesas/src/rx65n/rx65n_sci.c
+++ b/arch/renesas/src/rx65n/rx65n_sci.c
@@ -27,7 +27,6 @@
 #include "rx65n_macrodriver.h"
 #include "rx65n_sci.h"
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 #include "rx65n_definitions.h"
 #include "arch/board/rx65n_gpio.h"
diff --git a/arch/renesas/src/rx65n/rx65n_serial.c b/arch/renesas/src/rx65n/rx65n_serial.c
index 41f79c41435..9734a58f55c 100644
--- a/arch/renesas/src/rx65n/rx65n_serial.c
+++ b/arch/renesas/src/rx65n/rx65n_serial.c
@@ -40,7 +40,6 @@
 #include "rx65n_macrodriver.h"
 #include "arch/rx65n/iodefine.h"
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 #include "rx65n_definitions.h"
 #include "rx65n_sci.h"
diff --git a/arch/renesas/src/rx65n/rx65n_sigdeliver.c b/arch/renesas/src/rx65n/rx65n_sigdeliver.c
index 8984e14ba73..649e621be39 100644
--- a/arch/renesas/src/rx65n/rx65n_sigdeliver.c
+++ b/arch/renesas/src/rx65n/rx65n_sigdeliver.c
@@ -32,10 +32,10 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
+#include <arch/board/board.h>
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/renesas/src/rx65n/rx65n_timerisr.c b/arch/renesas/src/rx65n/rx65n_timerisr.c
index 6234c6e1840..979330556d1 100644
--- a/arch/renesas/src/rx65n/rx65n_timerisr.c
+++ b/arch/renesas/src/rx65n/rx65n_timerisr.c
@@ -33,7 +33,6 @@
 #include "arch/rx65n/irq.h"
 #include "clock/clock.h"
 #include "up_internal.h"
-#include "up_arch.h"
 #include "arch/rx65n/iodefine.h"
 #include "chip.h"
 #include "rx65n_cmt.h"
diff --git a/arch/renesas/src/rx65n/rx65n_usbdev.c b/arch/renesas/src/rx65n/rx65n_usbdev.c
index 86ef501e22b..626f6290e91 100644
--- a/arch/renesas/src/rx65n/rx65n_usbdev.c
+++ b/arch/renesas/src/rx65n/rx65n_usbdev.c
@@ -47,9 +47,7 @@
 #include <arch/chip/types.h>
 
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "rx65n_usbdev.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/rx65n/rx65n_usbhost.c b/arch/renesas/src/rx65n/rx65n_usbhost.c
index 7899f3c9d01..a7976b9307c 100644
--- a/arch/renesas/src/rx65n/rx65n_usbhost.c
+++ b/arch/renesas/src/rx65n/rx65n_usbhost.c
@@ -50,9 +50,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "chip.h"
 #include "rx65n_usbhost.h"
 
diff --git a/arch/renesas/src/sh1/sh1_dumpstate.c b/arch/renesas/src/sh1/sh1_dumpstate.c
index fa11e9e6f5b..a037f2dcc22 100644
--- a/arch/renesas/src/sh1/sh1_dumpstate.c
+++ b/arch/renesas/src/sh1/sh1_dumpstate.c
@@ -31,7 +31,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/syslog/syslog.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "sched/sched.h"
 
diff --git a/arch/renesas/src/sh1/sh1_head.S b/arch/renesas/src/sh1/sh1_head.S
index fa9058f02d4..32bfa48fc6d 100644
--- a/arch/renesas/src/sh1/sh1_head.S
+++ b/arch/renesas/src/sh1/sh1_head.S
@@ -28,7 +28,6 @@
 
 #include "chip.h"		/* Chip-specific settings */
 #include "up_internal.h"
-#include "up_arch.h"
 
 /*****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/renesas/src/sh1/sh1_initialstate.c b/arch/renesas/src/sh1/sh1_initialstate.c
index 0e2444732f8..3b691508179 100644
--- a/arch/renesas/src/sh1/sh1_initialstate.c
+++ b/arch/renesas/src/sh1/sh1_initialstate.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <nuttx/arch.h>
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Private Functions
diff --git a/arch/renesas/src/sh1/sh1_irq.c b/arch/renesas/src/sh1/sh1_irq.c
index 650f27ce832..f4eb874e691 100644
--- a/arch/renesas/src/sh1/sh1_irq.c
+++ b/arch/renesas/src/sh1/sh1_irq.c
@@ -30,7 +30,6 @@
 
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "chip.h"
 
diff --git a/arch/renesas/src/sh1/sh1_lowputc.c b/arch/renesas/src/sh1/sh1_lowputc.c
index 380119b21b4..a2b4c76dc0a 100644
--- a/arch/renesas/src/sh1/sh1_lowputc.c
+++ b/arch/renesas/src/sh1/sh1_lowputc.c
@@ -27,9 +27,6 @@
 #include <stdint.h>
 #include <nuttx/arch.h>
 
-#include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
 #include "up_internal.h"
 
diff --git a/arch/renesas/src/sh1/sh1_schedulesigaction.c b/arch/renesas/src/sh1/sh1_schedulesigaction.c
index 99ebe3882d8..081e78f8988 100644
--- a/arch/renesas/src/sh1/sh1_schedulesigaction.c
+++ b/arch/renesas/src/sh1/sh1_schedulesigaction.c
@@ -33,7 +33,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/renesas/src/sh1/sh1_serial.c b/arch/renesas/src/sh1/sh1_serial.c
index 46324829134..90f2049ba80 100644
--- a/arch/renesas/src/sh1/sh1_serial.c
+++ b/arch/renesas/src/sh1/sh1_serial.c
@@ -38,7 +38,6 @@
 #include <nuttx/serial/serial.h>
 
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/renesas/src/sh1/sh1_sigdeliver.c b/arch/renesas/src/sh1/sh1_sigdeliver.c
index b9547818b42..6f57a3b3dc7 100644
--- a/arch/renesas/src/sh1/sh1_sigdeliver.c
+++ b/arch/renesas/src/sh1/sh1_sigdeliver.c
@@ -35,7 +35,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/renesas/src/sh1/sh1_timerisr.c b/arch/renesas/src/sh1/sh1_timerisr.c
index 7efb6a13ab9..d684f99f33c 100644
--- a/arch/renesas/src/sh1/sh1_timerisr.c
+++ b/arch/renesas/src/sh1/sh1_timerisr.c
@@ -33,8 +33,6 @@
 
 #include "clock/clock.h"
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/bl602/bl602_efuse.c b/arch/risc-v/src/bl602/bl602_efuse.c
index 2afcb96919e..7f1aa51537d 100644
--- a/arch/risc-v/src/bl602/bl602_efuse.c
+++ b/arch/risc-v/src/bl602/bl602_efuse.c
@@ -30,8 +30,7 @@
 #include <assert.h>
 
 #include "chip.h"
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/bl602_ef.h"
 #include "bl602_romapi.h"
 
diff --git a/arch/risc-v/src/bl602/bl602_glb.c b/arch/risc-v/src/bl602/bl602_glb.c
index 9508cb8185e..2d0c4f70e39 100644
--- a/arch/risc-v/src/bl602/bl602_glb.c
+++ b/arch/risc-v/src/bl602/bl602_glb.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/bl602_glb.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/bl602/bl602_gpio.c b/arch/risc-v/src/bl602/bl602_gpio.c
index 5ab50638108..6ed4951b008 100644
--- a/arch/risc-v/src/bl602/bl602_gpio.c
+++ b/arch/risc-v/src/bl602/bl602_gpio.c
@@ -24,8 +24,7 @@
 
 #include <stdint.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/bl602_glb.h"
 #include "bl602_gpio.h"
 
diff --git a/arch/risc-v/src/bl602/bl602_hbn.c b/arch/risc-v/src/bl602/bl602_hbn.c
index 75738716909..9455695245f 100644
--- a/arch/risc-v/src/bl602/bl602_hbn.c
+++ b/arch/risc-v/src/bl602/bl602_hbn.c
@@ -26,7 +26,7 @@
 #include "hardware/bl602_hbn.h"
 #include "bl602_hbn.h"
 #include "bl602_rtc.h"
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 
 /****************************************************************************
  * Private Types
diff --git a/arch/risc-v/src/bl602/bl602_i2c.c b/arch/risc-v/src/bl602/bl602_i2c.c
index 66dbf621448..172274d6b69 100644
--- a/arch/risc-v/src/bl602/bl602_i2c.c
+++ b/arch/risc-v/src/bl602/bl602_i2c.c
@@ -39,8 +39,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/bl602_glb.h"
 #include "hardware/bl602_hbn.h"
 #include "hardware/bl602_i2c.h"
diff --git a/arch/risc-v/src/bl602/bl602_irq.c b/arch/risc-v/src/bl602/bl602_irq.c
index 7b95936fda8..02b612be44d 100644
--- a/arch/risc-v/src/bl602/bl602_irq.c
+++ b/arch/risc-v/src/bl602/bl602_irq.c
@@ -36,8 +36,6 @@
 #include <arch/csr.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "hardware/bl602_clic.h"
 
 #include "chip.h"
diff --git a/arch/risc-v/src/bl602/bl602_irq_dispatch.c b/arch/risc-v/src/bl602/bl602_irq_dispatch.c
index 4dc23878399..10c89cad0d1 100644
--- a/arch/risc-v/src/bl602/bl602_irq_dispatch.c
+++ b/arch/risc-v/src/bl602/bl602_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/bl602/bl602_lowputc.c b/arch/risc-v/src/bl602/bl602_lowputc.c
index 46c8223672d..f32548dcca9 100644
--- a/arch/risc-v/src/bl602/bl602_lowputc.c
+++ b/arch/risc-v/src/bl602/bl602_lowputc.c
@@ -43,9 +43,7 @@
 #include "bl602_lowputc.h"
 #include "bl602_gpio.h"
 #include "bl602_hbn.h"
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "bl602_config.h"
 #include "chip.h"
 
diff --git a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c
index 1af1d223ace..a1a3ee5e14b 100644
--- a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c
+++ b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c
@@ -33,7 +33,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/timers/oneshot.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 #include <hardware/bl602_timer.h>
diff --git a/arch/risc-v/src/bl602/bl602_pwm_lowerhalf.c b/arch/risc-v/src/bl602/bl602_pwm_lowerhalf.c
index 63ec6278fea..2a7128eb5f5 100644
--- a/arch/risc-v/src/bl602/bl602_pwm_lowerhalf.c
+++ b/arch/risc-v/src/bl602/bl602_pwm_lowerhalf.c
@@ -33,9 +33,7 @@
 
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "bl602_gpio.h"
 #include "bl602_pwm_lowerhalf.h"
 #include "hardware/bl602_pwm.h"
diff --git a/arch/risc-v/src/bl602/bl602_rtc.c b/arch/risc-v/src/bl602/bl602_rtc.c
index 7392f1ebead..e11e0dd8038 100644
--- a/arch/risc-v/src/bl602/bl602_rtc.c
+++ b/arch/risc-v/src/bl602/bl602_rtc.c
@@ -32,8 +32,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "chip.h"
 #include "hardware/bl602_hbn.h"
 #include "bl602_rtc.h"
diff --git a/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c b/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c
index eb8e4048193..f736427b93f 100644
--- a/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c
+++ b/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c
@@ -33,8 +33,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "chip.h"
 #include "hardware/bl602_hbn.h"
 #include "bl602_hbn.h"
diff --git a/arch/risc-v/src/bl602/bl602_serial.c b/arch/risc-v/src/bl602/bl602_serial.c
index a84948527ae..9991492ee3b 100644
--- a/arch/risc-v/src/bl602/bl602_serial.c
+++ b/arch/risc-v/src/bl602/bl602_serial.c
@@ -43,10 +43,7 @@
 
 #include "hardware/bl602_uart.h"
 #include "hardware/bl602_glb.h"
-
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "bl602_config.h"
 #include "chip.h"
 
diff --git a/arch/risc-v/src/bl602/bl602_spi.c b/arch/risc-v/src/bl602/bl602_spi.c
index b5293320850..b272fa04308 100644
--- a/arch/risc-v/src/bl602/bl602_spi.c
+++ b/arch/risc-v/src/bl602/bl602_spi.c
@@ -45,7 +45,7 @@
 #include "hardware/bl602_glb.h"
 #include "hardware/bl602_spi.h"
 #include "hardware/bl602_hbn.h"
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/bl602/bl602_start.c b/arch/risc-v/src/bl602/bl602_start.c
index 4b3adc91620..f90bf8ed109 100644
--- a/arch/risc-v/src/bl602/bl602_start.c
+++ b/arch/risc-v/src/bl602/bl602_start.c
@@ -36,7 +36,6 @@
 # include "sched/sched.h"
 #endif
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 #include "chip.h"
 
diff --git a/arch/risc-v/src/bl602/bl602_systemreset.c b/arch/risc-v/src/bl602/bl602_systemreset.c
index c639fc4a52a..3c73d706871 100644
--- a/arch/risc-v/src/bl602/bl602_systemreset.c
+++ b/arch/risc-v/src/bl602/bl602_systemreset.c
@@ -25,8 +25,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/bl602_glb.h"
 #include "hardware/bl602_hbn.h"
 #include "bl602_romapi.h"
@@ -68,6 +67,10 @@ void up_systemreset(void)
   asm volatile("csrci mstatus, 8");
 
   bl602_romapi_reset_system();
+
+  /* Wait for the reset */
+
+  for (; ; );
 }
 
 /****************************************************************************
diff --git a/arch/risc-v/src/bl602/bl602_tim.c b/arch/risc-v/src/bl602/bl602_tim.c
index a437034cebe..bd755100442 100644
--- a/arch/risc-v/src/bl602/bl602_tim.c
+++ b/arch/risc-v/src/bl602/bl602_tim.c
@@ -29,7 +29,6 @@
 
 #include <hardware/bl602_timer.h>
 #include "bl602_tim.h"
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/bl602/bl602_tim_lowerhalf.c b/arch/risc-v/src/bl602/bl602_tim_lowerhalf.c
index 385001723c4..89a0a18a044 100644
--- a/arch/risc-v/src/bl602/bl602_tim_lowerhalf.c
+++ b/arch/risc-v/src/bl602/bl602_tim_lowerhalf.c
@@ -35,8 +35,7 @@
 #include <nuttx/timers/timer.h>
 
 #include <arch/board/board.h>
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/bl602_glb.h"
 #include "hardware/bl602_timer.h"
 #include "bl602_tim_lowerhalf.h"
diff --git a/arch/risc-v/src/bl602/bl602_timerisr.c b/arch/risc-v/src/bl602/bl602_timerisr.c
index ad882d5d21b..6d8d680877a 100644
--- a/arch/risc-v/src/bl602/bl602_timerisr.c
+++ b/arch/risc-v/src/bl602/bl602_timerisr.c
@@ -33,8 +33,7 @@
 #include <nuttx/spinlock.h>
 #include <arch/board/board.h>
 #include "hardware/bl602_clic.h"
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/c906/c906_clockconfig.c b/arch/risc-v/src/c906/c906_clockconfig.c
index 42bea8e8bc3..fe685e1fd2c 100644
--- a/arch/risc-v/src/c906/c906_clockconfig.c
+++ b/arch/risc-v/src/c906/c906_clockconfig.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "c906_clockconfig.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/c906/c906_irq.c b/arch/risc-v/src/c906/c906_irq.c
index 09d24742832..f753e5d0071 100644
--- a/arch/risc-v/src/c906/c906_irq.c
+++ b/arch/risc-v/src/c906/c906_irq.c
@@ -31,11 +31,9 @@
 
 #include <nuttx/arch.h>
 #include <arch/irq.h>
-
-#include "riscv_internal.h"
-#include "riscv_arch.h"
 #include <arch/csr.h>
 
+#include "riscv_internal.h"
 #include "c906.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/c906/c906_irq_dispatch.c b/arch/risc-v/src/c906/c906_irq_dispatch.c
index 05032ecb01c..c032864b6ff 100644
--- a/arch/risc-v/src/c906/c906_irq_dispatch.c
+++ b/arch/risc-v/src/c906/c906_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/c906/c906_lowputc.c b/arch/risc-v/src/c906/c906_lowputc.c
index c750bda69dc..2ed851ce3b5 100644
--- a/arch/risc-v/src/c906/c906_lowputc.c
+++ b/arch/risc-v/src/c906/c906_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "c906_config.h"
 #include "hardware/c906_memorymap.h"
 #include "hardware/c906_uart.h"
diff --git a/arch/risc-v/src/c906/c906_memorymap.h b/arch/risc-v/src/c906/c906_memorymap.h
index 39290ed9b8b..55b136bd88d 100644
--- a/arch/risc-v/src/c906/c906_memorymap.h
+++ b/arch/risc-v/src/c906/c906_memorymap.h
@@ -26,7 +26,6 @@
  ****************************************************************************/
 
 #include "riscv_internal.h"
-
 #include "hardware/c906_memorymap.h"
 #include "hardware/c906_uart.h"
 #include "hardware/c906_clint.h"
diff --git a/arch/risc-v/src/c906/c906_serial.c b/arch/risc-v/src/c906/c906_serial.c
index 94df3e5b8a3..e274c85ad06 100644
--- a/arch/risc-v/src/c906/c906_serial.c
+++ b/arch/risc-v/src/c906/c906_serial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "c906_config.h"
 #include "chip.h"
 #include "c906.h"
diff --git a/arch/risc-v/src/c906/c906_start.c b/arch/risc-v/src/c906/c906_start.c
index 0248374b788..6f2868320c3 100644
--- a/arch/risc-v/src/c906/c906_start.c
+++ b/arch/risc-v/src/c906/c906_start.c
@@ -28,7 +28,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "c906_clockconfig.h"
 #include "c906_userspace.h"
 #include "c906.h"
diff --git a/arch/risc-v/src/c906/c906_timerisr.c b/arch/risc-v/src/c906/c906_timerisr.c
index 39b6516f796..8fb9ce57a5e 100644
--- a/arch/risc-v/src/c906/c906_timerisr.c
+++ b/arch/risc-v/src/c906/c906_timerisr.c
@@ -32,8 +32,7 @@
 #include <nuttx/spinlock.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "c906.h"
 #include "c906_clockconfig.h"
 
diff --git a/arch/risc-v/src/common/riscv_allocateheap.c b/arch/risc-v/src/common/riscv_allocateheap.c
index a896adb0d15..7e88b8f8f39 100644
--- a/arch/risc-v/src/common/riscv_allocateheap.c
+++ b/arch/risc-v/src/common/riscv_allocateheap.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_arch.h b/arch/risc-v/src/common/riscv_arch.h
deleted file mode 100644
index a591f9e08c7..00000000000
--- a/arch/risc-v/src/common/riscv_arch.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- * arch/risc-v/src/common/riscv_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef ___ARCH_RISCV_SRC_COMMON_RISCV_ARCH_H
-#define ___ARCH_RISCV_SRC_COMMON_RISCV_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-# define getreg64(a)          (*(volatile uint64_t *)(a))
-# define putreg64(v,a)        (*(volatile uint64_t *)(a) = (v))
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg32(uintptr_t addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_RISCV_SRC_COMMON_RISCV_ARCH_H */
diff --git a/arch/risc-v/src/common/riscv_assert.c b/arch/risc-v/src/common/riscv_assert.c
index 88fefc0f02b..d0c0416241d 100644
--- a/arch/risc-v/src/common/riscv_assert.c
+++ b/arch/risc-v/src/common/riscv_assert.c
@@ -41,8 +41,6 @@
 
 #include "sched/sched.h"
 #include "irq/irq.h"
-
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_backtrace.c b/arch/risc-v/src/common/riscv_backtrace.c
index 1c9d4fa76bb..890e3cb9c2a 100644
--- a/arch/risc-v/src/common/riscv_backtrace.c
+++ b/arch/risc-v/src/common/riscv_backtrace.c
@@ -25,7 +25,6 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 #include "sched/sched.h"
-
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_cpuindex.c b/arch/risc-v/src/common/riscv_cpuindex.c
index 3b28d900e5b..321827a6ac9 100644
--- a/arch/risc-v/src/common/riscv_cpuindex.c
+++ b/arch/risc-v/src/common/riscv_cpuindex.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <nuttx/arch.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/risc-v/src/common/riscv_cpupause.c b/arch/risc-v/src/common/riscv_cpupause.c
index 10d22bdc4a1..b00646a0447 100644
--- a/arch/risc-v/src/common/riscv_cpupause.c
+++ b/arch/risc-v/src/common/riscv_cpupause.c
@@ -34,7 +34,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
-#include "riscv_arch.h"
 #include "sched/sched.h"
 #include "riscv_internal.h"
 #include "chip.h"
diff --git a/arch/risc-v/src/common/riscv_cpustart.c b/arch/risc-v/src/common/riscv_cpustart.c
index 586d4ca327f..982e71cb4b6 100644
--- a/arch/risc-v/src/common/riscv_cpustart.c
+++ b/arch/risc-v/src/common/riscv_cpustart.c
@@ -35,7 +35,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
-#include "riscv_arch.h"
 #include "sched/sched.h"
 #include "init/init.h"
 #include "riscv_internal.h"
diff --git a/arch/risc-v/src/common/riscv_createstack.c b/arch/risc-v/src/common/riscv_createstack.c
index f387beca640..a5938561b1d 100644
--- a/arch/risc-v/src/common/riscv_createstack.c
+++ b/arch/risc-v/src/common/riscv_createstack.c
@@ -36,7 +36,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_doirq.c b/arch/risc-v/src/common/riscv_doirq.c
index 96613e8cae7..7e73a2b7403 100644
--- a/arch/risc-v/src/common/riscv_doirq.c
+++ b/arch/risc-v/src/common/riscv_doirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_exception.c b/arch/risc-v/src/common/riscv_exception.c
index 421e95aa886..1ffb3e2a1a2 100644
--- a/arch/risc-v/src/common/riscv_exception.c
+++ b/arch/risc-v/src/common/riscv_exception.c
@@ -35,7 +35,6 @@
 #include <nuttx/syslog/syslog.h>
 #include <arch/irq.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 static const char *g_reasons_str[RISCV_MAX_EXCEPTION + 1] =
diff --git a/arch/risc-v/src/common/riscv_fault.c b/arch/risc-v/src/common/riscv_fault.c
index 2fa51345793..86afecd9ecc 100644
--- a/arch/risc-v/src/common/riscv_fault.c
+++ b/arch/risc-v/src/common/riscv_fault.c
@@ -38,8 +38,6 @@
 
 #include "sched/sched.h"
 #include "irq/irq.h"
-
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_initialize.c b/arch/risc-v/src/common/riscv_initialize.c
index f7ebfe1e647..5c28680d373 100644
--- a/arch/risc-v/src/common/riscv_initialize.c
+++ b/arch/risc-v/src/common/riscv_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_initialstate.c b/arch/risc-v/src/common/riscv_initialstate.c
index 25addf5bee1..f83eeb3b248 100644
--- a/arch/risc-v/src/common/riscv_initialstate.c
+++ b/arch/risc-v/src/common/riscv_initialstate.c
@@ -32,8 +32,6 @@
 #include <arch/irq.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index f64216e7ac0..719d00f9fc4 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -107,6 +107,15 @@
 #define PMP_ACCESS_DENIED   (-1)    /* Access set and denied */
 #define PMP_ACCESS_FULL     (1)     /* Access set and allowed */
 
+#define getreg8(a)          (*(volatile uint8_t *)(a))
+#define putreg8(v,a)        (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)         (*(volatile uint16_t *)(a))
+#define putreg16(v,a)       (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)         (*(volatile uint32_t *)(a))
+#define putreg32(v,a)       (*(volatile uint32_t *)(a) = (v))
+#define getreg64(a)         (*(volatile uint64_t *)(a))
+#define putreg64(v,a)       (*(volatile uint64_t *)(a) = (v))
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -167,6 +176,9 @@ EXTERN uint32_t _etbss;           /* End+1 of .tbss */
   ***************************************************************************/
 
 #ifndef __ASSEMBLY__
+/* Atomic modification of registers */
+
+void modifyreg32(uintptr_t addr, uint32_t clearbits, uint32_t setbits);
 
 /* Memory allocation ********************************************************/
 
diff --git a/arch/risc-v/src/common/riscv_modifyreg32.c b/arch/risc-v/src/common/riscv_modifyreg32.c
index 9e56a9228aa..047dc5a87f9 100644
--- a/arch/risc-v/src/common/riscv_modifyreg32.c
+++ b/arch/risc-v/src/common/riscv_modifyreg32.c
@@ -29,7 +29,7 @@
 
 #include <nuttx/spinlock.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/risc-v/src/common/riscv_schedulesigaction.c b/arch/risc-v/src/common/riscv_schedulesigaction.c
index b3d1c262824..0c3e73a39c6 100644
--- a/arch/risc-v/src/common/riscv_schedulesigaction.c
+++ b/arch/risc-v/src/common/riscv_schedulesigaction.c
@@ -35,8 +35,6 @@
 
 #include "sched/sched.h"
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/risc-v/src/common/riscv_sigdeliver.c b/arch/risc-v/src/common/riscv_sigdeliver.c
index e9bea4940f3..153c3ecd0fb 100644
--- a/arch/risc-v/src/common/riscv_sigdeliver.c
+++ b/arch/risc-v/src/common/riscv_sigdeliver.c
@@ -38,8 +38,6 @@
 
 #include "sched/sched.h"
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/risc-v/src/esp32c3/esp32c3.h b/arch/risc-v/src/esp32c3/esp32c3.h
index a5f83c72362..af3c28dadb2 100644
--- a/arch/risc-v/src/esp32c3/esp32c3.h
+++ b/arch/risc-v/src/esp32c3/esp32c3.h
@@ -31,8 +31,8 @@
 #include <stdbool.h>
 
 #include <arch/irq.h>
+
 #include "riscv_internal.h"
-#include "riscv_arch.h"
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/esp32c3/esp32c3_adc.c b/arch/risc-v/src/esp32c3/esp32c3_adc.c
index fa374381e02..0a3e40a487f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_adc.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_adc.c
@@ -31,8 +31,7 @@
 
 #include <nuttx/semaphore.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "esp32c3.h"
 #include "esp32c3_gpio.h"
 #include "esp32c3_adc.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_aes.c b/arch/risc-v/src/esp32c3/esp32c3_aes.c
index 74588eb4834..699a6e854df 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_aes.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_aes.c
@@ -32,8 +32,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/crypto/crypto.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "esp32c3.h"
 #include "esp32c3_aes.h"
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_bignum.c b/arch/risc-v/src/esp32c3/esp32c3_bignum.c
index 6728ec4ffd7..c418854cde1 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_bignum.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_bignum.c
@@ -36,7 +36,7 @@
 #include <debug.h>
 #include <semaphore.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_rsa.h"
 #include "hardware/esp32c3_system.h"
 
@@ -1964,7 +1964,9 @@ int esp32c3_mpi_write_string(const struct esp32c3_mpi_s *X, int radix,
   if (radix == 16)
     {
       int c;
-      size_t i, j, k;
+      size_t i;
+      size_t j;
+      size_t k;
 
       for (i = X->n, k = 0; i > 0; i--)
         {
@@ -2146,8 +2148,11 @@ int esp32c3_mpi_write_binary(const struct esp32c3_mpi_s *X,
 int esp32c3_mpi_shift_l(struct esp32c3_mpi_s *X, size_t count)
 {
   int ret;
-  size_t i, v0, t1;
-  uint32_t r0 = 0, r1;
+  size_t i;
+  size_t v0;
+  size_t t1;
+  uint32_t r0 = 0;
+  uint32_t r1;
   DEBUGASSERT(X != NULL);
 
   v0 = count / (BIL);
@@ -2209,8 +2214,11 @@ cleanup:
 
 int esp32c3_mpi_shift_r(struct esp32c3_mpi_s *X, size_t count)
 {
-  size_t i, v0, v1;
-  uint32_t r0 = 0, r1;
+  size_t i;
+  size_t v0;
+  size_t v1;
+  uint32_t r0 = 0;
+  uint32_t r1;
   DEBUGASSERT(X != NULL);
 
   v0 = count /  BIL;
@@ -2274,7 +2282,9 @@ int esp32c3_mpi_shift_r(struct esp32c3_mpi_s *X, size_t count)
 int esp32c3_mpi_cmp_abs(const struct esp32c3_mpi_s *X,
                         const struct esp32c3_mpi_s *Y)
 {
-  size_t i, j;
+  size_t i;
+  size_t j;
+
   DEBUGASSERT(X != NULL);
   DEBUGASSERT(Y != NULL);
 
@@ -2345,7 +2355,8 @@ int esp32c3_mpi_cmp_abs(const struct esp32c3_mpi_s *X,
 int esp32c3_mpi_cmp_mpi(const struct esp32c3_mpi_s *X,
                         const struct esp32c3_mpi_s *Y)
 {
-  size_t i, j;
+  size_t i;
+  size_t j;
   DEBUGASSERT(X != NULL);
   DEBUGASSERT(Y != NULL);
 
@@ -2432,7 +2443,10 @@ int esp32c3_mpi_lt_mpi_ct(const struct esp32c3_mpi_s *X,
 
   /* The value of any of these variables is either 0 or 1 at all times. */
 
-  unsigned cond, done, x_is_negative, y_is_negative;
+  unsigned cond;
+  unsigned done;
+  unsigned x_is_negative;
+  unsigned y_is_negative;
 
   DEBUGASSERT(X != NULL);
   DEBUGASSERT(Y != NULL);
@@ -2545,8 +2559,13 @@ int esp32c3_mpi_add_abs(struct esp32c3_mpi_s *X,
                         const struct esp32c3_mpi_s *B)
 {
   int ret;
-  size_t i, j;
-  uint32_t *o, *p, c, tmp;
+  size_t i;
+  size_t j;
+  uint32_t *o;
+  uint32_t *p;
+  uint32_t c;
+  uint32_t tmp;
+
   DEBUGASSERT(X != NULL);
   DEBUGASSERT(A != NULL);
   DEBUGASSERT(B != NULL);
@@ -2709,7 +2728,8 @@ int esp32c3_mpi_add_mpi(struct esp32c3_mpi_s *X,
                         const struct esp32c3_mpi_s *A,
                         const struct esp32c3_mpi_s *B)
 {
-  int ret, s;
+  int ret;
+  int s;
   DEBUGASSERT(X != NULL);
   DEBUGASSERT(A != NULL);
   DEBUGASSERT(B != NULL);
@@ -2759,7 +2779,8 @@ int esp32c3_mpi_sub_mpi(struct esp32c3_mpi_s *X,
                         const struct esp32c3_mpi_s *A,
                         const struct esp32c3_mpi_s *B)
 {
-  int ret, s;
+  int ret;
+  int s;
   DEBUGASSERT(X != NULL);
   DEBUGASSERT(A != NULL);
   DEBUGASSERT(B != NULL);
@@ -3011,8 +3032,15 @@ int esp32c3_mpi_div_mpi(struct esp32c3_mpi_s *Q,
                         const struct esp32c3_mpi_s *B)
 {
   int ret;
-  size_t i, n, t, k;
-  struct esp32c3_mpi_s X, Y, Z, T1, T2;
+  size_t i;
+  size_t n;
+  size_t t;
+  size_t k;
+  struct esp32c3_mpi_s X;
+  struct esp32c3_mpi_s Y;
+  struct esp32c3_mpi_s Z;
+  struct esp32c3_mpi_s T1;
+  struct esp32c3_mpi_s T2;
   DEBUGASSERT(A != NULL);
   DEBUGASSERT(B != NULL);
 
@@ -3246,7 +3274,10 @@ int esp32c3_mpi_mod_int(uint32_t *r,
                         const struct esp32c3_mpi_s *A, int32_t b)
 {
   size_t i;
-  uint32_t x, y, z;
+  uint32_t x;
+  uint32_t y;
+  uint32_t z;
+
   DEBUGASSERT(r != NULL);
   DEBUGASSERT(A != NULL);
 
@@ -3330,11 +3361,21 @@ int esp32c3_mpi_exp_mod(struct esp32c3_mpi_s *X,
                         struct esp32c3_mpi_s *_RR)
 {
   int ret;
-  size_t wbits, wsize, one = 1;
-  size_t i, j, nblimbs;
-  size_t bufsize, nbits;
-  uint32_t ei, mm, state;
-  struct esp32c3_mpi_s RR, T, W[1 << ESP32C3_MPI_WINDOW_SIZE], apos;
+  size_t wbits;
+  size_t wsize;
+  size_t one = 1;
+  size_t i;
+  size_t j;
+  size_t nblimbs;
+  size_t bufsize;
+  size_t nbits;
+  uint32_t ei;
+  uint32_t mm;
+  uint32_t state;
+  struct esp32c3_mpi_s RR;
+  struct esp32c3_mpi_s T;
+  struct esp32c3_mpi_s W[1 << ESP32C3_MPI_WINDOW_SIZE];
+  struct esp32c3_mpi_s apos;
   int neg;
 
   DEBUGASSERT(X != NULL);
@@ -3581,8 +3622,11 @@ int esp32c3_mpi_gcd(struct esp32c3_mpi_s *G,
                     const struct esp32c3_mpi_s *B)
 {
   int ret;
-  size_t lz, lzt;
-  struct esp32c3_mpi_s TG, TA, TB;
+  size_t lz;
+  size_t lzt;
+  struct esp32c3_mpi_s TG;
+  struct esp32c3_mpi_s TA;
+  struct esp32c3_mpi_s TB;
 
   DEBUGASSERT(G != NULL);
   DEBUGASSERT(A != NULL);
@@ -3705,7 +3749,16 @@ int esp32c3_mpi_inv_mod(struct esp32c3_mpi_s *X,
                         const struct esp32c3_mpi_s *N)
 {
   int ret;
-  struct esp32c3_mpi_s G, TA, TU, U1, U2, TB, TV, V1, V2;
+  struct esp32c3_mpi_s G;
+  struct esp32c3_mpi_s TA;
+  struct esp32c3_mpi_s TU;
+  struct esp32c3_mpi_s U1;
+  struct esp32c3_mpi_s U2;
+  struct esp32c3_mpi_s TB;
+  struct esp32c3_mpi_s TV;
+  struct esp32c3_mpi_s V1;
+  struct esp32c3_mpi_s V2;
+
   DEBUGASSERT(X != NULL);
   DEBUGASSERT(A != NULL);
   DEBUGASSERT(N != NULL);
diff --git a/arch/risc-v/src/esp32c3/esp32c3_clockconfig.c b/arch/risc-v/src/esp32c3/esp32c3_clockconfig.c
index b4cff433dd1..c68703d458e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_clockconfig.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_clockconfig.c
@@ -31,8 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/esp32c3_system.h"
 
 #include "esp32c3.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_dma.c b/arch/risc-v/src/esp32c3/esp32c3_dma.c
index 6c9c18caeed..4aa2b9dc1b9 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_dma.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_dma.c
@@ -35,8 +35,7 @@
 #include <nuttx/kmalloc.h>
 #include <arch/irq.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "esp32c3_dma.h"
 
 #include "hardware/esp32c3_dma.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_efuse.c b/arch/risc-v/src/esp32c3/esp32c3_efuse.c
index c44b0ed7d8c..d1793337ffd 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_efuse.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_efuse.c
@@ -29,7 +29,7 @@
 #include <nuttx/efuse/efuse.h>
 #include <arch/esp32c3/chip.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_soc.h"
 #include "hardware/esp32c3_efuse.h"
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_gpio.c b/arch/risc-v/src/esp32c3/esp32c3_gpio.c
index e2200a42acf..d8878817fdb 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_gpio.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_gpio.c
@@ -34,7 +34,7 @@
 #include <arch/irq.h>
 #include <arch/esp32c3/chip.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "esp32c3_irq.h"
 #include "hardware/esp32c3_iomux.h"
 #include "hardware/esp32c3_gpio.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_i2c.c b/arch/risc-v/src/esp32c3/esp32c3_i2c.c
index 1fbd8bb7a89..7621caf437d 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_i2c.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_i2c.c
@@ -48,8 +48,7 @@
 #include "esp32c3_i2c.h"
 #include "esp32c3_irq.h"
 #include "esp32c3_gpio.h"
-
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_gpio_sigmap.h"
 #include "hardware/esp32c3_i2c.h"
 #include "hardware/esp32c3_soc.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_ledc.c b/arch/risc-v/src/esp32c3/esp32c3_ledc.c
index 2d265bbad73..6308bbbaea1 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ledc.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_ledc.c
@@ -34,8 +34,7 @@
 #include "esp32c3_clockconfig.h"
 #include "esp32c3_gpio.h"
 #include "esp32c3_ledc.h"
-
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_ledc.h"
 #include "hardware/esp32c3_system.h"
 #include "hardware/esp32c3_gpio_sigmap.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_lowputc.c b/arch/risc-v/src/esp32c3/esp32c3_lowputc.c
index 69683419c90..a6488474083 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_lowputc.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_lowputc.c
@@ -36,8 +36,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/esp32c3_system.h"
 #include "hardware/esp32c3_uart.h"
 #include "hardware/esp32c3_soc.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_pm.c b/arch/risc-v/src/esp32c3/esp32c3_pm.c
index 82ac9b7e9ee..a88b608ca16 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_pm.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_pm.c
@@ -38,8 +38,7 @@
 #include <sys/types.h>
 
 #include "chip.h"
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/esp32c3_rtccntl.h"
 #include "hardware/esp32c3_system.h"
 #include "hardware/esp32c3_syscon.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rng.c b/arch/risc-v/src/esp32c3/esp32c3_rng.c
index 383e006e789..2e04709c249 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rng.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_rng.c
@@ -36,7 +36,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "esp32c3_attr.h"
 #include "hardware/wdev_reg.h"
 #include "esp32c3_clockconfig.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rsa.c b/arch/risc-v/src/esp32c3/esp32c3_rsa.c
index f88d92a15fc..bb17e682439 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rsa.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_rsa.c
@@ -34,7 +34,7 @@
 #include <debug.h>
 #include <semaphore.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "esp32c3_rsa.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc.c b/arch/risc-v/src/esp32c3/esp32c3_rtc.c
index a31bacccc2a..3f90a617103 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_rtc.c
@@ -30,9 +30,7 @@
 #include <nuttx/spinlock.h>
 
 #include "clock/clock.h"
-
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/esp32c3_rtccntl.h"
 #include "hardware/esp32c3_soc.h"
 #include "hardware/esp32c3_system.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_serial.c b/arch/risc-v/src/esp32c3/esp32c3_serial.c
index 2a462d8c9f1..f72fae83c7f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_serial.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_serial.c
@@ -42,7 +42,6 @@
 #endif
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
 #include "chip.h"
 
 #include "hardware/esp32c3_uart.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_sha.c b/arch/risc-v/src/esp32c3/esp32c3_sha.c
index 6e800df320e..15c0a3129c0 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_sha.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_sha.c
@@ -34,7 +34,7 @@
 #include <debug.h>
 #include <semaphore.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_sha.h"
 #include "hardware/esp32c3_system.h"
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spi.c b/arch/risc-v/src/esp32c3/esp32c3_spi.c
index 99b7840f6df..209589db70e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spi.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_spi.c
@@ -51,7 +51,7 @@
 #include "esp32c3_dma.h"
 #endif
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_gpio_sigmap.h"
 #include "hardware/esp32c3_pinmap.h"
 #include "hardware/esp32c3_spi.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spi_slave.c b/arch/risc-v/src/esp32c3/esp32c3_spi_slave.c
index 2da911be5b4..008fdd41164 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spi_slave.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_spi_slave.c
@@ -51,7 +51,7 @@
 #include "esp32c3_dma.h"
 #endif
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_gpio_sigmap.h"
 #include "hardware/esp32c3_pinmap.h"
 #include "hardware/esp32c3_spi.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_tim.c b/arch/risc-v/src/esp32c3/esp32c3_tim.c
index f00c6e1cf8b..7b2dbac5057 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_tim.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_tim.c
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_tim.h"
 
 #include "esp32c3_tim.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_usbserial.c b/arch/risc-v/src/esp32c3/esp32c3_usbserial.c
index 776c98a5aba..340a0b76843 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_usbserial.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_usbserial.c
@@ -40,8 +40,7 @@
 #include <nuttx/serial/serial.h>
 #include <arch/irq.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/esp32c3_soc.h"
 #include "hardware/esp32c3_system.h"
 #include "hardware/esp32c3_usb_serial_jtag.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wdt.c b/arch/risc-v/src/esp32c3/esp32c3_wdt.c
index c40070fcbe0..9adf8a345cb 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wdt.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wdt.c
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_rtccntl.h"
 #include "hardware/esp32c3_tim.h"
 #include "hardware/esp32c3_efuse.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c b/arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c
index 147f77a8ba5..a92b5de22ec 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c
@@ -35,7 +35,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/timers/watchdog.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/esp32c3_soc.h"
 #include "esp32c3_wdt.h"
 #include "esp32c3_wdt_lowerhalf.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wireless.c b/arch/risc-v/src/esp32c3/esp32c3_wireless.c
index 85385c98782..ebc6d4a8cf2 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wireless.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wireless.c
@@ -29,7 +29,6 @@
 #include <debug.h>
 
 #include "riscv_internal.h"
-
 #include "hardware/esp32c3_system.h"
 #include "hardware/esp32c3_soc.h"
 #include "hardware/esp32c3_syscon.h"
diff --git a/arch/risc-v/src/fe310/fe310_clockconfig.c b/arch/risc-v/src/fe310/fe310_clockconfig.c
index 98bd53c5ba4..d5cf551235d 100644
--- a/arch/risc-v/src/fe310/fe310_clockconfig.c
+++ b/arch/risc-v/src/fe310/fe310_clockconfig.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "fe310_clockconfig.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/fe310/fe310_gpio.c b/arch/risc-v/src/fe310/fe310_gpio.c
index 41165969cc3..1fd698cbdf4 100644
--- a/arch/risc-v/src/fe310/fe310_gpio.c
+++ b/arch/risc-v/src/fe310/fe310_gpio.c
@@ -32,7 +32,7 @@
 #include <nuttx/spinlock.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "fe310_gpio.h"
 #include "fe310_memorymap.h"
 
diff --git a/arch/risc-v/src/fe310/fe310_irq.c b/arch/risc-v/src/fe310/fe310_irq.c
index 5200f75513a..c5d48043894 100644
--- a/arch/risc-v/src/fe310/fe310_irq.c
+++ b/arch/risc-v/src/fe310/fe310_irq.c
@@ -36,8 +36,6 @@
 #include <arch/csr.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "fe310.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/fe310/fe310_irq_dispatch.c b/arch/risc-v/src/fe310/fe310_irq_dispatch.c
index 1053c44a1a2..906594d8c0b 100644
--- a/arch/risc-v/src/fe310/fe310_irq_dispatch.c
+++ b/arch/risc-v/src/fe310/fe310_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "fe310_gpio.h"
 #include "fe310.h"
 
diff --git a/arch/risc-v/src/fe310/fe310_lowputc.c b/arch/risc-v/src/fe310/fe310_lowputc.c
index c4b7b678cda..20a0127bdb2 100644
--- a/arch/risc-v/src/fe310/fe310_lowputc.c
+++ b/arch/risc-v/src/fe310/fe310_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "fe310_config.h"
 #include "hardware/fe310_memorymap.h"
 #include "hardware/fe310_uart.h"
diff --git a/arch/risc-v/src/fe310/fe310_memorymap.h b/arch/risc-v/src/fe310/fe310_memorymap.h
index c90e45b5b44..85a22f00955 100644
--- a/arch/risc-v/src/fe310/fe310_memorymap.h
+++ b/arch/risc-v/src/fe310/fe310_memorymap.h
@@ -26,7 +26,6 @@
  ****************************************************************************/
 
 #include "riscv_internal.h"
-
 #include "hardware/fe310_memorymap.h"
 #include "hardware/fe310_uart.h"
 #include "hardware/fe310_clint.h"
diff --git a/arch/risc-v/src/fe310/fe310_serial.c b/arch/risc-v/src/fe310/fe310_serial.c
index 6f1ec2b45b7..c7583185bd3 100644
--- a/arch/risc-v/src/fe310/fe310_serial.c
+++ b/arch/risc-v/src/fe310/fe310_serial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "fe310_config.h"
 #include "chip.h"
 #include "fe310.h"
diff --git a/arch/risc-v/src/fe310/fe310_timerisr.c b/arch/risc-v/src/fe310/fe310_timerisr.c
index 3f5b25c78df..5d198fc7aee 100644
--- a/arch/risc-v/src/fe310/fe310_timerisr.c
+++ b/arch/risc-v/src/fe310/fe310_timerisr.c
@@ -33,8 +33,7 @@
 #include <nuttx/spinlock.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "fe310.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/k210/k210_clockconfig.c b/arch/risc-v/src/k210/k210_clockconfig.c
index 0eb331023fb..3da5b18fb98 100644
--- a/arch/risc-v/src/k210/k210_clockconfig.c
+++ b/arch/risc-v/src/k210/k210_clockconfig.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "k210_clockconfig.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/k210/k210_fpioa.c b/arch/risc-v/src/k210/k210_fpioa.c
index bb71863da84..9c178b92632 100644
--- a/arch/risc-v/src/k210/k210_fpioa.c
+++ b/arch/risc-v/src/k210/k210_fpioa.c
@@ -28,8 +28,6 @@
 #include <debug.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "k210_memorymap.h"
 #include "k210_fpioa.h"
 
diff --git a/arch/risc-v/src/k210/k210_gpiohs.c b/arch/risc-v/src/k210/k210_gpiohs.c
index 5857e4c9a76..5d29465420f 100644
--- a/arch/risc-v/src/k210/k210_gpiohs.c
+++ b/arch/risc-v/src/k210/k210_gpiohs.c
@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "k210_memorymap.h"
 #include "k210_gpiohs.h"
 
diff --git a/arch/risc-v/src/k210/k210_irq.c b/arch/risc-v/src/k210/k210_irq.c
index 381cde7ce70..79abac3c9b4 100644
--- a/arch/risc-v/src/k210/k210_irq.c
+++ b/arch/risc-v/src/k210/k210_irq.c
@@ -34,8 +34,6 @@
 #include <arch/csr.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "k210.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/k210/k210_irq_dispatch.c b/arch/risc-v/src/k210/k210_irq_dispatch.c
index bba85e13a36..5c152dc8f26 100644
--- a/arch/risc-v/src/k210/k210_irq_dispatch.c
+++ b/arch/risc-v/src/k210/k210_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/k210/k210_lowputc.c b/arch/risc-v/src/k210/k210_lowputc.c
index a87824e7695..b8504c239b2 100644
--- a/arch/risc-v/src/k210/k210_lowputc.c
+++ b/arch/risc-v/src/k210/k210_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "k210_config.h"
 #include "hardware/k210_memorymap.h"
 #include "hardware/k210_uart.h"
diff --git a/arch/risc-v/src/k210/k210_memorymap.h b/arch/risc-v/src/k210/k210_memorymap.h
index 6a977f7e907..0b49d46ac31 100644
--- a/arch/risc-v/src/k210/k210_memorymap.h
+++ b/arch/risc-v/src/k210/k210_memorymap.h
@@ -26,7 +26,6 @@
  ****************************************************************************/
 
 #include "riscv_internal.h"
-
 #include "hardware/k210_memorymap.h"
 #include "hardware/k210_uart.h"
 #include "hardware/k210_clint.h"
diff --git a/arch/risc-v/src/k210/k210_serial.c b/arch/risc-v/src/k210/k210_serial.c
index cb707e46091..b38a81eaf6a 100644
--- a/arch/risc-v/src/k210/k210_serial.c
+++ b/arch/risc-v/src/k210/k210_serial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "k210_config.h"
 #include "chip.h"
 #include "k210.h"
diff --git a/arch/risc-v/src/k210/k210_start.c b/arch/risc-v/src/k210/k210_start.c
index 51993e8fa86..4f4093fd7b0 100644
--- a/arch/risc-v/src/k210/k210_start.c
+++ b/arch/risc-v/src/k210/k210_start.c
@@ -28,7 +28,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "k210_clockconfig.h"
 #include "k210_userspace.h"
 #include "k210.h"
diff --git a/arch/risc-v/src/k210/k210_timerisr.c b/arch/risc-v/src/k210/k210_timerisr.c
index 4a3e8f6d21e..a5577c53b3b 100644
--- a/arch/risc-v/src/k210/k210_timerisr.c
+++ b/arch/risc-v/src/k210/k210_timerisr.c
@@ -32,8 +32,7 @@
 #include <nuttx/spinlock.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "k210.h"
 #include "k210_clockconfig.h"
 
diff --git a/arch/risc-v/src/litex/litex_clockconfig.c b/arch/risc-v/src/litex/litex_clockconfig.c
index 05ece91836b..00bc573e888 100644
--- a/arch/risc-v/src/litex/litex_clockconfig.c
+++ b/arch/risc-v/src/litex/litex_clockconfig.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "litex_clockconfig.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/litex/litex_irq.c b/arch/risc-v/src/litex/litex_irq.c
index cde519495f3..3f9319da7cd 100644
--- a/arch/risc-v/src/litex/litex_irq.c
+++ b/arch/risc-v/src/litex/litex_irq.c
@@ -36,8 +36,6 @@
 #include <arch/csr.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "litex.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/litex/litex_irq_dispatch.c b/arch/risc-v/src/litex/litex_irq_dispatch.c
index c29a87a1580..1a4fe4a0df4 100644
--- a/arch/risc-v/src/litex/litex_irq_dispatch.c
+++ b/arch/risc-v/src/litex/litex_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "litex.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/litex/litex_lowputc.c b/arch/risc-v/src/litex/litex_lowputc.c
index c9be996c826..9d727753eef 100644
--- a/arch/risc-v/src/litex/litex_lowputc.c
+++ b/arch/risc-v/src/litex/litex_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "litex_config.h"
 #include "hardware/litex_memorymap.h"
 #include "hardware/litex_uart.h"
diff --git a/arch/risc-v/src/litex/litex_serial.c b/arch/risc-v/src/litex/litex_serial.c
index 8345e224e8b..5e70282be25 100644
--- a/arch/risc-v/src/litex/litex_serial.c
+++ b/arch/risc-v/src/litex/litex_serial.c
@@ -39,9 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "litex_config.h"
 #include "chip.h"
 #include "litex.h"
diff --git a/arch/risc-v/src/litex/litex_timerisr.c b/arch/risc-v/src/litex/litex_timerisr.c
index f4138b2fb50..643b04f66b1 100644
--- a/arch/risc-v/src/litex/litex_timerisr.c
+++ b/arch/risc-v/src/litex/litex_timerisr.c
@@ -33,8 +33,7 @@
 #include <nuttx/spinlock.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "litex.h"
 #include "litex_clockconfig.h"
 
diff --git a/arch/risc-v/src/mpfs/mpfs_cache.c b/arch/risc-v/src/mpfs/mpfs_cache.c
index af8cf7322f0..4fba86c58a1 100755
--- a/arch/risc-v/src/mpfs/mpfs_cache.c
+++ b/arch/risc-v/src/mpfs/mpfs_cache.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 #include <arch/board/board_liberodefs.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/mpfs_cache.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/mpfs/mpfs_clockconfig.c b/arch/risc-v/src/mpfs/mpfs_clockconfig.c
index ea5bc1968f7..5587351eeb5 100755
--- a/arch/risc-v/src/mpfs/mpfs_clockconfig.c
+++ b/arch/risc-v/src/mpfs/mpfs_clockconfig.c
@@ -33,7 +33,7 @@
 #include <arch/board/board_liberodefs.h>
 
 #include "mpfs_clockconfig.h"
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/mpfs_sysreg.h"
 #include "hardware/mpfs_sgmii.h"
 
diff --git a/arch/risc-v/src/mpfs/mpfs_corepwm.c b/arch/risc-v/src/mpfs/mpfs_corepwm.c
index 51554f4e53b..7ec4ae48c99 100644
--- a/arch/risc-v/src/mpfs/mpfs_corepwm.c
+++ b/arch/risc-v/src/mpfs/mpfs_corepwm.c
@@ -43,8 +43,7 @@
 #include <arch/board/board.h>
 
 #include "hardware/mpfs_corepwm.h"
-
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/mpfs/mpfs_ddr.c b/arch/risc-v/src/mpfs/mpfs_ddr.c
index f2894d7df54..a18950c29fe 100644
--- a/arch/risc-v/src/mpfs/mpfs_ddr.c
+++ b/arch/risc-v/src/mpfs/mpfs_ddr.c
@@ -43,7 +43,7 @@
 #include <arch/board/board.h>
 #include <arch/board/board_liberodefs.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "mpfs_dma.h"
 #include "hardware/mpfs_sysreg.h"
 #include "hardware/mpfs_ddr.h"
@@ -2540,7 +2540,8 @@ static void mpfs_ddr_manual_addcmd_training(struct mpfs_ddr_priv_s *priv)
         {
           uint32_t transition_a5_max = 0;
           uint32_t transition_a5_min = 128;
-          uint32_t rx_a5_last, rx_a5;
+          uint32_t rx_a5_last;
+          uint32_t rx_a5;
           uint32_t transition_a5;
           uint32_t range_a5 = 0;
 
diff --git a/arch/risc-v/src/mpfs/mpfs_dma.c b/arch/risc-v/src/mpfs/mpfs_dma.c
index d2454c5ce47..d7526d482f9 100755
--- a/arch/risc-v/src/mpfs/mpfs_dma.c
+++ b/arch/risc-v/src/mpfs/mpfs_dma.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/mpfs_dma.h"
 #include "mpfs_dma.h"
 
diff --git a/arch/risc-v/src/mpfs/mpfs_emmcsd.c b/arch/risc-v/src/mpfs/mpfs_emmcsd.c
index f0d7c314396..684f91c37f0 100755
--- a/arch/risc-v/src/mpfs/mpfs_emmcsd.c
+++ b/arch/risc-v/src/mpfs/mpfs_emmcsd.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "mpfs_emmcsd.h"
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/mpfs_emmcsd.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/mpfs/mpfs_gpio.c b/arch/risc-v/src/mpfs/mpfs_gpio.c
index 797e5a7a7f5..45f324e6b29 100644
--- a/arch/risc-v/src/mpfs/mpfs_gpio.c
+++ b/arch/risc-v/src/mpfs/mpfs_gpio.c
@@ -24,8 +24,7 @@
 
 #include <stdint.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/mpfs_gpio.h"
 #include "mpfs_gpio.h"
 
diff --git a/arch/risc-v/src/mpfs/mpfs_i2c.c b/arch/risc-v/src/mpfs/mpfs_i2c.c
index 74886fff81e..e9a7f2ce64d 100755
--- a/arch/risc-v/src/mpfs/mpfs_i2c.c
+++ b/arch/risc-v/src/mpfs/mpfs_i2c.c
@@ -43,8 +43,7 @@
 #include <arch/board/board.h>
 
 #include "mpfs_i2c.h"
-
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "hardware/mpfs_i2c.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/mpfs/mpfs_irq.c b/arch/risc-v/src/mpfs/mpfs_irq.c
index af9377e2aee..723d7fa09b5 100755
--- a/arch/risc-v/src/mpfs/mpfs_irq.c
+++ b/arch/risc-v/src/mpfs/mpfs_irq.c
@@ -34,8 +34,6 @@
 #include <arch/csr.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "mpfs.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c b/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
index c540b0e746c..1cc05c11391 100755
--- a/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
+++ b/arch/risc-v/src/mpfs/mpfs_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "group/group.h"
 #include "hardware/mpfs_memorymap.h"
 #include "hardware/mpfs_plic.h"
diff --git a/arch/risc-v/src/mpfs/mpfs_lowputc.c b/arch/risc-v/src/mpfs/mpfs_lowputc.c
index 4385b707854..93dede2fd4a 100755
--- a/arch/risc-v/src/mpfs/mpfs_lowputc.c
+++ b/arch/risc-v/src/mpfs/mpfs_lowputc.c
@@ -29,8 +29,6 @@
 #include <arch/board/board.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "hardware/mpfs_memorymap.h"
 #include "hardware/mpfs_uart.h"
 #include "mpfs.h"
diff --git a/arch/risc-v/src/mpfs/mpfs_memorymap.h b/arch/risc-v/src/mpfs/mpfs_memorymap.h
index 3aa62204534..4b1026254f6 100755
--- a/arch/risc-v/src/mpfs/mpfs_memorymap.h
+++ b/arch/risc-v/src/mpfs/mpfs_memorymap.h
@@ -26,7 +26,6 @@
  ****************************************************************************/
 
 #include "riscv_internal.h"
-
 #include "hardware/mpfs_clint.h"
 #include "hardware/mpfs_memorymap.h"
 #include "hardware/mpfs_plic.h"
diff --git a/arch/risc-v/src/mpfs/mpfs_serial.c b/arch/risc-v/src/mpfs/mpfs_serial.c
index 051a03b7227..c0dbdc09e84 100755
--- a/arch/risc-v/src/mpfs/mpfs_serial.c
+++ b/arch/risc-v/src/mpfs/mpfs_serial.c
@@ -48,7 +48,6 @@
 #include "mpfs.h"
 #include "mpfs_config.h"
 #include "mpfs_clockconfig.h"
-#include "riscv_arch.h"
 #include "riscv_internal.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/mpfs/mpfs_spi.c b/arch/risc-v/src/mpfs/mpfs_spi.c
index 2601b098872..66ba550d82b 100644
--- a/arch/risc-v/src/mpfs/mpfs_spi.c
+++ b/arch/risc-v/src/mpfs/mpfs_spi.c
@@ -43,7 +43,7 @@
 #include "mpfs_spi.h"
 #include "hardware/mpfs_spi.h"
 #include "hardware/mpfs_sysreg.h"
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/mpfs/mpfs_start.c b/arch/risc-v/src/mpfs/mpfs_start.c
index 398659da74f..0dfc5b876bc 100755
--- a/arch/risc-v/src/mpfs/mpfs_start.c
+++ b/arch/risc-v/src/mpfs/mpfs_start.c
@@ -34,7 +34,7 @@
 #include "mpfs_ddr.h"
 #include "mpfs_cache.h"
 #include "mpfs_userspace.h"
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/mpfs/mpfs_systemreset.c b/arch/risc-v/src/mpfs/mpfs_systemreset.c
index 6ad6aff0242..26478a519d9 100644
--- a/arch/risc-v/src/mpfs/mpfs_systemreset.c
+++ b/arch/risc-v/src/mpfs/mpfs_systemreset.c
@@ -29,7 +29,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include <riscv_arch.h>
+#include "riscv_internal.h"
 #include "hardware/mpfs_memorymap.h"
 #include "hardware/mpfs_sysreg.h"
 
diff --git a/arch/risc-v/src/mpfs/mpfs_timerisr.c b/arch/risc-v/src/mpfs/mpfs_timerisr.c
index 596ee85f9b8..8dcf514b1b4 100755
--- a/arch/risc-v/src/mpfs/mpfs_timerisr.c
+++ b/arch/risc-v/src/mpfs/mpfs_timerisr.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 #include <nuttx/spinlock.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "mpfs.h"
 #include "mpfs_clockconfig.h"
 
diff --git a/arch/risc-v/src/mpfs/mpfs_usb.c b/arch/risc-v/src/mpfs/mpfs_usb.c
index 96229ee6a51..81c46dce09f 100755
--- a/arch/risc-v/src/mpfs/mpfs_usb.c
+++ b/arch/risc-v/src/mpfs/mpfs_usb.c
@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "hardware/mpfs_usb.h"
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_irq.c b/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
index 1a7dce13752..bed45b901f6 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_irq.c
@@ -36,8 +36,6 @@
 #include <arch/csr.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c b/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
index 22f44eae467..670aca4869e 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "hardware/qemu_rv_memorymap.h"
 #include "hardware/qemu_rv_plic.h"
 
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_start.c b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
index d4ee0031f36..9e612e51449 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_start.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
@@ -29,7 +29,6 @@
 #include <arch/board/board.h>
 
 #include "riscv_internal.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_timerisr.c b/arch/risc-v/src/qemu-rv/qemu_rv_timerisr.c
index 11c30104a46..a5bd062e6e9 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_timerisr.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_timerisr.c
@@ -33,8 +33,7 @@
 #include <nuttx/spinlock.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "hardware/qemu_rv_memorymap.h"
 #include "hardware/qemu_rv_clint.h"
 
diff --git a/arch/risc-v/src/rv32m1/rv32m1_clockconfig.c b/arch/risc-v/src/rv32m1/rv32m1_clockconfig.c
index d11b4852f6b..af533aa5320 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_clockconfig.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_clockconfig.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "chip.h"
 #include "hardware/rv32m1_scg.h"
 #include "hardware/rv32m1_smc.h"
diff --git a/arch/risc-v/src/rv32m1/rv32m1_gpio.c b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
index 6be8e9c020d..1901daa0885 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_gpio.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
@@ -35,7 +35,7 @@
 
 #include <nuttx/kmalloc.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "chip.h"
 #include "hardware/rv32m1_port.h"
 #include "hardware/rv32m1_gpio.h"
diff --git a/arch/risc-v/src/rv32m1/rv32m1_irq.c b/arch/risc-v/src/rv32m1/rv32m1_irq.c
index 639cbc02520..241465a478a 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_irq.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_irq.c
@@ -35,8 +35,6 @@
 #include <arch/csr.h>
 
 #include "riscv_internal.h"
-#include "riscv_arch.h"
-
 #include "rv32m1.h"
 #include "hardware/rv32m1_eu.h"
 
diff --git a/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c b/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c
index a5b50a6dc73..e5bf557de95 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "rv32m1.h"
 #include "hardware/rv32m1_eu.h"
 
diff --git a/arch/risc-v/src/rv32m1/rv32m1_pcc.c b/arch/risc-v/src/rv32m1/rv32m1_pcc.c
index 3eafb17a72d..cdb8c31de13 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_pcc.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_pcc.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "rv32m1_pcc.h"
 
 /****************************************************************************
diff --git a/arch/risc-v/src/rv32m1/rv32m1_serial.c b/arch/risc-v/src/rv32m1/rv32m1_serial.c
index c7cb8a177a0..5f96388a385 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_serial.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_serial.c
@@ -43,9 +43,7 @@
 
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
 #include "riscv_internal.h"
-
 #include "chip.h"
 #include "rv32m1.h"
 #include "rv32m1_uart.h"
diff --git a/arch/risc-v/src/rv32m1/rv32m1_start.c b/arch/risc-v/src/rv32m1/rv32m1_start.c
index 2bf59f0f0d1..02f0e1f3587 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_start.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_start.c
@@ -29,7 +29,7 @@
 #include <nuttx/init.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "rv32m1_clockconfig.h"
 #include "rv32m1.h"
 #include "rv32m1_gpio.h"
diff --git a/arch/risc-v/src/rv32m1/rv32m1_timerisr.c b/arch/risc-v/src/rv32m1/rv32m1_timerisr.c
index 044dc8409fc..60607b1efbe 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_timerisr.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_timerisr.c
@@ -32,8 +32,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "rv32m1.h"
 #include "hardware/rv32m1_lptmr.h"
 
diff --git a/arch/risc-v/src/rv32m1/rv32m1_timersvc.c b/arch/risc-v/src/rv32m1/rv32m1_timersvc.c
index 4f90e60876b..c26f89fca47 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_timersvc.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_timersvc.c
@@ -25,8 +25,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "riscv_arch.h"
-
+#include "riscv_internal.h"
 #include "rv32m1.h"
 #include "hardware/rv32m1_tstmr.h"
 #include "rv32m1_timersvc.h"
diff --git a/arch/sparc/src/bm3803/bm3803-irq.c b/arch/sparc/src/bm3803/bm3803-irq.c
index cb5ae27254f..148f25ea4eb 100644
--- a/arch/sparc/src/bm3803/bm3803-irq.c
+++ b/arch/sparc/src/bm3803/bm3803-irq.c
@@ -34,9 +34,7 @@
 
 #include <arch/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "bm3803.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/bm3803/bm3803-lowconsole.c b/arch/sparc/src/bm3803/bm3803-lowconsole.c
index 1e090d88c84..4b29dc0d12a 100644
--- a/arch/sparc/src/bm3803/bm3803-lowconsole.c
+++ b/arch/sparc/src/bm3803/bm3803-lowconsole.c
@@ -32,7 +32,6 @@
 
 #include <arch/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "bm3803-uart.h"
 #include "bm3803.h"
diff --git a/arch/sparc/src/bm3803/bm3803-serial.c b/arch/sparc/src/bm3803/bm3803-serial.c
index 81216543ec1..c73bcb26790 100644
--- a/arch/sparc/src/bm3803/bm3803-serial.c
+++ b/arch/sparc/src/bm3803/bm3803-serial.c
@@ -44,9 +44,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "bm3803-config.h"
 #include "chip.h"
 #include "bm3803-uart.h"
diff --git a/arch/sparc/src/bm3803/bm3803-timerisr.c b/arch/sparc/src/bm3803/bm3803-timerisr.c
index d5845366e9b..f0c453efb0b 100644
--- a/arch/sparc/src/bm3803/bm3803-timerisr.c
+++ b/arch/sparc/src/bm3803/bm3803-timerisr.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "bm3803.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/bm3803/bm3803_exti_gpio.c b/arch/sparc/src/bm3803/bm3803_exti_gpio.c
index 955d88041a9..dea1eab0615 100644
--- a/arch/sparc/src/bm3803/bm3803_exti_gpio.c
+++ b/arch/sparc/src/bm3803/bm3803_exti_gpio.c
@@ -34,7 +34,6 @@
 #include <arch/irq.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 #include "chip.h"
 #include "bm3803.h"
 /****************************************************************************
diff --git a/arch/sparc/src/bm3803/bm3803_tim.c b/arch/sparc/src/bm3803/bm3803_tim.c
index a2d7c2cc634..6d90e70bddd 100644
--- a/arch/sparc/src/bm3803/bm3803_tim.c
+++ b/arch/sparc/src/bm3803/bm3803_tim.c
@@ -38,8 +38,6 @@
 
 #include "chip.h"
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "bm3803.h"
 #include "bm3803_tim.h"
 
diff --git a/arch/sparc/src/bm3803/bm3803_wdg.c b/arch/sparc/src/bm3803/bm3803_wdg.c
index eaefa5c5892..459466f691e 100644
--- a/arch/sparc/src/bm3803/bm3803_wdg.c
+++ b/arch/sparc/src/bm3803/bm3803_wdg.c
@@ -35,7 +35,7 @@
 #include <nuttx/timers/watchdog.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 #include "bm3803_wdg.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_BM3803_WDG)
diff --git a/arch/sparc/src/bm3823/bm3823-irq.c b/arch/sparc/src/bm3823/bm3823-irq.c
index 32ff02938e3..39b92fccf4b 100644
--- a/arch/sparc/src/bm3823/bm3823-irq.c
+++ b/arch/sparc/src/bm3823/bm3823-irq.c
@@ -33,9 +33,7 @@
 
 #include <arch/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "bm3823.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/bm3823/bm3823-lowconsole.c b/arch/sparc/src/bm3823/bm3823-lowconsole.c
index 317da522359..aef5e9f947f 100644
--- a/arch/sparc/src/bm3823/bm3823-lowconsole.c
+++ b/arch/sparc/src/bm3823/bm3823-lowconsole.c
@@ -32,7 +32,6 @@
 
 #include <arch/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "bm3823-uart.h"
 #include "bm3823.h"
diff --git a/arch/sparc/src/bm3823/bm3823-serial.c b/arch/sparc/src/bm3823/bm3823-serial.c
index 1ec6bb506f3..11f1f787c5a 100644
--- a/arch/sparc/src/bm3823/bm3823-serial.c
+++ b/arch/sparc/src/bm3823/bm3823-serial.c
@@ -43,9 +43,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "bm3823-config.h"
 #include "chip.h"
 #include "bm3823-uart.h"
diff --git a/arch/sparc/src/bm3823/bm3823-timerisr.c b/arch/sparc/src/bm3823/bm3823-timerisr.c
index 80c984a1ea4..afa235ae721 100644
--- a/arch/sparc/src/bm3823/bm3823-timerisr.c
+++ b/arch/sparc/src/bm3823/bm3823-timerisr.c
@@ -32,8 +32,6 @@
 #include <arch/board/board.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "bm3823.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/common/up_allocateheap.c b/arch/sparc/src/common/up_allocateheap.c
index 2eecca505a2..cf47939e558 100644
--- a/arch/sparc/src/common/up_allocateheap.c
+++ b/arch/sparc/src/common/up_allocateheap.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/common/up_arch.h b/arch/sparc/src/common/up_arch.h
deleted file mode 100644
index af7e3e64b55..00000000000
--- a/arch/sparc/src/common/up_arch.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
- * arch/sparc/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_SPARC_SRC_COMMON_UP_ARCH_H
-#define __ARCH_SPARC_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(a)           (*(volatile uint8_t *)(a))
-# define putreg8(v,a)         (*(volatile uint8_t *)(a) = (v))
-# define getreg16(a)          (*(volatile uint16_t *)(a))
-# define putreg16(v,a)        (*(volatile uint16_t *)(a) = (v))
-# define getreg32(a)          (*(volatile uint32_t *)(a))
-# define putreg32(v,a)        (*(volatile uint32_t *)(a) = (v))
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_SPARC_SRC_COMMON_UP_ARCH_H */
-
diff --git a/arch/sparc/src/common/up_assert.c b/arch/sparc/src/common/up_assert.c
index 67ad9228b10..a003b1effdc 100644
--- a/arch/sparc/src/common/up_assert.c
+++ b/arch/sparc/src/common/up_assert.c
@@ -37,7 +37,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/sparc/src/common/up_createstack.c b/arch/sparc/src/common/up_createstack.c
index 3dc94e69b83..17979a466fd 100644
--- a/arch/sparc/src/common/up_createstack.c
+++ b/arch/sparc/src/common/up_createstack.c
@@ -34,7 +34,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/common/up_initialize.c b/arch/sparc/src/common/up_initialize.c
index 2c75598a77d..54e66eb5c31 100644
--- a/arch/sparc/src/common/up_initialize.c
+++ b/arch/sparc/src/common/up_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/common/up_internal.h b/arch/sparc/src/common/up_internal.h
index 9812cbc73c4..7df75fbe43e 100644
--- a/arch/sparc/src/common/up_internal.h
+++ b/arch/sparc/src/common/up_internal.h
@@ -100,6 +100,13 @@
 #define INTSTACK_COLOR 0xdeadbeef
 #define HEAP_COLOR     'h'
 
+#define getreg8(a)     (*(volatile uint8_t *)(a))
+#define putreg8(v,a)   (*(volatile uint8_t *)(a) = (v))
+#define getreg16(a)    (*(volatile uint16_t *)(a))
+#define putreg16(v,a)  (*(volatile uint16_t *)(a) = (v))
+#define getreg32(a)    (*(volatile uint32_t *)(a))
+#define putreg32(v,a)  (*(volatile uint32_t *)(a) = (v))
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
@@ -175,6 +182,12 @@ extern uint32_t _bmxdupba_address;   /* BMX register setting */
  * functions prototyped in include/nuttx/arch.h.
  */
 
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
+
 /* Context switching */
 
 void up_copystate(uint32_t *dest, uint32_t *src);
diff --git a/arch/sparc/src/common/up_modifyreg16.c b/arch/sparc/src/common/up_modifyreg16.c
index 5b3cdfc0e36..c72a1cd91fd 100644
--- a/arch/sparc/src/common/up_modifyreg16.c
+++ b/arch/sparc/src/common/up_modifyreg16.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sparc/src/common/up_modifyreg32.c b/arch/sparc/src/common/up_modifyreg32.c
index da372f3e2df..be73eacef82 100644
--- a/arch/sparc/src/common/up_modifyreg32.c
+++ b/arch/sparc/src/common/up_modifyreg32.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sparc/src/common/up_modifyreg8.c b/arch/sparc/src/common/up_modifyreg8.c
index f809a5c08c2..51b6168b6a9 100644
--- a/arch/sparc/src/common/up_modifyreg8.c
+++ b/arch/sparc/src/common/up_modifyreg8.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sparc/src/sparc_v8/up_doirq.c b/arch/sparc/src/sparc_v8/up_doirq.c
index 2c20feae8db..a6687b65b8d 100644
--- a/arch/sparc/src/sparc_v8/up_doirq.c
+++ b/arch/sparc/src/sparc_v8/up_doirq.c
@@ -32,9 +32,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/sparc/src/sparc_v8/up_dumpstate.c b/arch/sparc/src/sparc_v8/up_dumpstate.c
index fd2d2b65871..75f7b1e84d9 100644
--- a/arch/sparc/src/sparc_v8/up_dumpstate.c
+++ b/arch/sparc/src/sparc_v8/up_dumpstate.c
@@ -33,7 +33,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/sparc/src/sparc_v8/up_initialstate.c b/arch/sparc/src/sparc_v8/up_initialstate.c
index 298b2fbe388..46ee07cf06a 100644
--- a/arch/sparc/src/sparc_v8/up_initialstate.c
+++ b/arch/sparc/src/sparc_v8/up_initialstate.c
@@ -31,7 +31,6 @@
 #include <nuttx/arch.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sparc/src/sparc_v8/up_schedulesigaction.c b/arch/sparc/src/sparc_v8/up_schedulesigaction.c
index 563c9324639..a917306eda1 100644
--- a/arch/sparc/src/sparc_v8/up_schedulesigaction.c
+++ b/arch/sparc/src/sparc_v8/up_schedulesigaction.c
@@ -33,7 +33,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/sparc/src/sparc_v8/up_sigdeliver.c b/arch/sparc/src/sparc_v8/up_sigdeliver.c
index 863c8081a75..ea33cedc9fc 100644
--- a/arch/sparc/src/sparc_v8/up_sigdeliver.c
+++ b/arch/sparc/src/sparc_v8/up_sigdeliver.c
@@ -37,7 +37,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/sparc/src/sparc_v8/up_systemreset.c b/arch/sparc/src/sparc_v8/up_systemreset.c
index c27c821d41c..960518ccaec 100644
--- a/arch/sparc/src/sparc_v8/up_systemreset.c
+++ b/arch/sparc/src/sparc_v8/up_systemreset.c
@@ -29,7 +29,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Private Functions
diff --git a/arch/x86/src/common/up_allocateheap.c b/arch/x86/src/common/up_allocateheap.c
index 35aa50c1b4f..f331178a6dd 100644
--- a/arch/x86/src/common/up_allocateheap.c
+++ b/arch/x86/src/common/up_allocateheap.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/x86/src/common/up_arch.h b/arch/x86/src/common/up_arch.h
deleted file mode 100644
index c41b25a8873..00000000000
--- a/arch/x86/src/common/up_arch.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
- * arch/x86/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef ___ARCH_X86_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_X86_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-#include <arch/io.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(p)           inb(p)
-# define putreg8(v,p)         outb(v,p)
-# define getreg16(p)          inw(p)
-# define putreg16(v,p)        outw(v,p)
-# define getreg32(p)          inl(p)
-# define putreg32(v,p)        outl(v,p)
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_X86_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 1c69e5a5f85..b8d545d0c1b 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -38,7 +38,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 4c197627d75..96af974490f 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h
index f841387f290..f7c6c01028d 100644
--- a/arch/x86/src/common/up_internal.h
+++ b/arch/x86/src/common/up_internal.h
@@ -30,6 +30,7 @@
 #ifndef __ASSEMBLY__
 #  include <nuttx/compiler.h>
 #  include <stdint.h>
+#  include <arch/io.h>
 #endif
 
 /****************************************************************************
@@ -83,6 +84,13 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
+#define getreg8(p)          inb(p)
+#define putreg8(v,p)        outb(v,p)
+#define getreg16(p)         inw(p)
+#define putreg16(v,p)       outw(v,p)
+#define getreg32(p)         inl(p)
+#define putreg32(v,p)       outl(v,p)
+
 /* Macros to handle saving and restore interrupt state.  In the current
  * model, the state is copied from the stack to the TCB, but only a
  * referenced is passed to get the state from the TCB.
@@ -153,6 +161,11 @@ extern uint32_t _ebss;            /* End+1 of .bss */
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
 
 /****************************************************************************
  * Name: x86_boardinitialize
diff --git a/arch/x86/src/common/up_modifyreg16.c b/arch/x86/src/common/up_modifyreg16.c
index dce9e4ca401..be8fd0e6de0 100644
--- a/arch/x86/src/common/up_modifyreg16.c
+++ b/arch/x86/src/common/up_modifyreg16.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86/src/common/up_modifyreg32.c b/arch/x86/src/common/up_modifyreg32.c
index 993d4d0a0c2..6e20523dde1 100644
--- a/arch/x86/src/common/up_modifyreg32.c
+++ b/arch/x86/src/common/up_modifyreg32.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86/src/common/up_modifyreg8.c b/arch/x86/src/common/up_modifyreg8.c
index 28bf894755e..5d1cb5e7b4a 100644
--- a/arch/x86/src/common/up_modifyreg8.c
+++ b/arch/x86/src/common/up_modifyreg8.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86/src/i486/up_createstack.c b/arch/x86/src/i486/up_createstack.c
index c4f724f8670..40d9dd4bc0d 100644
--- a/arch/x86/src/i486/up_createstack.c
+++ b/arch/x86/src/i486/up_createstack.c
@@ -37,7 +37,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/x86/src/i486/up_initialstate.c b/arch/x86/src/i486/up_initialstate.c
index 407342b3a39..1f5b9b5aa6c 100644
--- a/arch/x86/src/i486/up_initialstate.c
+++ b/arch/x86/src/i486/up_initialstate.c
@@ -31,7 +31,6 @@
 #include <arch/arch.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/x86/src/i486/up_irq.c b/arch/x86/src/i486/up_irq.c
index 0a5ee4945c9..70b386e7dab 100644
--- a/arch/x86/src/i486/up_irq.c
+++ b/arch/x86/src/i486/up_irq.c
@@ -34,7 +34,6 @@
 #include <arch/irq.h>
 #include <arch/io.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "qemu.h"
 
diff --git a/arch/x86/src/i486/up_schedulesigaction.c b/arch/x86/src/i486/up_schedulesigaction.c
index fac998a3a2b..3218704c089 100644
--- a/arch/x86/src/i486/up_schedulesigaction.c
+++ b/arch/x86/src/i486/up_schedulesigaction.c
@@ -33,7 +33,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/x86/src/i486/up_sigdeliver.c b/arch/x86/src/i486/up_sigdeliver.c
index 0f4971b10ac..f22a0f7b615 100644
--- a/arch/x86/src/i486/up_sigdeliver.c
+++ b/arch/x86/src/i486/up_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/x86/src/qemu/qemu_timerisr.c b/arch/x86/src/qemu/qemu_timerisr.c
index 244b76546fc..09b483496ec 100644
--- a/arch/x86/src/qemu/qemu_timerisr.c
+++ b/arch/x86/src/qemu/qemu_timerisr.c
@@ -40,8 +40,6 @@
 
 #include "clock/clock.h"
 #include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
 #include "qemu.h"
 
diff --git a/arch/x86_64/src/common/up_allocateheap.c b/arch/x86_64/src/common/up_allocateheap.c
index c031b2fcea2..b7fbbce4b26 100644
--- a/arch/x86_64/src/common/up_allocateheap.c
+++ b/arch/x86_64/src/common/up_allocateheap.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/x86_64/src/common/up_arch.h b/arch/x86_64/src/common/up_arch.h
deleted file mode 100644
index 85982cb496b..00000000000
--- a/arch/x86_64/src/common/up_arch.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
- * arch/x86_64/src/common/up_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef ___ARCH_X86_64_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_X86_64_SRC_COMMON_UP_ARCH_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#ifndef __ASSEMBLY__
-# include <stdint.h>
-#endif
-#include <arch/io.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-# define getreg8(p)           inb(p)
-# define putreg8(v,p)         outb(v,p)
-# define getreg16(p)          inw(p)
-# define putreg16(v,p)        outw(v,p)
-# define getreg32(p)          inl(p)
-# define putreg32(v,p)        outl(v,p)
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/* Atomic modification of registers */
-
-void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
-void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
-void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif  /* ___ARCH_X86_64_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/x86_64/src/common/up_assert.c b/arch/x86_64/src/common/up_assert.c
index 8b6f37d1649..410598a2ce0 100644
--- a/arch/x86_64/src/common/up_assert.c
+++ b/arch/x86_64/src/common/up_assert.c
@@ -38,7 +38,6 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/x86_64/src/common/up_initialize.c b/arch/x86_64/src/common/up_initialize.c
index d8141249cfb..2ca6d340c67 100644
--- a/arch/x86_64/src/common/up_initialize.c
+++ b/arch/x86_64/src/common/up_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/x86_64/src/common/up_internal.h b/arch/x86_64/src/common/up_internal.h
index f50a058ee64..324b6eaf0e7 100644
--- a/arch/x86_64/src/common/up_internal.h
+++ b/arch/x86_64/src/common/up_internal.h
@@ -31,6 +31,7 @@
 #  include <nuttx/compiler.h>
 #  include <nuttx/sched.h>
 #  include <stdint.h>
+#  include <arch/io.h>
 #endif
 
 /****************************************************************************
@@ -102,6 +103,13 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
+#define getreg8(p)          inb(p)
+#define putreg8(v,p)        outb(v,p)
+#define getreg16(p)         inw(p)
+#define putreg16(v,p)       outw(v,p)
+#define getreg32(p)         inl(p)
+#define putreg32(v,p)       outl(v,p)
+
 /* Macros to handle saving and restore interrupt state.  In the current
  * model, the state is copied from the stack to the TCB, but only a
  * referenced is passed to get the state from the TCB.
@@ -172,6 +180,11 @@ extern uint64_t _ebss;            /* End+1 of .bss */
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
+/* Atomic modification of registers */
+
+void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits);
+void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits);
+void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
 
 /****************************************************************************
  * Name: x86_64_boardinitialize
diff --git a/arch/x86_64/src/common/up_modifyreg16.c b/arch/x86_64/src/common/up_modifyreg16.c
index b86ed2f6c3b..a6b09ff487d 100644
--- a/arch/x86_64/src/common/up_modifyreg16.c
+++ b/arch/x86_64/src/common/up_modifyreg16.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86_64/src/common/up_modifyreg32.c b/arch/x86_64/src/common/up_modifyreg32.c
index 285ea56d926..b8e8bf29e6e 100644
--- a/arch/x86_64/src/common/up_modifyreg32.c
+++ b/arch/x86_64/src/common/up_modifyreg32.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86_64/src/common/up_modifyreg8.c b/arch/x86_64/src/common/up_modifyreg8.c
index b53b7fcfc91..ac9d7f9706d 100644
--- a/arch/x86_64/src/common/up_modifyreg8.c
+++ b/arch/x86_64/src/common/up_modifyreg8.c
@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86_64/src/intel64/intel64_timerisr.c b/arch/x86_64/src/intel64/intel64_timerisr.c
index 99929e541c5..ec6f4b4df8c 100644
--- a/arch/x86_64/src/intel64/intel64_timerisr.c
+++ b/arch/x86_64/src/intel64/intel64_timerisr.c
@@ -35,7 +35,6 @@
 
 #include "clock/clock.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 #include <stdio.h>
 
diff --git a/arch/x86_64/src/intel64/up_createstack.c b/arch/x86_64/src/intel64/up_createstack.c
index de1c663c12f..80b997c0000 100644
--- a/arch/x86_64/src/intel64/up_createstack.c
+++ b/arch/x86_64/src/intel64/up_createstack.c
@@ -37,7 +37,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/x86_64/src/intel64/up_initialstate.c b/arch/x86_64/src/intel64/up_initialstate.c
index ad66e54e577..dea02567cf4 100644
--- a/arch/x86_64/src/intel64/up_initialstate.c
+++ b/arch/x86_64/src/intel64/up_initialstate.c
@@ -31,7 +31,6 @@
 #include <arch/arch.h>
 
 #include "up_internal.h"
-#include "up_arch.h"
 #include "sched/sched.h"
 
 /****************************************************************************
diff --git a/arch/x86_64/src/intel64/up_irq.c b/arch/x86_64/src/intel64/up_irq.c
index 8e238e63e9e..b7e056ac078 100644
--- a/arch/x86_64/src/intel64/up_irq.c
+++ b/arch/x86_64/src/intel64/up_irq.c
@@ -36,7 +36,6 @@
 #include <arch/io.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "intel64.h"
 
diff --git a/arch/x86_64/src/intel64/up_map_region.c b/arch/x86_64/src/intel64/up_map_region.c
index 781c9a307a5..4e27e90ff7b 100644
--- a/arch/x86_64/src/intel64/up_map_region.c
+++ b/arch/x86_64/src/intel64/up_map_region.c
@@ -27,7 +27,6 @@
 #include <debug.h>
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/x86_64/src/intel64/up_rtc.c b/arch/x86_64/src/intel64/up_rtc.c
index f100882f0c6..a7ef203bae9 100644
--- a/arch/x86_64/src/intel64/up_rtc.c
+++ b/arch/x86_64/src/intel64/up_rtc.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/x86_64/src/intel64/up_schedulesigaction.c b/arch/x86_64/src/intel64/up_schedulesigaction.c
index c072b21f438..fc1c1716f93 100644
--- a/arch/x86_64/src/intel64/up_schedulesigaction.c
+++ b/arch/x86_64/src/intel64/up_schedulesigaction.c
@@ -33,7 +33,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/x86_64/src/intel64/up_sigdeliver.c b/arch/x86_64/src/intel64/up_sigdeliver.c
index aa712db9c41..f489d361b33 100644
--- a/arch/x86_64/src/intel64/up_sigdeliver.c
+++ b/arch/x86_64/src/intel64/up_sigdeliver.c
@@ -36,7 +36,6 @@
 
 #include "sched/sched.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/z16/src/common/z16_arch.h b/arch/z16/src/common/z16_arch.h
deleted file mode 100644
index ec04d254d1e..00000000000
--- a/arch/z16/src/common/z16_arch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/************************************************************************************
- * arch/z16/src/common/z16_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ************************************************************************************/
-
-#ifndef __ARCH_Z16_SRC_COMMON_Z16_ARCH_H
-#define __ARCH_Z16_SRC_COMMON_Z16_ARCH_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <arch/board/board.h>
-#include "chip.h"
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-#endif /* __ARCH_Z16_SRC_COMMON_Z16_ARCH_H */
diff --git a/arch/z16/src/common/z16_initialize.c b/arch/z16/src/common/z16_initialize.c
index 41ea700ca5e..45b54592b52 100644
--- a/arch/z16/src/common/z16_initialize.c
+++ b/arch/z16/src/common/z16_initialize.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "z16_arch.h"
 #include "z16_internal.h"
 
 /****************************************************************************
diff --git a/arch/z16/src/common/z16_internal.h b/arch/z16/src/common/z16_internal.h
index bd3c34998c1..b1c2ff07734 100644
--- a/arch/z16/src/common/z16_internal.h
+++ b/arch/z16/src/common/z16_internal.h
@@ -91,6 +91,15 @@
 #define RESTORE_USERCONTEXT(tcb) z16_restoreusercontext((tcb)->xcp.regs)
 #define SIGNAL_RETURN(regs)      z16_restoreusercontext(regs)
 
+/* Register access macros ***************************************************/
+
+#define getreg8(a)              (*(uint8_t volatile _Near*)(a))
+#define putreg8(v,a)            (*(uint8_t volatile _Near*)(a) = (v))
+#define getreg16(a)             (*(uint16_t volatile _Near*)(a))
+#define putreg16(v,a)           (*(uint16_t volatile _Near*)(a) = (v))
+#define getreg32(a)             (*(uint32_t volatile _Near*)(a))
+#define putreg32(v,a)           (*(uint32_t volatile _Near*)(a) = (v))
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/arch/z16/src/z16f/chip.h b/arch/z16/src/z16f/chip.h
index 3ef977e33eb..fb49bd765bc 100644
--- a/arch/z16/src/z16f/chip.h
+++ b/arch/z16/src/z16f/chip.h
@@ -619,17 +619,6 @@
 #  define Z16F_TIMERSCTL1_GATED   _HX8(06)        /*   Gated mode (CTL0 TMOD = 0)*/
 #  define Z16F_TIMERSCTL1_CAPCMP  _HX8(07)        /*   Capture/Compare mode (CTL0 TMOD = 0)*/
 
-/* Register access macros ***********************************************************/
-
-#ifndef __ASSEMBLY__
-#  define getreg8(a)              (*(uint8_t volatile _Near*)(a))
-#  define putreg8(v,a)            (*(uint8_t volatile _Near*)(a) = (v))
-#  define getreg16(a)             (*(uint16_t volatile _Near*)(a))
-#  define putreg16(v,a)           (*(uint16_t volatile _Near*)(a) = (v))
-#  define getreg32(a)             (*(uint32_t volatile _Near*)(a))
-#  define putreg32(v,a)           (*(uint32_t volatile _Near*)(a) = (v))
-#endif /* __ASSEMBLY__ */
-
 /************************************************************************************
  * Public Function Prototypes
  ************************************************************************************/
diff --git a/arch/z16/src/z16f/z16f_clkinit.c b/arch/z16/src/z16f/z16f_clkinit.c
index d69ec301071..6e6dfe32118 100644
--- a/arch/z16/src/z16f/z16f_clkinit.c
+++ b/arch/z16/src/z16f/z16f_clkinit.c
@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include "chip.h"
+#include "z16_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index 12c619b0704..dafbb0d27ea 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -35,8 +35,8 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/spi/spi.h>
 
-#include "z16_arch.h"
 #include "chip.h"
+#include "z16_internal.h"
 
 #ifdef CONFIG_Z16F_ESPI
 
diff --git a/arch/z80/src/common/z80_allocateheap.c b/arch/z80/src/common/z80_allocateheap.c
index 7d396f3f388..47bf3a6a5c2 100644
--- a/arch/z80/src/common/z80_allocateheap.c
+++ b/arch/z80/src/common/z80_allocateheap.c
@@ -32,7 +32,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/mm/mm.h>
 
-#include "z80_arch.h"
 #include "z80_internal.h"
 
 #ifdef SDCC
diff --git a/arch/z80/src/common/z80_arch.h b/arch/z80/src/common/z80_arch.h
deleted file mode 100644
index 17348418fd0..00000000000
--- a/arch/z80/src/common/z80_arch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/************************************************************************************
- * arch/z80/src/common/z80_arch.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ************************************************************************************/
-
-#ifndef __ARCH_Z80_SRC_COMMON_Z80_ARCH_H
-#define __ARCH_Z80_SRC_COMMON_Z80_ARCH_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <arch/board/board.h>
-#include "chip.h"
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-#endif /* __ARCH_Z80_SRC_COMMON_Z80_ARCH_H */
diff --git a/arch/z80/src/common/z80_assert.c b/arch/z80/src/common/z80_assert.c
index c9bc1ac6c78..ff069ab40cb 100644
--- a/arch/z80/src/common/z80_assert.c
+++ b/arch/z80/src/common/z80_assert.c
@@ -36,7 +36,6 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "chip.h"
-#include "z80_arch.h"
 #include "sched/sched.h"
 #include "z80_internal.h"
 
diff --git a/arch/z80/src/common/z80_createstack.c b/arch/z80/src/common/z80_createstack.c
index 5ba592387a2..0d667d145fa 100644
--- a/arch/z80/src/common/z80_createstack.c
+++ b/arch/z80/src/common/z80_createstack.c
@@ -35,7 +35,6 @@
 #include <nuttx/tls.h>
 #include <nuttx/board.h>
 
-#include "z80_arch.h"
 #include "z80_internal.h"
 
 /****************************************************************************
diff --git a/arch/z80/src/common/z80_doirq.c b/arch/z80/src/common/z80_doirq.c
index fad4c7aa4f9..f441b28b8e0 100644
--- a/arch/z80/src/common/z80_doirq.c
+++ b/arch/z80/src/common/z80_doirq.c
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 #include <assert.h>
-#include "z80_arch.h"
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
@@ -36,7 +35,6 @@
 
 #include "chip/switch.h"
 #include "z80_internal.h"
-
 #include "group/group.h"
 
 /****************************************************************************
diff --git a/arch/z80/src/common/z80_initialize.c b/arch/z80/src/common/z80_initialize.c
index a66cb9d1423..538ebcd1547 100644
--- a/arch/z80/src/common/z80_initialize.c
+++ b/arch/z80/src/common/z80_initialize.c
@@ -27,7 +27,6 @@
 #include <arch/board/board.h>
 
 #include "chip/switch.h"
-#include "z80_arch.h"
 #include "z80_internal.h"
 
 /****************************************************************************
diff --git a/arch/z80/src/common/z80_internal.h b/arch/z80/src/common/z80_internal.h
index 226b17ddfac..84367d6d18b 100644
--- a/arch/z80/src/common/z80_internal.h
+++ b/arch/z80/src/common/z80_internal.h
@@ -73,6 +73,21 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
+/* Register access macros ***************************************************
+ *
+ * The register access mechanism provided in ez8.h differs from the useful in
+ * other NuttX architectures. The following NuttX common macros will at least
+ * make the access compatible at the source level (however, strict type check
+ * is lost).
+ */
+
+#define getreg8(a)          (a)
+#define putreg8(v,a)        ((a) = (v))
+#define getreg16(a)         (a)
+#define putreg16(v,a)       ((a) = (v))
+#define getreg32(a)         (a)
+#define putreg32(v,a)       ((a) = (v))
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
diff --git a/arch/z80/src/common/z80_stackdump.c b/arch/z80/src/common/z80_stackdump.c
index 2e8bd3c4aa5..8a5b74edd6f 100644
--- a/arch/z80/src/common/z80_stackdump.c
+++ b/arch/z80/src/common/z80_stackdump.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include "z80_arch.h"
 #include "sched/sched.h"
 #include "z80_internal.h"
 
diff --git a/arch/z80/src/ez80/ez80_initialstate.c b/arch/z80/src/ez80/ez80_initialstate.c
index cd97727dded..efa1ecffc13 100644
--- a/arch/z80/src/ez80/ez80_initialstate.c
+++ b/arch/z80/src/ez80/ez80_initialstate.c
@@ -30,7 +30,6 @@
 
 #include "chip.h"
 #include "z80_internal.h"
-#include "z80_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/z80/src/ez80/ez80_rtc.c b/arch/z80/src/ez80/ez80_rtc.c
index 040fdaf3d0f..0797cd17af4 100644
--- a/arch/z80/src/ez80/ez80_rtc.c
+++ b/arch/z80/src/ez80/ez80_rtc.c
@@ -39,7 +39,6 @@
 #include <arch/io.h>
 
 #include "chip.h"
-#include "z80_arch.h"
 #include "ez80_rtc.h"
 
 #include <arch/board/board.h>
diff --git a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
index f7231b496bc..08528b73eee 100644
--- a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
+++ b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
@@ -33,8 +33,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/timers/rtc.h>
 
-#include "z80_arch.h"
-
 #include "chip.h"
 #include "ez80_rtc.h"
 
diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c
index b37d025e743..de2fc5e7669 100644
--- a/arch/z80/src/ez80/ez80_spi.c
+++ b/arch/z80/src/ez80/ez80_spi.c
@@ -37,10 +37,7 @@
 #include <arch/io.h>
 
 #include "z80_internal.h"
-#include "z80_arch.h"
-
 #include "chip.h"
-
 #include "ez80_spi.h"
 
 /****************************************************************************
diff --git a/arch/z80/src/z180/z180_initialstate.c b/arch/z80/src/z180/z180_initialstate.c
index 029286b0d8a..74d28012030 100644
--- a/arch/z80/src/z180/z180_initialstate.c
+++ b/arch/z80/src/z180/z180_initialstate.c
@@ -29,7 +29,6 @@
 
 #include "chip.h"
 #include "z80_internal.h"
-#include "z80_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/z80/src/z180/z180_scc.c b/arch/z80/src/z180/z180_scc.c
index c49f87db87b..47290171ef6 100644
--- a/arch/z80/src/z180/z180_scc.c
+++ b/arch/z80/src/z180/z180_scc.c
@@ -39,7 +39,6 @@
 
 #include "chip.h"
 #include "z80_internal.h"
-
 #include "z180_config.h"
 #include "z180_serial.h"
 
diff --git a/arch/z80/src/z180/z180_timerisr.c b/arch/z80/src/z180/z180_timerisr.c
index a041fb13a0a..674ca278f54 100644
--- a/arch/z80/src/z180/z180_timerisr.c
+++ b/arch/z80/src/z180/z180_timerisr.c
@@ -32,7 +32,6 @@
 
 #include "clock/clock.h"
 #include "z80_internal.h"
-
 #include "chip.h"
 
 /****************************************************************************
diff --git a/arch/z80/src/z8/chip.h b/arch/z80/src/z8/chip.h
index 8de6866c6b6..05c4a18718c 100644
--- a/arch/z80/src/z8/chip.h
+++ b/arch/z80/src/z8/chip.h
@@ -185,22 +185,6 @@
 #define I2C_CTL_START      (1 << 6) /* Bit 6: 1=Send Start Condition */
 #define I2C_CTL_IEN        (1 << 7) /* Bit 7: 1=I2C Enable */
 
-/* Register access macros ***********************************************************
- *
- * The register access mechanism provided in ez8.h differs from the useful in other
- * NuttX architectures.  The following NuttX common macros will at least make the
- * access compatible at the source level (however, strict type check is lost).
- */
-
-#ifndef __ASSEMBLY__
-# define getreg8(a)           (a)
-# define putreg8(v,a)         (a) = (v)
-# define getreg16(a)          (a)
-# define putreg16(v,a)        (a) = (v)
-# define getreg32(a)          (a)
-# define putreg32(v,a)        (a) = (v)
-#endif /* __ASSEMBLY__ */
-
 /************************************************************************************
  * Public Function Prototypes
  ************************************************************************************/
diff --git a/arch/z80/src/z8/z8_initialstate.c b/arch/z80/src/z8/z8_initialstate.c
index 187e1625c06..e71059e3969 100644
--- a/arch/z80/src/z8/z8_initialstate.c
+++ b/arch/z80/src/z8/z8_initialstate.c
@@ -31,7 +31,6 @@
 
 #include "chip.h"
 #include "z80_internal.h"
-#include "z80_arch.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/z80/src/z80/z80_initialstate.c b/arch/z80/src/z80/z80_initialstate.c
index 0d743eb4301..2b63860d3c7 100644
--- a/arch/z80/src/z80/z80_initialstate.c
+++ b/arch/z80/src/z80/z80_initialstate.c
@@ -29,7 +29,6 @@
 
 #include "chip.h"
 #include "z80_internal.h"
-#include "z80_arch.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/boards/arm/a1x/pcduino-a10/src/a1x_leds.c b/boards/arm/a1x/pcduino-a10/src/a1x_leds.c
index 020bfac0e15..5d20a02329b 100644
--- a/boards/arm/a1x/pcduino-a10/src/a1x_leds.c
+++ b/boards/arm/a1x/pcduino-a10/src/a1x_leds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "pcduino_a10.h"
 
 /* The pcDuino v1 has four green LEDs; three can be controlled from software.
diff --git a/boards/arm/am335x/beaglebone-black/src/am335x_leds.c b/boards/arm/am335x/beaglebone-black/src/am335x_leds.c
index 8084700f12a..7ec601d0107 100644
--- a/boards/arm/am335x/beaglebone-black/src/am335x_leds.c
+++ b/boards/arm/am335x/beaglebone-black/src/am335x_leds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "beaglebone-black.h"
 
 /* The beaglebone black has four user LEDs; all four can be controlled from
diff --git a/boards/arm/cxd56xx/common/src/cxd56_audio.c b/boards/arm/cxd56xx/common/src/cxd56_audio.c
index 023b8c0cd0e..827648133cd 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_audio.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_audio.c
@@ -39,7 +39,7 @@
 #include <arch/chip/audio.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <arch/board/board.h>
 #include "cxd56_pmic.h"
diff --git a/boards/arm/cxd56xx/common/src/cxd56_boot.c b/boards/arm/cxd56xx/common/src/cxd56_boot.c
index 98a2e7e7bfd..347d988164b 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_boot.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/cxd56xx/common/src/cxd56_crashdump.c b/boards/arm/cxd56xx/common/src/cxd56_crashdump.c
index 0278b09f569..0e96c9778c2 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_crashdump.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_crashdump.c
@@ -37,8 +37,6 @@
 #include <arch/chip/backuplog.h>
 #include <arch/chip/crashdump.h>
 #include "cxd56_wdt.h"
-
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
index abafe482a8d..17398835d97 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
@@ -41,7 +41,7 @@
 #include <arch/board/cxd56_imageproc.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
index 8ca016cd94b..a0c7934498f 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_power.c b/boards/arm/cxd56xx/spresense/src/cxd56_power.c
index 5305d8e342a..62bfd8f5899 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_power.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_power.c
@@ -35,7 +35,7 @@
 #include <nuttx/semaphore.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <arch/chip/pm.h>
 #include <arch/board/board.h>
@@ -59,7 +59,8 @@ static bool g_used_lna = false;
 static bool g_used_tcxo = true;
 #ifdef CONFIG_BOARDCTL_RESET
 static struct pm_cpu_freqlock_s g_hv_lock =
-  PM_CPUFREQLOCK_INIT(PM_CPUFREQLOCK_TAG('B','P',0), PM_CPUFREQLOCK_FLAG_HV);
+  PM_CPUFREQLOCK_INIT(PM_CPUFREQLOCK_TAG('B', 'P', 0),
+                      PM_CPUFREQLOCK_FLAG_HV);
 #endif
 
 /****************************************************************************
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c b/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c
index 95910263342..bfb88697a01 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c
@@ -39,7 +39,7 @@
 #include <nuttx/wqueue.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <arch/board/board.h>
 #include <arch/chip/pin.h>
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_spi.c b/boards/arm/cxd56xx/spresense/src/cxd56_spi.c
index 6693d056698..ca163151172 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_spi.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/cxd56_spi.h"
 #include "cxd56_clock.h"
diff --git a/boards/arm/dm320/ntosd-dm320/src/dm320_network.c b/boards/arm/dm320/ntosd-dm320/src/dm320_network.c
index 9f7d91c99ad..18afde0ca20 100644
--- a/boards/arm/dm320/ntosd-dm320/src/dm320_network.c
+++ b/boards/arm/dm320/ntosd-dm320/src/dm320_network.c
@@ -28,9 +28,7 @@
 #include <debug.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "dm320_memorymap.h"
 #include "dm320_emif.h"
 #include "dm320_gio.h"
diff --git a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c
index feb409541d9..fadac7351ac 100644
--- a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c
+++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "efm32_gpio.h"
 #include "efm32-g8xx-stk.h"
 
diff --git a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c
index bade9a05c86..e387a22f9ff 100644
--- a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "efm32_gpio.h"
 #include "efm32-g8xx-stk.h"
 
diff --git a/boards/arm/eoss3/quickfeather/src/eoss3_autoleds.c b/boards/arm/eoss3/quickfeather/src/eoss3_autoleds.c
index 49e8c878695..47a00f27732 100644
--- a/boards/arm/eoss3/quickfeather/src/eoss3_autoleds.c
+++ b/boards/arm/eoss3/quickfeather/src/eoss3_autoleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/eoss3/quickfeather/src/eoss3_boot.c b/boards/arm/eoss3/quickfeather/src/eoss3_boot.c
index 38160d77504..1ebe54a09c2 100644
--- a/boards/arm/eoss3/quickfeather/src/eoss3_boot.c
+++ b/boards/arm/eoss3/quickfeather/src/eoss3_boot.c
@@ -28,7 +28,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "itm.h"
 
diff --git a/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c b/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c
index 0204895bdeb..58282c6f9ed 100644
--- a/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c
+++ b/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c
@@ -57,7 +57,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imx_gpio.h"
 #include "sabre-6quad.h"
 
diff --git a/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c b/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c
index cc19768a19c..7eaf21f658c 100644
--- a/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c
+++ b/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c
@@ -30,8 +30,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imx_boot.h"
 #include "sabre-6quad.h"
 
diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c
index 83d436656ba..e9d98300f1a 100644
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c
index fa0bdd19849..0c40a2438ab 100644
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c
@@ -32,8 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c
index ff4b67a5f94..dbd958b847c 100644
--- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c
+++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c
index 73b25e7e029..b0175043732 100644
--- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c
+++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_lpspi.h"
 
diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c
index a4a39364508..246fccf89f5 100644
--- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c
+++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c
@@ -32,8 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_adc.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_adc.c
index b0d17fab7db..4d2490ddc79 100644
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_adc.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_adc.h"
 
 #ifdef CONFIG_IMXRT_ADC
diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c
index 4369b9cad79..5e844041d50 100644
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c
@@ -29,7 +29,7 @@
 
 #include "imxrt_start.h"
 #include "imxrt1060-evk.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_flexspi_nor_boot.h"
 
 /****************************************************************************
diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c
index 5fa50b435ce..c1e2abab4ae 100644
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c
index 0011c9456a0..2a24e60a2ed 100644
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_lpspi.h"
 
diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c
index 0fcfcb7f792..54eb6f039e6 100644
--- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c
+++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c
@@ -32,8 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_adc.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_adc.c
index d1999c89803..caba516fc4d 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_adc.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_adc.h"
 
 #ifdef CONFIG_IMXRT_ADC
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_boot.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_boot.c
index 977d11e1827..c7c3f2dd241 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_boot.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_boot.c
@@ -29,7 +29,7 @@
 
 #include "imxrt_start.h"
 #include "imxrt1064-evk.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_flexspi_nor_boot.h"
 
 /****************************************************************************
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_buttons.c
index c6a52204951..cc5098378cf 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_buttons.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_buttons.c
@@ -31,8 +31,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_mmcsd_spi.c
index 156b88def5a..a745c39a2ab 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_mmcsd_spi.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_mmcsd_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_lpspi.h"
 
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_spi.c
index b87f35de126..2cd384fdf21 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_spi.c
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_spi.c
@@ -32,8 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_config.h"
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_adc.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_adc.c
index abbcc082bb2..e6280214ecf 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_adc.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_adc.h"
 #include "teensy-4.h"
 
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c
index 4572f6584c9..6681823ee38 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c
@@ -29,7 +29,7 @@
 
 #include "imxrt_start.h"
 #include "teensy-4.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "imxrt_flexspi_nor_boot.h"
 
 /****************************************************************************
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_spi.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_spi.c
index 44a2c800e16..cfebb2e7024 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_spi.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_spi.c
@@ -32,8 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"
 #include "teensy-4.h"
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c b/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c
index 52356170f6b..ce1b00f2b80 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c
@@ -30,7 +30,7 @@
 
 #include <nuttx/i2c/i2c_master.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "kinetis_i2c.h"
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c b/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c
index ebc2f991dbb..da1f2ad63b3 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c
@@ -32,7 +32,7 @@
 #include <nuttx/timers/pwm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis_pwm.h"
 
 #include <arch/board/board.h>
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_spi.c b/boards/arm/kinetis/freedom-k28f/src/k28_spi.c
index 149a8d3e0ca..383f12c15ba 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_spi.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "freedom-k28f.h"
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c b/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c
index 858c9f20ccc..436249ae763 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "kinetis_usbotg.h"
 #include "hardware/kinetis_sim.h"
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c b/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c
index 90977078ac1..4013c1863e5 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c
@@ -45,7 +45,7 @@
 
 #include <kinetis_usbhshost.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/kinetis_k28pinmux.h"
 #include "hardware/kinetis_mcg.h"
 #include "hardware/kinetis_sim.h"
diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_boot.c b/boards/arm/kinetis/freedom-k64f/src/k64_boot.c
index a068e8684f6..49b97e46879 100644
--- a/boards/arm/kinetis/freedom-k64f/src/k64_boot.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "freedom-k64f.h"
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c b/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c
index e7ecdbdfb91..11b01d1daf8 100644
--- a/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis_pwm.h"
 
 #ifdef CONFIG_PWM
diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_spi.c b/boards/arm/kinetis/freedom-k64f/src/k64_spi.c
index dca9c719972..e0b8cd84e2e 100644
--- a/boards/arm/kinetis/freedom-k64f/src/k64_spi.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "freedom-k64f.h"
diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c b/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c
index a263b6a588c..b36b1a7c9dd 100644
--- a/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "freedom-k64f.h"
 
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_boot.c b/boards/arm/kinetis/freedom-k66f/src/k66_boot.c
index 1edf6730285..bbfbd00af23 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_boot.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "freedom-k66f.h"
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c b/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c
index 0f42df7f28d..7ed4a60a002 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis_pwm.h"
 
 #ifdef CONFIG_PWM
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_spi.c b/boards/arm/kinetis/freedom-k66f/src/k66_spi.c
index 449907f7d4d..10cad65623b 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_spi.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "freedom-k66f.h"
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c b/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c
index ad9547e5815..1a0dddec85c 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "freedom-k66f.h"
 
diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c b/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c
index b9a6d549a79..497d0097021 100644
--- a/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c
+++ b/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kwikstik-k40.h"
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c b/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c
index a748733c164..a2ecd5e6c39 100644
--- a/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c
+++ b/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c
@@ -31,7 +31,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kwikstik-k40.h"
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c b/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c
index 07c401851ab..d42347d43c7 100644
--- a/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c
+++ b/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "kwikstik-k40.h"
diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c b/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c
index cc886695614..b04f4828e55 100644
--- a/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c
+++ b/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "kwikstik-k40.h"
 
diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_boot.c b/boards/arm/kinetis/teensy-3.x/src/k20_boot.c
index 7159f7af13b..d37d58c37e2 100644
--- a/boards/arm/kinetis/teensy-3.x/src/k20_boot.c
+++ b/boards/arm/kinetis/teensy-3.x/src/k20_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "teensy-3x.h"
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c b/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c
index 543f4679c92..da5b384d435 100644
--- a/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c
+++ b/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c
@@ -31,7 +31,7 @@
 #include <nuttx/i2c/i2c_master.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "kinetis_i2c.h"
diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c b/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c
index 6d4b603d28b..56a42b34054 100644
--- a/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c
+++ b/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis_pwm.h"
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_spi.c b/boards/arm/kinetis/teensy-3.x/src/k20_spi.c
index 0ee1d1cb913..fc897c05183 100644
--- a/boards/arm/kinetis/teensy-3.x/src/k20_spi.c
+++ b/boards/arm/kinetis/teensy-3.x/src/k20_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "teensy-3x.h"
diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c b/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c
index b429c830d87..d80a077f969 100644
--- a/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c
+++ b/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "kinetis_usbotg.h"
 #include "hardware/kinetis_sim.h"
diff --git a/boards/arm/kinetis/twr-k60n512/src/k60_boot.c b/boards/arm/kinetis/twr-k60n512/src/k60_boot.c
index 17f842bc533..7229f309e9c 100644
--- a/boards/arm/kinetis/twr-k60n512/src/k60_boot.c
+++ b/boards/arm/kinetis/twr-k60n512/src/k60_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "twr-k60n512.h"
 
 /****************************************************************************
diff --git a/boards/arm/kinetis/twr-k60n512/src/k60_spi.c b/boards/arm/kinetis/twr-k60n512/src/k60_spi.c
index 0020a4dc00e..3dd6f1a0c69 100644
--- a/boards/arm/kinetis/twr-k60n512/src/k60_spi.c
+++ b/boards/arm/kinetis/twr-k60n512/src/k60_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "kinetis.h"
 #include "twr-k60n512.h"
diff --git a/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c b/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c
index 44c0c3758da..50f33579fb6 100644
--- a/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c
+++ b/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kinetis.h"
 #include "twr-k60n512.h"
 
diff --git a/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c b/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c
index e2e196a8b3f..31ff6c3fe79 100644
--- a/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c
+++ b/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "twrk64.h"
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c
index ffbfb04ccc6..a01b10b4749 100644
--- a/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c
+++ b/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "freedom-kl25z.h"
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl25z/src/kl_pwm.c b/boards/arm/kl/freedom-kl25z/src/kl_pwm.c
index 1ddfe6fea68..8f3ec0c7aba 100644
--- a/boards/arm/kl/freedom-kl25z/src/kl_pwm.c
+++ b/boards/arm/kl/freedom-kl25z/src/kl_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kl_pwm.h"
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl25z/src/kl_tsi.c b/boards/arm/kl/freedom-kl25z/src/kl_tsi.c
index 0c5f3883442..aba204daaf8 100644
--- a/boards/arm/kl/freedom-kl25z/src/kl_tsi.c
+++ b/boards/arm/kl/freedom-kl25z/src/kl_tsi.c
@@ -36,7 +36,7 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kl_gpio.h"
 #include "hardware/kl_tsi.h"
 #include "hardware/kl_pinmux.h"
diff --git a/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c
index d8b53e2d5bc..75d9f58d2d6 100644
--- a/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c
+++ b/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "freedom-kl26z.h"
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl26z/src/kl_pwm.c b/boards/arm/kl/freedom-kl26z/src/kl_pwm.c
index f425fb134d9..e468a514b8c 100644
--- a/boards/arm/kl/freedom-kl26z/src/kl_pwm.c
+++ b/boards/arm/kl/freedom-kl26z/src/kl_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kl_pwm.h"
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl26z/src/kl_tsi.c b/boards/arm/kl/freedom-kl26z/src/kl_tsi.c
index 1f81cb0241a..391bda8b6c2 100644
--- a/boards/arm/kl/freedom-kl26z/src/kl_tsi.c
+++ b/boards/arm/kl/freedom-kl26z/src/kl_tsi.c
@@ -36,7 +36,7 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kl_gpio.h"
 #include "hardware/kl_tsi.h"
 #include "hardware/kl_pinmux.h"
diff --git a/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c b/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c
index 5f2ff4d4dbd..f28ade5e7d5 100644
--- a/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c
+++ b/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c
@@ -31,8 +31,7 @@
 #include "chip.h"
 #include "kl_gpio.h"
 #include "hardware/kl_pinmux.h"
-
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "teensy-lc.h"
 
 /****************************************************************************
diff --git a/boards/arm/kl/teensy-lc/src/kl_pwm.c b/boards/arm/kl/teensy-lc/src/kl_pwm.c
index 0b198bd3c0b..8d26da098ac 100644
--- a/boards/arm/kl/teensy-lc/src/kl_pwm.c
+++ b/boards/arm/kl/teensy-lc/src/kl_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "kl_pwm.h"
 
 /****************************************************************************
diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c
index 8c830fb93ab..3dd0374da60 100644
--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450-xgevk.h"
 #include "lc823450_adc.h"
 
diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c
index 546862c52be..e830d85ded1 100644
--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lc823450_gpio.h"
 #include "lc823450-xgevk.h"
 
diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c
index b068db8b5ed..bc2704123c3 100644
--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lc823450_gpio.h"
 #include "lc823450-xgevk.h"
 
diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c
index ade339b9a43..db3bd88c6cf 100644
--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c
@@ -30,7 +30,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lc823450_syscontrol.h"
 
diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c
index 1da8305197f..4664daf7084 100644
--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c
@@ -37,7 +37,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/st7565.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_gpio.h"
 #include "lc823450_spi.h"
 #include "lc823450-xgevk.h"
diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c
index b519e155e8e..2b18482d93f 100644
--- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c
+++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c
@@ -36,7 +36,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lc823450_i2c.h"
 #include "lc823450_i2s.h"
 #include "lc823450-xgevk.h"
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c
index 986c2659036..3a6d133b94f 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lincoln60.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c
index c7ce1ee400a..d22cee58317 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c
@@ -33,9 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 
 #include "lincoln60.h"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c
index 194407f75c8..428496a237c 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c
@@ -33,9 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpc4088-devkit.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c
index 290f8b7ac58..8cd2a807e64 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_emc.h"
 
 #include "lpc4088-devkit.h"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c
index 20bd24a309f..1848915a15c 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4088-devkit.h"
 
 #if defined(CONFIG_LPC17_40_EMC) && defined(CONFIG_LPC17_40_EXTNAND)
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c
index 863f3addc43..7bece2e8c12 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4088-devkit.h"
 
 #if defined(CONFIG_LPC17_40_EMC) && defined(CONFIG_LPC17_40_EXTNOR)
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c
index 55641a375f3..c5879ad6b7e 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c
@@ -29,7 +29,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_emc.h"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c
index c780044ac9e..ea7fbdfad71 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c
@@ -33,7 +33,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c
index b8ca9421d83..8a166ce741e 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpc4088-devkit.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c
index 77e898d1013..c71c1eef3ac 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpc4088-quickstart.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c
index deaf6f1d3b7..17211ca5f81 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_emc.h"
 
 #include "lpc4088-quickstart.h"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c
index afe81a8e9bc..1c8709ece6c 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4088-quickstart.h"
 
 #if defined(CONFIG_LPC17_40_SPIFI)
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c
index 07c79323911..ae0efb231bd 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c
@@ -29,7 +29,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_emc.h"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c
index 432559cf4b4..2c060377f36 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c
index 2c79fe1055e..17295199ec1 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpc4088-quickstart.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c
index 87183adbf28..bc175d96db7 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_adc.h"
 #include "lpcxpresso-lpc1768.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c
index 9c32dab0957..32a4596c2cc 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_ssp.h"
 #include "lpcxpresso-lpc1768.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c
index b1a3851090e..80103ab85a9 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c
@@ -30,9 +30,7 @@
 #include <nuttx/analog/dac.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_dac.h"
 
 #ifdef CONFIG_DAC
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c
index 86997c1fc91..69b50d04518 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c
@@ -29,9 +29,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpcxpresso-lpc1768.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c
index 8c9a4fa1b47..f1f8a1e2b9e 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc17_40_pwm.h"
 #include "lpc17_40_timer.h"
 #include "lpcxpresso-lpc1768.h"
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c
index bae1697ea12..c444bab3804 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c
index fd96bac794b..7a125f6c884 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lx_cpu.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c
index c64a73ec87b..f0110c6b854 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_emc.h"
 
 #include "lx_cpu.h"
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c
index 12ee4aedf84..b630dc001ba 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_can.h"
 #include "lx_cpu.h"
 
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c
index 847fff29a0f..22c6324b2a8 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c
@@ -30,7 +30,6 @@
 #include <arch/board/board.h>
 
 #include "nuttx/signal.h"
-#include "arm_arch.h"
 #include "lpc17_40_gpio.h"
 #include "arm_internal.h"
 #include "hardware/lpc17_40_syscon.h"
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c
index e69d295b2a1..7c03f4880c5 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c
@@ -30,7 +30,6 @@
 #include <arch/board/board.h>
 
 #include "nuttx/signal.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_emc.h"
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c
index e7377f23263..73da99037ac 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c
index ba28cea69d0..5ad26454560 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c
@@ -34,7 +34,6 @@
 #include "hardware/lpc17_40_pinconfig.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_gpio.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 #include <arch/board/board.h>
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c
index de567f26a73..83104038310 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lx_cpu.h"
 
diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c
index 1eb3d559710..e358c2d1f08 100644
--- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c
+++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_adc.h"
 #include "mbed.h"
 
diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c
index d3d8de562d7..0a5ed8c7dc5 100644
--- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "mbed.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c
index 62babfeca9a..d001a9424ad 100644
--- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c
+++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c
@@ -30,9 +30,7 @@
 #include <nuttx/analog/dac.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_dac.h"
 
 #ifdef CONFIG_DAC
diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c
index 535d32557c6..ceeb6451ffe 100644
--- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 
 #include "mbed.h"
diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c
index f51744d7f51..c9faf15ac21 100644
--- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c
+++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc17_40_pwm.h"
 #include "lpc17_40_timer.h"
 #include "mbed.h"
diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_userleds.c
index de5a5e88ee0..26e472be229 100644
--- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_userleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "mbed.h"
 
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c
index 87acdbfdc59..169f6679baf 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_adc.h"
 #include "mcb1700.h"
 
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c
index 321c2bb6d1d..2cb9952bc5f 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "mcb1700.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c
index 8c8906e5b4c..e2d58c9074e 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c
@@ -30,9 +30,7 @@
 #include <nuttx/analog/dac.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_dac.h"
 
 #ifdef CONFIG_DAC
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c
index fbf0babbfe9..7a77116395a 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 
 #include "mcb1700.h"
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c
index 73e092816aa..9080c600474 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c
+++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc17_40_pwm.h"
 #include "lpc17_40_timer.h"
 #include "mcb1700.h"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c
index 1d8b2349ddc..d8329187323 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_ssp.h"
 #include "lpc1766stk.h"
 
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c
index 5f649093d79..5b3600a51f6 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_can.h"
 #include "lpc1766stk.h"
 
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c
index f445b4b06ea..efcff4346fe 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c
@@ -33,9 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 
 #include "lpc1766stk.h"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c
index bbd6afe1473..0c6736b07e2 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c
@@ -36,7 +36,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c
index d7e6084cc2e..4b9fc8ca31d 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "open1788.h"
 
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c
index d7fdc5de30f..23929355c65 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_emc.h"
 
 #include "open1788.h"
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c
index 8b860f3d8c2..7e918ede851 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "open1788.h"
 
 #if defined(CONFIG_LPC17_40_EMC) && defined(CONFIG_LPC17_40_EXTNAND)
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c
index 92792d52a3c..c274b5611ec 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "open1788.h"
 
 #if defined(CONFIG_LPC17_40_EMC) && defined(CONFIG_LPC17_40_EXTNOR)
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c
index b056f23aebf..3be6f789c2b 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c
@@ -29,7 +29,6 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "hardware/lpc17_40_syscon.h"
 #include "lpc17_40_emc.h"
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c
index ce20e701dce..85428ed2a91 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c
index d940232f61e..a0f4a5a12d8 100644
--- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c
+++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "open1788.h"
 
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c
index f470f963d2d..67ea3d08de1 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "pnev5180b.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c
index 0d09c9deb13..484f131d97c 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c
@@ -31,9 +31,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "pnev5180b.h"
 
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c
index 2c2cc1f781d..d9e3db79de4 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_spi.h"
 #include "lpc17_40_gpio.h"
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c
index 13f0c1f934c..ef4497e057a 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_adc.h"
 #include "u-blox-c027.h"
 
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c
index 6e48c74610c..c993c4d9415 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
 #include "u-blox-c027.h"
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c
index 4aeeac1057b..67a28b881b1 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c
@@ -30,9 +30,7 @@
 #include <nuttx/analog/dac.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_dac.h"
 
 #ifdef CONFIG_DAC
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c
index d360c4ede90..11a8da6988b 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c
@@ -29,9 +29,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "u-blox-c027.h"
 
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c
index bb88e6a3b7c..4bb0fea7718 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lpc17_40_pwm.h"
 #include "lpc17_40_timer.h"
 #include "u-blox-c027.h"
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c
index 2f03c0b7478..8a915d997d4 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c
index 17754e28e71..fe554983c47 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_adc.h"
 #include "zkit-arm-1769.h"
 
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c
index c1d75d875c1..cedf1b77883 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "zkit-arm-1769.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c
index 0f0ddd3fb9c..34f44cbfb45 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c
@@ -33,7 +33,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc17_40_gpio.h"
 #include "zkit-arm-1769.h"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c
index e0492bb61f4..6e2c6f0d7ee 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc17_40_can.h"
 #include "zkit-arm-1769.h"
 
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c
index c03f9c808f0..335ffa2a244 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c
@@ -30,9 +30,7 @@
 #include <nuttx/analog/dac.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "zkit-arm-1769.h"
 #include "lpc17_40_dac.h"
 
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c
index d2e7684aaa3..4ae48153759 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c
@@ -35,9 +35,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/st7567.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "lpc17_40_ssp.h"
 #include "zkit-arm-1769.h"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c
index 276a2b91f84..927e4b0489a 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c
@@ -30,9 +30,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc17_40_gpio.h"
 #include "zkit-arm-1769.h"
 
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c
index 71d86ab7675..a71e626dcae 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_spi.h"
 #include "lpc17_40_gpio.h"
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c
index 22b6e2a87f4..786f301a6dd 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc17_40_ssp.h"
 #include "lpc17_40_gpio.h"
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c
index cfe5a1cf0b1..7c17ea4efd5 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c
+++ b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c
@@ -26,7 +26,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
index 397629ff0cd..5949e46e50f 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -61,8 +61,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "lpc214x_power.h"
 #include "lpc214x_pinsel.h"
diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
index 98b31da3fbe..963a368da8d 100644
--- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
+++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
@@ -62,8 +62,6 @@
 #include <nuttx/spi/spi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "lpc214x_power.h"
 #include "lpc214x_pinsel.h"
diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c
index 3b4f724ff58..e8a54fe41f4 100644
--- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c
+++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c
@@ -32,7 +32,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ug-2864ambag01.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc214x_pinsel.h"
 #include "lpc214x_spi.h"
diff --git a/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c b/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c
index 9ac28156a69..8ec6b3c2c23 100644
--- a/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c
+++ b/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c
@@ -48,7 +48,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c b/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c
index 2c5aa61753d..3d3b939813a 100644
--- a/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c
+++ b/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc31.h"
 #include "ea3131.h"
diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c b/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c
index ed4ae696bc2..40ee43231fa 100644
--- a/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c
+++ b/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc31.h"
 
diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c b/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c
index a5e35930a73..1cba6f0c09f 100644
--- a/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c
+++ b/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c
@@ -37,8 +37,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc31_syscreg.h"
 #include "lpc31_cgudrvr.h"
 #include "lpc31_mpmc.h"
diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c b/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c
index 30a1f6659a6..ee30a4aa34d 100644
--- a/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c
+++ b/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc31.h"
 #include "ea3131.h"
diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c b/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c
index 138ce2ef5db..02b72bcf53d 100644
--- a/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c
+++ b/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c
@@ -38,8 +38,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc31.h"
 #include "ea3131.h"
 
diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c b/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c
index c21eb476d1f..8a1bfeb1b4f 100644
--- a/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c
+++ b/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc31.h"
 #include "ea3152.h"
diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c b/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c
index 11fb20b4851..80e89805f29 100644
--- a/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c
+++ b/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc31.h"
 
diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c b/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c
index d3d7800789c..b374d62fc88 100644
--- a/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c
+++ b/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c
@@ -37,8 +37,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc31_syscreg.h"
 #include "lpc31_cgudrvr.h"
 #include "lpc31_mpmc.h"
diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c b/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c
index d45649c7f0d..16887ce0e99 100644
--- a/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c
+++ b/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc31.h"
 #include "ea3152.h"
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c
index 4ee33170f79..b09fda04b90 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc31.h"
 #include "lpc_h3131.h"
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c
index 9ff570a413e..8de67497dd9 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc31.h"
 
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c
index d44c75d18c2..d7da3bc7982 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c
@@ -36,8 +36,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc31_syscreg.h"
 #include "lpc31_cgudrvr.h"
 #include "lpc31_mpmc.h"
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c
index 275d25af839..d0c934cac6c 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "lpc31.h"
 #include "lpc_h3131.h"
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c
index e4dc96b5273..8c9dcc7da01 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c
@@ -38,8 +38,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc31.h"
 #include "lpc_h3131.h"
 
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c
index 7aa09fe32a9..afc9386666c 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "bambino-200e.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c
index e5bfd8706fc..51e5685b552 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "bambino-200e.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c
index f07dc4f8428..c0ef9b05a2b 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "bambino-200e.h"
 
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c
index 090667ddc22..05963e09874 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "bambino-200e.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c
index d9671d9c172..aaf26ae5824 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4330-xplorer.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c
index c06741e66a6..3d70b3af3a5 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4330-xplorer.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c
index a2bf35c65c5..9210a0a8daa 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc4330-xplorer.h"
 
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c
index 7821062659c..c6cfbf8189b 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4330-xplorer.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c
index 8240e5dc909..da1aac86cb2 100644
--- a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c
+++ b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc43_adc.h"
 
 #if defined(CONFIG_LPC43_ADC0) || defined(CONFIG_LPC43_ADC1)
diff --git a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c
index 630a9b93011..6ed356d252c 100644
--- a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c
+++ b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4337-ws.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c
index 76c884f9cd6..7ca102acc9d 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c
+++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4357-evb.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c
index c9590f4cf56..b1f3fdb4ee2 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c
+++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4357-evb.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c
index 9f776b982e0..a45ba6f2fde 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c
+++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc4357-evb.h"
 
diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c
index e7a46b97f18..6ed68ddfe4e 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4357-evb.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c
index 81d301ea9d2..360cac905f2 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c
+++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "lpc43_adc.h"
 
 #if defined(CONFIG_LPC43_ADC0) || defined(CONFIG_LPC43_ADC1)
diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c
index d335d424ce4..eda6df7af1b 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c
+++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4370-link2.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c
index 73e895d5dda..b91340f68d2 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c
+++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4370-link2.h"
 
 /****************************************************************************
diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c
index 08e625cfea6..ac1b6973aaa 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c
+++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc4370-link2.h"
 
diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c
index 8cc43386d3f..e937223d5d2 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c
+++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lpc43_spifi.h"
 #include "lpc43_cgu.h"
diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c
index 4f136f46b37..6225bc6ac08 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c
+++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "lpc4370-link2.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_boot.c b/boards/arm/max326xx/max32660-evsys/src/max326_boot.c
index 09a7e566e30..6775fd8560f 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max326_boot.c
+++ b/boards/arm/max326xx/max32660-evsys/src/max326_boot.c
@@ -33,7 +33,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "max326_start.h"
 #include "max32660-evsys.h"
 
diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_spi.c b/boards/arm/max326xx/max32660-evsys/src/max326_spi.c
index 05d11bd7dc3..ee9ec9531f2 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max326_spi.c
+++ b/boards/arm/max326xx/max32660-evsys/src/max326_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "max326_spim.h"
 
 #include "max32660-evsys.h"
diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c
index 5157ced3636..ce6c461be23 100644
--- a/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c
+++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c
@@ -41,9 +41,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52-feather.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c
index 68736316f5c..8d88820cbf8 100644
--- a/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c
+++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52-feather.h"
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c
index 45574804d12..63b287d9acb 100644
--- a/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52-feather.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c
index bf5376425e5..a4367e625f5 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c
@@ -43,9 +43,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52832-dk.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c
index b9e3e7533e5..4472e2d2a24 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52832-dk.h"
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c
index 87bd5402804..e09321933ff 100644
--- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52832-dk.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_autoleds.c
index fd9e3b28e5a..4df847d1e85 100644
--- a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_autoleds.c
+++ b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52832-mdk.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_boot.c b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_boot.c
index ae6868a0de7..01485e312cb 100644
--- a/boards/arm/nrf52/nrf52832-mdk/src/nrf52_boot.c
+++ b/boards/arm/nrf52/nrf52832-mdk/src/nrf52_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52832-mdk.h"
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_autoleds.c
index f5c68c4227c..c77ffe34b10 100644
--- a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_autoleds.c
+++ b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_autoleds.c
@@ -41,9 +41,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52832-sparkfun.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_boot.c b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_boot.c
index 69f31b6cb3e..694171052ad 100644
--- a/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_boot.c
+++ b/boards/arm/nrf52/nrf52832-sparkfun/src/nrf52_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52832-sparkfun.h"
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c
index 66886a91c25..1b97d74a1b2 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52840-dk.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c
index bc360eb2e45..5afb11b033c 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52840-dk.h"
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c
index d3814b147b0..0e261fa7269 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "nrf52_gpio.h"
 #include "nrf52_spi.h"
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c
index b59f164ad7c..7ea7e260f6a 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52840-dk.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c
index b3b677d47ba..c02fa3fae0d 100644
--- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c
+++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52840-dongle.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c
index bc7bea2347a..a0230a1bd74 100644
--- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c
+++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52840-dongle.h"
 
 /****************************************************************************
diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c
index bfd7d51bf9f..351cec53622 100644
--- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c
+++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "nrf52840-dongle.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c b/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c
index 3531b4e3ca1..29ab843911b 100644
--- a/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c
+++ b/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c
@@ -28,7 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nutiny-nuc120.h"
 
 /****************************************************************************
diff --git a/boards/arm/phy62xx/phy6222/src/boot.c b/boards/arm/phy62xx/phy6222/src/boot.c
index a05c4106ab4..e4f3619736b 100644
--- a/boards/arm/phy62xx/phy6222/src/boot.c
+++ b/boards/arm/phy62xx/phy6222/src/boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "phy6222.h"
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/common/src/rp2040_enc28j60.c b/boards/arm/rp2040/common/src/rp2040_enc28j60.c
index 440593bfd92..3a0f912e149 100644
--- a/boards/arm/rp2040/common/src/rp2040_enc28j60.c
+++ b/boards/arm/rp2040/common/src/rp2040_enc28j60.c
@@ -34,9 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "rp2040_spi.h"
 #include "rp2040_gpio.h"
 
diff --git a/boards/arm/rp2040/common/src/rp2040_i2sdev.c b/boards/arm/rp2040/common/src/rp2040_i2sdev.c
index 2b74f68e948..98cfee7a25f 100644
--- a/boards/arm/rp2040/common/src/rp2040_i2sdev.c
+++ b/boards/arm/rp2040/common/src/rp2040_i2sdev.c
@@ -35,7 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "rp2040_i2s.h"
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_gpio.c b/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_gpio.c
index dc3c346d125..5cc132a624c 100644
--- a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_gpio.c
+++ b/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_gpio.c
@@ -35,7 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "rp2040_gpio.h"
 
diff --git a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_spi.c b/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_spi.c
index 70d167989da..138f42d4523 100644
--- a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_spi.c
+++ b/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "rp2040_gpio.h"
 #include "hardware/rp2040_spi.h"
diff --git a/boards/arm/rp2040/raspberrypi-pico/src/rp2040_boardinitialize.c b/boards/arm/rp2040/raspberrypi-pico/src/rp2040_boardinitialize.c
index 7bdb9c4e546..33e6790870b 100644
--- a/boards/arm/rp2040/raspberrypi-pico/src/rp2040_boardinitialize.c
+++ b/boards/arm/rp2040/raspberrypi-pico/src/rp2040_boardinitialize.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "rp2040_gpio.h"
 
 /****************************************************************************
diff --git a/boards/arm/rp2040/raspberrypi-pico/src/rp2040_gpio.c b/boards/arm/rp2040/raspberrypi-pico/src/rp2040_gpio.c
index eebaa52c6f2..9bae4f37a86 100644
--- a/boards/arm/rp2040/raspberrypi-pico/src/rp2040_gpio.c
+++ b/boards/arm/rp2040/raspberrypi-pico/src/rp2040_gpio.c
@@ -35,7 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "rp2040_gpio.h"
 
diff --git a/boards/arm/rp2040/raspberrypi-pico/src/rp2040_spi.c b/boards/arm/rp2040/raspberrypi-pico/src/rp2040_spi.c
index 2d21633aa81..23629b9267e 100644
--- a/boards/arm/rp2040/raspberrypi-pico/src/rp2040_spi.c
+++ b/boards/arm/rp2040/raspberrypi-pico/src/rp2040_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "rp2040_gpio.h"
 #include "hardware/rp2040_spi.h"
diff --git a/boards/arm/sam34/arduino-due/src/sam_mmcsd.c b/boards/arm/sam34/arduino-due/src/sam_mmcsd.c
index 69397cc3aa0..1f403f67391 100644
--- a/boards/arm/sam34/arduino-due/src/sam_mmcsd.c
+++ b/boards/arm/sam34/arduino-due/src/sam_mmcsd.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <nuttx/spi/spi_bitbang.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "hardware/sam3u_pio.h"
 
diff --git a/boards/arm/sam34/arduino-due/src/sam_touchscreen.c b/boards/arm/sam34/arduino-due/src/sam_touchscreen.c
index 8b4875b4dcf..f0d2e076ba2 100644
--- a/boards/arm/sam34/arduino-due/src/sam_touchscreen.c
+++ b/boards/arm/sam34/arduino-due/src/sam_touchscreen.c
@@ -36,7 +36,7 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "hardware/sam3u_pio.h"
 
diff --git a/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c
index 88ef925a0ec..1fed8fb3eb3 100644
--- a/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c
+++ b/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c
@@ -33,7 +33,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sam34/sam3u-ek/src/sam_boot.c b/boards/arm/sam34/sam3u-ek/src/sam_boot.c
index 39086b52d2b..d6c542174d4 100644
--- a/boards/arm/sam34/sam3u-ek/src/sam_boot.c
+++ b/boards/arm/sam34/sam3u-ek/src/sam_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam3u-ek.h"
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c
index 4136881214c..f87f6260ddc 100644
--- a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c
+++ b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c
@@ -119,7 +119,7 @@
 
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "hardware/sam_pmc.h"
 #include "hardware/sam_smc.h"
diff --git a/boards/arm/sam34/sam3u-ek/src/sam_leds.c b/boards/arm/sam34/sam3u-ek/src/sam_leds.c
index d2996e22a1f..a208232b755 100644
--- a/boards/arm/sam34/sam3u-ek/src/sam_leds.c
+++ b/boards/arm/sam34/sam3u-ek/src/sam_leds.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam3u-ek.h"
diff --git a/boards/arm/sam34/sam3u-ek/src/sam_spi.c b/boards/arm/sam34/sam3u-ek/src/sam_spi.c
index e190a66c79d..60e1109465f 100644
--- a/boards/arm/sam34/sam3u-ek/src/sam_spi.c
+++ b/boards/arm/sam34/sam3u-ek/src/sam_spi.c
@@ -33,7 +33,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c b/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c
index c24528b7acb..49f4fd2245b 100644
--- a/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c
+++ b/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam3u-ek.h"
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_boot.c b/boards/arm/sam34/sam4e-ek/src/sam_boot.c
index 8071638b916..a9634471610 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_boot.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam4e-ek.h"
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c
index 1c8218079af..f14b0f8e7f6 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c
@@ -117,7 +117,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pmc.h"
@@ -770,7 +770,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
       /* RRRR RGGG GGGB BBBB -> RRRR R000, GGGG GG00, BBBB B000 */
 
       *ptr++ = (value[0] & 0xf8);
-      *ptr++ = (value[0] & 0x07) << 5) | ((value[1] & 0xe0) >> 3);
+      *ptr++ = ((value[0] & 0x07) << 5) | ((value[1] & 0xe0) >> 3);
       *ptr++ = (value[1] & 0x1f) << 3;
 
 #else /* if defined(CONFIG_SAM4EEK_LCD_RGB32) */
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c
index d08838ba069..bf03f9c2248 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c
@@ -117,7 +117,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_pmc.h"
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_leds.c b/boards/arm/sam34/sam4e-ek/src/sam_leds.c
index df14bc4c220..45d2bfd1af1 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_leds.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_leds.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam4e-ek.h"
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_spi.c b/boards/arm/sam34/sam4e-ek/src/sam_spi.c
index 71c7713f52c..de3cbb6f5b9 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_spi.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_spi.c
@@ -33,7 +33,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sam34/sam4e-ek/src/sam_udp.c b/boards/arm/sam34/sam4e-ek/src/sam_udp.c
index 01419fe9ea7..e519b3c25e3 100644
--- a/boards/arm/sam34/sam4e-ek/src/sam_udp.c
+++ b/boards/arm/sam34/sam4e-ek/src/sam_udp.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam4e-ek.h"
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
index ac523dd4230..a5a4a2841d3 100644
--- a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
+++ b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
@@ -44,7 +44,7 @@
 #include <nuttx/lcd/slcd_codec.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam4l_periphclks.h"
 #include "hardware/sam4l_lcdca.h"
diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c
index 2186d56a2d3..1b123fb1749 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c
+++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c
@@ -34,7 +34,7 @@
 #include <nuttx/fs/nxffs.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "sam4s_nand.h"
 #include "hardware/sam_smc.h"
diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c
index 73f44c544e7..6b097f6fe62 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c
+++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c
index d17bb46663e..f1b047fa027 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c
+++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam4s-xplained-pro.h"
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4s-xplained/src/sam_sram.c b/boards/arm/sam34/sam4s-xplained/src/sam_sram.c
index 947f7535272..128b40953a2 100644
--- a/boards/arm/sam34/sam4s-xplained/src/sam_sram.c
+++ b/boards/arm/sam34/sam4s-xplained/src/sam_sram.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam4s_periphclks.h"
 #include "hardware/sam_smc.h"
 #include "sam4s-xplained.h"
diff --git a/boards/arm/sama5/giant-board/src/sam_ostest.c b/boards/arm/sama5/giant-board/src/sam_ostest.c
index f793d3f8a25..1c20304755a 100644
--- a/boards/arm/sama5/giant-board/src/sam_ostest.c
+++ b/boards/arm/sama5/giant-board/src/sam_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "giant-board.h"
 
diff --git a/boards/arm/sama5/giant-board/src/sam_sdmmc.c b/boards/arm/sama5/giant-board/src/sam_sdmmc.c
index cb38ec0d754..d8acf89733a 100644
--- a/boards/arm/sama5/giant-board/src/sam_sdmmc.c
+++ b/boards/arm/sama5/giant-board/src/sam_sdmmc.c
@@ -50,8 +50,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_pio.h"
 #include "sam_sdmmc.h"
 
diff --git a/boards/arm/sama5/giant-board/src/sam_sdram.c b/boards/arm/sama5/giant-board/src/sam_sdram.c
index fdf6ab7da46..d47f2b31e70 100644
--- a/boards/arm/sama5/giant-board/src/sam_sdram.c
+++ b/boards/arm/sama5/giant-board/src/sam_sdram.c
@@ -26,8 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_memorymap.h"
 #include "hardware/sam_pmc.h"
diff --git a/boards/arm/sama5/giant-board/src/sam_spi.c b/boards/arm/sama5/giant-board/src/sam_spi.c
index c92c7a365f5..80ec8f1b305 100644
--- a/boards/arm/sama5/giant-board/src/sam_spi.c
+++ b/boards/arm/sama5/giant-board/src/sam_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_pio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sama5/giant-board/src/sam_usb.c b/boards/arm/sama5/giant-board/src/sam_usb.c
index a3c52f0880a..9b4e78f3d56 100644
--- a/boards/arm/sama5/giant-board/src/sam_usb.c
+++ b/boards/arm/sama5/giant-board/src/sam_usb.c
@@ -38,7 +38,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_usbhost.h"
 #include "hardware/sam_ohci.h"
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_can.c b/boards/arm/sama5/sama5d2-xult/src/sam_can.c
index 7e219a49edd..03c4f172180 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_can.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_can.h"
 #include "sama5d2-xult.h"
 
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c b/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c
index 5fc3f93034f..407a68f3b96 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c
@@ -33,7 +33,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/nxffs.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "sam_pio.h"
 #include "sam_nand.h"
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c b/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c
index 2272c2860e3..caa668b54c9 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sama5d2-xult.h"
 
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c b/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c
index 4077cdb5bc5..e96fc8409eb 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c
@@ -67,8 +67,6 @@
 
 #include "chip.h"
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "sam_pio.h"
 #include "sam_sdmmc.h"
 
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c b/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c
index da62a4b46be..cbaad0554cb 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c
@@ -26,8 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_memorymap.h"
 #include "hardware/sam_pmc.h"
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_spi.c b/boards/arm/sama5/sama5d2-xult/src/sam_spi.c
index fb00fd4ef2e..e10598491fe 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_spi.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_pio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_usb.c b/boards/arm/sama5/sama5d2-xult/src/sam_usb.c
index ba071bd366f..de7cfc0a786 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_usb.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_usb.c
@@ -38,7 +38,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_usbhost.h"
 #include "hardware/sam_ohci.h"
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_can.c b/boards/arm/sama5/sama5d3-xplained/src/sam_can.c
index df866b06553..cea1a468aff 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_can.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_can.h"
 #include "sama5d3-xplained.h"
 
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c b/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c
index cef9972c5fd..ab1209b0d35 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c
@@ -33,7 +33,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/nxffs.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "sam_pio.h"
 #include "sam_nand.h"
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c b/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c
index 3fa2b3e36da..c603b3918e2 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sama5d3-xplained.h"
 
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c b/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c
index 01a3a8bb7cc..a887847b38d 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c
@@ -26,8 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_memorymap.h"
 #include "hardware/sam_pmc.h"
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c b/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c
index 4de73728902..9e0188a8adc 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_pio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c b/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c
index e8773ee91ea..473d9c5ba3a 100644
--- a/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c
+++ b/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c
@@ -38,7 +38,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_usbhost.h"
 #include "hardware/sam_ohci.h"
diff --git a/boards/arm/sama5/sama5d3x-ek/src/nor_main.c b/boards/arm/sama5/sama5d3x-ek/src/nor_main.c
index f9b5a433337..5a3cc0906c9 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/nor_main.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/nor_main.c
@@ -30,7 +30,7 @@
 #include <nuttx/cache.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "mmu.h"
 #include "cp15_cacheops.h"
 
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_can.c b/boards/arm/sama5/sama5d3x-ek/src/sam_can.c
index 7bf2908157d..a1c362097b7 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_can.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_can.h"
 #include "sama5d3x-ek.h"
 
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c
index 73da1b97135..371565eedef 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c
@@ -33,7 +33,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/nxffs.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "sam_pio.h"
 #include "sam_nand.h"
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c b/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c
index abc1bfd1f1b..ee8482707dc 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_hsmc.h"
 
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c
index 74d273f9f20..c664cd21e76 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sama5d3x-ek.h"
 
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c
index a57055efd35..6be357f36a8 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c
@@ -31,8 +31,7 @@
 #include <nuttx/video/fb.h>
 #include <nuttx/video/ov2640.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "sam_lcd.h"
 #include "sam_pck.h"
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c b/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c
index 3593bc70c44..6c56d84cd05 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c
@@ -26,8 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_memorymap.h"
 #include "hardware/sam_pmc.h"
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c b/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c
index 66f45bf4937..62bf86629f6 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_pio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c b/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c
index 9c9285106c4..8532e18a3ad 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c
@@ -38,7 +38,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_usbhost.h"
 #include "hardware/sam_ohci.h"
diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c
index 62acd4022cb..7f4cd44ac4e 100644
--- a/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c
+++ b/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c
@@ -38,7 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_twi.h"
 #include "sam_ssc.h"
diff --git a/boards/arm/sama5/sama5d4-ek/src/dram_main.c b/boards/arm/sama5/sama5d4-ek/src/dram_main.c
index 8c844118ccc..52005bd8fe4 100644
--- a/boards/arm/sama5/sama5d4-ek/src/dram_main.c
+++ b/boards/arm/sama5/sama5d4-ek/src/dram_main.c
@@ -31,7 +31,7 @@
 #include <nuttx/cache.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "mmu.h"
 #include "cp15_cacheops.h"
 
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c b/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c
index 8c8db0e6f5b..5d47c16e6c2 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c
@@ -35,7 +35,7 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/mxt.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_twi.h"
 
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c
index 110fe499e02..9327634dfff 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c
@@ -33,7 +33,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/nxffs.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "sam_pio.h"
 #include "sam_nand.h"
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c b/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c
index e78bf438e22..b0f9f3c1c28 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sama5d4-ek.h"
 
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c b/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c
index a8f4297e2dc..b5a6ea280e1 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c
@@ -122,7 +122,7 @@
 
 #include <nuttx/arch.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "sam_periphclks.h"
 #include "hardware/sam_memorymap.h"
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_spi.c b/boards/arm/sama5/sama5d4-ek/src/sam_spi.c
index 3c93130486d..71d80227a84 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_spi.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_pio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_usb.c b/boards/arm/sama5/sama5d4-ek/src/sam_usb.c
index 7ab8f09a326..f884e29c9a1 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_usb.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_usb.c
@@ -38,7 +38,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_usbhost.h"
 #include "hardware/sam_ohci.h"
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c
index de5006a8451..94fb8b2582c 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c
@@ -38,7 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_pio.h"
 #include "sam_twi.h"
 #include "sam_ssc.h"
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c b/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c
index 4650403cfe4..226cd390e24 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c
@@ -65,7 +65,6 @@
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sam_port.h"
 #include "metro-m4.h"
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c b/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c
index e81ca10ab14..19a2e54c2d2 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c
@@ -35,7 +35,7 @@
 #include <nuttx/power/bq27426.h>
 #include <nuttx/power/battery_ioctl.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/sam_i2c_master.h"
 #include "metro-m4.h"
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_i2c.c b/boards/arm/samd5e5/metro-m4/src/sam_i2c.c
index 57bf58f0546..39e51b45ce6 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_i2c.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_i2c.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/i2c/i2c_master.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "metro-m4.h"
 #include "sam_config.h"
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c b/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c
index 1bf42f8ec62..2bd90c8418c 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c b/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c
index 4df8dfb13d0..8f54ebaf87f 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "metro-m4.h"
 #include <arch/board/board.h>
 
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c b/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c
index bd25beca95c..be2ee121409 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "metro-m4.h"
 #include "sam_port.h"
 #include "sam_usbhost.h"
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_userleds.c b/boards/arm/samd5e5/metro-m4/src/sam_userleds.c
index 6b6e1241d68..62f69f9f92a 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_userleds.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_userleds.c
@@ -46,7 +46,7 @@
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_port.h"
 
 #include "metro-m4.h"
diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c b/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c
index 2a1f94738b4..4822189a244 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c
+++ b/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c
@@ -62,7 +62,6 @@
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "sam_port.h"
 #include "same54-xplained-pro.h"
diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c b/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c
index 8cc99843cad..fc62d4084da 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c
+++ b/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c
@@ -44,7 +44,7 @@
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_port.h"
 
 #include "same54-xplained-pro.h"
diff --git a/boards/arm/samv7/common/src/sam_boot_image.c b/boards/arm/samv7/common/src/sam_boot_image.c
index 9cde2140dcf..f499739597a 100644
--- a/boards/arm/samv7/common/src/sam_boot_image.c
+++ b/boards/arm/samv7/common/src/sam_boot_image.c
@@ -33,7 +33,7 @@
 #include <nuttx/cache.h>
 
 #include "nvic.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "barriers.h"
 
 #ifdef CONFIG_BOARDCTL_BOOT_IMAGE
diff --git a/boards/arm/samv7/same70-qmtech/src/sam_afec.c b/boards/arm/samv7/same70-qmtech/src/sam_afec.c
index c493bd4c60f..61c4ce7b5c4 100644
--- a/boards/arm/samv7/same70-qmtech/src/sam_afec.c
+++ b/boards/arm/samv7/same70-qmtech/src/sam_afec.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_afec.h"
 #include "same70-qmtech.h"
 
diff --git a/boards/arm/samv7/same70-qmtech/src/sam_boot.c b/boards/arm/samv7/same70-qmtech/src/sam_boot.c
index f93b59528e4..40104bffbea 100644
--- a/boards/arm/samv7/same70-qmtech/src/sam_boot.c
+++ b/boards/arm/samv7/same70-qmtech/src/sam_boot.c
@@ -33,7 +33,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_start.h"
 #include "sam_pck.h"
 #include "same70-qmtech.h"
diff --git a/boards/arm/samv7/same70-qmtech/src/sam_buttons.c b/boards/arm/samv7/same70-qmtech/src/sam_buttons.c
index e4c842008f5..c9eebeb0d60 100644
--- a/boards/arm/samv7/same70-qmtech/src/sam_buttons.c
+++ b/boards/arm/samv7/same70-qmtech/src/sam_buttons.c
@@ -34,7 +34,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "hardware/sam_matrix.h"
 #include "same70-qmtech.h"
diff --git a/boards/arm/samv7/same70-qmtech/src/sam_dac.c b/boards/arm/samv7/same70-qmtech/src/sam_dac.c
index 8d36c6d26e3..d32d946d21d 100644
--- a/boards/arm/samv7/same70-qmtech/src/sam_dac.c
+++ b/boards/arm/samv7/same70-qmtech/src/sam_dac.c
@@ -31,7 +31,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_dac.h"
 #include "same70-qmtech.h"
diff --git a/boards/arm/samv7/same70-qmtech/src/sam_spi.c b/boards/arm/samv7/same70-qmtech/src/sam_spi.c
index a23c0679cc5..b60016a9825 100644
--- a/boards/arm/samv7/same70-qmtech/src/sam_spi.c
+++ b/boards/arm/samv7/same70-qmtech/src/sam_spi.c
@@ -33,7 +33,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/samv7/same70-xplained/src/sam_afec.c b/boards/arm/samv7/same70-xplained/src/sam_afec.c
index a17b2d4b62a..909f20ecdc7 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_afec.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_afec.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_afec.h"
 #include "same70-xplained.h"
 
diff --git a/boards/arm/samv7/same70-xplained/src/sam_boot.c b/boards/arm/samv7/same70-xplained/src/sam_boot.c
index e28c99343f9..9d782855c6b 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_boot.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_boot.c
@@ -33,7 +33,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_start.h"
 #include "sam_pck.h"
 #include "same70-xplained.h"
diff --git a/boards/arm/samv7/same70-xplained/src/sam_buttons.c b/boards/arm/samv7/same70-xplained/src/sam_buttons.c
index 054805a3066..5e65296d7f9 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_buttons.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_buttons.c
@@ -34,7 +34,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "hardware/sam_matrix.h"
 #include "same70-xplained.h"
diff --git a/boards/arm/samv7/same70-xplained/src/sam_dac.c b/boards/arm/samv7/same70-xplained/src/sam_dac.c
index b8c8feb9900..977f44edf38 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_dac.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_dac.c
@@ -31,7 +31,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_dac.h"
 #include "same70-xplained.h"
diff --git a/boards/arm/samv7/same70-xplained/src/sam_sdram.c b/boards/arm/samv7/same70-xplained/src/sam_sdram.c
index 3812b0c8d43..027715b4cc6 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_sdram.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_sdram.c
@@ -29,8 +29,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_memorymap.h"
 #include "hardware/sam_pinmap.h"
diff --git a/boards/arm/samv7/same70-xplained/src/sam_spi.c b/boards/arm/samv7/same70-xplained/src/sam_spi.c
index 24e1557f100..6561f5e29a3 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_spi.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_spi.c
@@ -33,7 +33,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/samv7/same70-xplained/src/sam_usbdev.c b/boards/arm/samv7/same70-xplained/src/sam_usbdev.c
index 5bc108714e2..def4c63f37d 100644
--- a/boards/arm/samv7/same70-xplained/src/sam_usbdev.c
+++ b/boards/arm/samv7/same70-xplained/src/sam_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "same70-xplained.h"
 
diff --git a/boards/arm/samv7/samv71-xult/src/sam_boot.c b/boards/arm/samv7/samv71-xult/src/sam_boot.c
index 18234410388..d835189aa3a 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_boot.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_boot.c
@@ -33,7 +33,7 @@
 #include <nuttx/clock.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_start.h"
 #include "sam_pck.h"
 #include "samv71-xult.h"
diff --git a/boards/arm/samv7/samv71-xult/src/sam_buttons.c b/boards/arm/samv7/samv71-xult/src/sam_buttons.c
index 493bdda8b83..20f138d00e7 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_buttons.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_buttons.c
@@ -34,7 +34,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "hardware/sam_matrix.h"
 #include "samv71-xult.h"
diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
index 419324e043a..ba160933279 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
@@ -121,7 +121,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "sam_xdmac.h"
diff --git a/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c b/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c
index 24428b40fa9..c5ae2a5ff2a 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c
@@ -35,7 +35,7 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/mxt.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam_twihs.h"
 
diff --git a/boards/arm/samv7/samv71-xult/src/sam_sdram.c b/boards/arm/samv7/samv71-xult/src/sam_sdram.c
index 3314377faa9..f5976c8453e 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_sdram.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_sdram.c
@@ -29,8 +29,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "sam_periphclks.h"
 #include "hardware/sam_memorymap.h"
 #include "hardware/sam_pinmap.h"
diff --git a/boards/arm/samv7/samv71-xult/src/sam_spi.c b/boards/arm/samv7/samv71-xult/src/sam_spi.c
index 150cbe431ab..859c2f292be 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_spi.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_spi.c
@@ -33,7 +33,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "sam_gpio.h"
 #include "sam_spi.h"
diff --git a/boards/arm/samv7/samv71-xult/src/sam_usbdev.c b/boards/arm/samv7/samv71-xult/src/sam_usbdev.c
index 763850f9aff..83bbf9d80ad 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_usbdev.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "samv71-xult.h"
 
diff --git a/boards/arm/samv7/samv71-xult/src/sam_wm8904.c b/boards/arm/samv7/samv71-xult/src/sam_wm8904.c
index 0c0744dd9ba..07e9326de86 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_wm8904.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_wm8904.c
@@ -38,7 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sam_gpio.h"
 #include "sam_twihs.h"
 #include "sam_ssc.h"
diff --git a/boards/arm/stm32/axoloti/src/stm32_boot.c b/boards/arm/stm32/axoloti/src/stm32_boot.c
index ae14ba72f39..917973884a8 100644
--- a/boards/arm/stm32/axoloti/src/stm32_boot.c
+++ b/boards/arm/stm32/axoloti/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "itm.h"
 
diff --git a/boards/arm/stm32/axoloti/src/stm32_extmem.c b/boards/arm/stm32/axoloti/src/stm32_extmem.c
index c6ab53596e4..9784f6f59cb 100644
--- a/boards/arm/stm32/axoloti/src/stm32_extmem.c
+++ b/boards/arm/stm32/axoloti/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "axoloti.h"
 
diff --git a/boards/arm/stm32/axoloti/src/stm32_usbhost.c b/boards/arm/stm32/axoloti/src/stm32_usbhost.c
index c6a6a8b5c79..33d54221445 100644
--- a/boards/arm/stm32/axoloti/src/stm32_usbhost.c
+++ b/boards/arm/stm32/axoloti/src/stm32_usbhost.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otghs.h"
 #include "axoloti.h"
diff --git a/boards/arm/stm32/axoloti/src/stm32_userleds.c b/boards/arm/stm32/axoloti/src/stm32_userleds.c
index 10839c51d2f..87073a4d3d5 100644
--- a/boards/arm/stm32/axoloti/src/stm32_userleds.c
+++ b/boards/arm/stm32/axoloti/src/stm32_userleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32.h"
 #include "axoloti.h"
 
diff --git a/boards/arm/stm32/b-g431b-esc1/src/stm32_can.c b/boards/arm/stm32/b-g431b-esc1/src/stm32_can.c
index bf5e483c842..60989a1456d 100644
--- a/boards/arm/stm32/b-g431b-esc1/src/stm32_can.c
+++ b/boards/arm/stm32/b-g431b-esc1/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_fdcan.h"
 #include "b-g431b-esc1.h"
diff --git a/boards/arm/stm32/b-g431b-esc1/src/stm32_foc.c b/boards/arm/stm32/b-g431b-esc1/src/stm32_foc.c
index 291a590f28a..64b04ec4306 100644
--- a/boards/arm/stm32/b-g431b-esc1/src/stm32_foc.c
+++ b/boards/arm/stm32/b-g431b-esc1/src/stm32_foc.c
@@ -44,8 +44,7 @@
 #  include "stm32_qencoder.h"
 #endif
 
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "b-g431b-esc1.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c b/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c
index 003c7cfc578..04943e070ec 100644
--- a/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c
+++ b/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_adc.c b/boards/arm/stm32/cloudctrl/src/stm32_adc.c
index 86730be4e43..b35a74e3e1b 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_adc.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "cloudctrl.h"
 
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c b/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c
index 1542fe64ade..be49d8a2b64 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "cloudctrl.h"
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_boot.c b/boards/arm/stm32/cloudctrl/src/stm32_boot.c
index 1828ffdde34..e8009d9f0ab 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_boot.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "cloudctrl.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_chipid.c b/boards/arm/stm32/cloudctrl/src/stm32_chipid.c
index c1aacae7cc3..fcb8dc53ccf 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_chipid.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_chipid.c
@@ -28,7 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -49,7 +49,7 @@ const char *stm32_getchipid(void)
 
   for (i = 0; i < 12; i++)
     {
-      cpuid[i] = getreg8(0x1ffff7e8+i);
+      cpuid[i] = getreg8(0x1ffff7e8 + i);
     }
 
   return cpuid;
@@ -63,7 +63,7 @@ const char *stm32_getchipid_string(void)
 
   for (i = 0, c = 0; i < 12; i++)
     {
-      sprintf(&cpuid[c], "%02X", getreg8(0x1ffff7e8+11-i));
+      sprintf(&cpuid[c], "%02X", getreg8(0x1ffff7e8 + 11 - i));
       c += 2;
       if (i % 4 == 3)
         {
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_spi.c b/boards/arm/stm32/cloudctrl/src/stm32_spi.c
index d50af9a336d..79f0f6220e0 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_spi.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "cloudctrl.h"
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_usb.c b/boards/arm/stm32/cloudctrl/src/stm32_usb.c
index 959d605824b..d278e3e87ad 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_usb.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "cloudctrl.h"
diff --git a/boards/arm/stm32/cloudctrl/src/stm32_userleds.c b/boards/arm/stm32/cloudctrl/src/stm32_userleds.c
index 2614e1112a4..e97f93a1733 100644
--- a/boards/arm/stm32/cloudctrl/src/stm32_userleds.c
+++ b/boards/arm/stm32/cloudctrl/src/stm32_userleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "cloudctrl.h"
diff --git a/boards/arm/stm32/common/src/stm32_nrf24l01.c b/boards/arm/stm32/common/src/stm32_nrf24l01.c
index bcedd2f10d3..5c52bc0652f 100644
--- a/boards/arm/stm32/common/src/stm32_nrf24l01.c
+++ b/boards/arm/stm32/common/src/stm32_nrf24l01.c
@@ -35,7 +35,7 @@
 #include <nuttx/wireless/nrf24l01.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_nrf24l01.h"
diff --git a/boards/arm/stm32/common/src/stm32_qencoder.c b/boards/arm/stm32/common/src/stm32_qencoder.c
index bc2f36c312b..0a31bc9ee11 100644
--- a/boards/arm/stm32/common/src/stm32_qencoder.c
+++ b/boards/arm/stm32/common/src/stm32_qencoder.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_qencoder.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/common/src/stm32_tone.c b/boards/arm/stm32/common/src/stm32_tone.c
index 9327f90324b..bbb0d6994fe 100644
--- a/boards/arm/stm32/common/src/stm32_tone.c
+++ b/boards/arm/stm32/common/src/stm32_tone.c
@@ -35,7 +35,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32_tone.h"
 
diff --git a/boards/arm/stm32/emw3162/src/stm32_boot.c b/boards/arm/stm32/emw3162/src/stm32_boot.c
index b1a0462c3cf..2042e3cb423 100644
--- a/boards/arm/stm32/emw3162/src/stm32_boot.c
+++ b/boards/arm/stm32/emw3162/src/stm32_boot.c
@@ -27,7 +27,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "emw3162.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/et-stm32-stamp/src/stm32_boot.c b/boards/arm/stm32/et-stm32-stamp/src/stm32_boot.c
index 089c5428f81..29158e1e495 100644
--- a/boards/arm/stm32/et-stm32-stamp/src/stm32_boot.c
+++ b/boards/arm/stm32/et-stm32-stamp/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "et-stm32-stamp.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c b/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c
index e4bce7e6fbc..c6021eedd23 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "fire-stm32v2.h"
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c b/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c
index 97aa97682b0..1fe51f2b8aa 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "fire-stm32v2.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c b/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c
index ebff7d851ea..cfb8a2bd782 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c
@@ -50,7 +50,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c b/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c
index aa3c0ea7e11..5c6af948193 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32.h"
 #include "fire-stm32v2.h"
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c b/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c
index f2cb850274f..79ef0675b55 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "fire-stm32v2.h"
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c b/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c
index 60971d3ac8a..d641d247809 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "fire-stm32v2.h"
 
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c b/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c
index 1be8e23b97c..ecd7d511825 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "fire-stm32v2.h"
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c b/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c
index cf98e31d095..51c9ee7dc40 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c
@@ -28,7 +28,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hymini-stm32v.h"
 
 #include <arch/board/board.h>  /* Should always be included last due to dependencies */
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c b/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c
index 4fdee0ee3d7..e820c0877a8 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "hymini-stm32v.h"
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c b/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c
index 9baeedc7bee..33fe1ae7ae7 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c
@@ -37,7 +37,7 @@
 #include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "hymini-stm32v.h"
 
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c b/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c
index be3bfb2d0a5..acaf801fdaa 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c
@@ -30,7 +30,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "hymini-stm32v.h"
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c b/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c
index e69ee5a1adc..6a574b1f323 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c
@@ -38,7 +38,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/ssd1289.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "hymini-stm32v.h"
 
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c b/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c
index 3ec2de13fce..ad5bfde417a 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "hymini-stm32v.h"
 
diff --git a/boards/arm/stm32/maple/src/stm32_boot.c b/boards/arm/stm32/maple/src/stm32_boot.c
index 40fd612f7ec..8d6775122bb 100644
--- a/boards/arm/stm32/maple/src/stm32_boot.c
+++ b/boards/arm/stm32/maple/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "maple.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/maple/src/stm32_lcd.c b/boards/arm/stm32/maple/src/stm32_lcd.c
index 2621e37626c..e01a7ae79c8 100644
--- a/boards/arm/stm32/maple/src/stm32_lcd.c
+++ b/boards/arm/stm32/maple/src/stm32_lcd.c
@@ -39,7 +39,6 @@
 #include <nuttx/lcd/memlcd.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "maple.h"
diff --git a/boards/arm/stm32/maple/src/stm32_leds.c b/boards/arm/stm32/maple/src/stm32_leds.c
index b0bfbb80bd9..c4f65a0963c 100644
--- a/boards/arm/stm32/maple/src/stm32_leds.c
+++ b/boards/arm/stm32/maple/src/stm32_leds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "maple.h"
diff --git a/boards/arm/stm32/maple/src/stm32_spi.c b/boards/arm/stm32/maple/src/stm32_spi.c
index 2f96bfadad6..db99ba87fa9 100644
--- a/boards/arm/stm32/maple/src/stm32_spi.c
+++ b/boards/arm/stm32/maple/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "maple.h"
diff --git a/boards/arm/stm32/maple/src/stm32_usbdev.c b/boards/arm/stm32/maple/src/stm32_usbdev.c
index a4a0a6460d8..7650651cca5 100644
--- a/boards/arm/stm32/maple/src/stm32_usbdev.c
+++ b/boards/arm/stm32/maple/src/stm32_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "maple.h"
 
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c
index 0864f570add..b22bbb8fa00 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c
@@ -28,7 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "mikroe-stm32f4.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c
index 8c4ac3747ef..20693bb07f0 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c
@@ -28,7 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "mikroe-stm32f4.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c
index 131b7fd82d0..0325a979e66 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32.h"
 #include "mikroe-stm32f4.h"
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c
index 08adedea8cc..9cc537536e2 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -38,7 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_gpio.h"
 #include "mikroe-stm32f4.h"
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c
index d6d935463bf..324f8d37dd8 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -38,7 +38,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_gpio.h"
 #include "mikroe-stm32f4.h"
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c
index 02a88fbd42a..7901f7eec75 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "mikroe-stm32f4.h"
 
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c
index 4e27c971e0b..7b77cd424c0 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c
@@ -33,7 +33,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "mikroe-stm32f4.h"
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
index 9f192be135f..1969cf7c12e 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -41,9 +41,7 @@
 #include <nuttx/semaphore.h>
 
 #include <arch/board/board.h>
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_adc.h"
 #include "stm32_gpio.h"
 #include "mikroe-stm32f4.h"
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c
index ecfca5965dc..95b9108e1cb 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "mikroe-stm32f4.h"
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c
index 83a8dbbbac2..d20d5f3bed2 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c
@@ -36,7 +36,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "mikroe-stm32f4.h"
 
 #ifdef CONFIG_AUDIO_VS1053
diff --git a/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c
index 14046834253..c432578057c 100644
--- a/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c
+++ b/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-f103rb.h"
 
diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c
index 4b5e8ddad88..947d5554d0c 100644
--- a/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_start.h"
 #include "nucleo-f207zg.h"
 
diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c
index 583b17dd600..aeb940388b9 100644
--- a/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c
+++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-f207zg.h"
 
diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c
index 049b1f9cf15..2659b04c70e 100644
--- a/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c
+++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_otgfs.h"
diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c
index 50f78da4ad5..8f75c6b52f9 100644
--- a/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c
+++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-f302r8.h"
 
diff --git a/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c
index 6afb9f5915d..f2eaa377fab 100644
--- a/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c
+++ b/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "nucleo-f303re.h"
diff --git a/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c
index 5dba0567d9f..692f702489f 100644
--- a/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_start.h"
 #include "nucleo-f303ze.h"
 
diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c
index 9a2e9995434..fb56cfa5f5d 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c
+++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "nucleo-f410rb.h"
 
 #ifdef CONFIG_STM32_ADC1
diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c
index 40eac5a87c9..1af9043eb2b 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c
+++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "nucleo-f410rb.h"
diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c
index 41864521456..be3634b4b1e 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c
@@ -30,7 +30,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-f410rb.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c
index 6d076381347..829c1192591 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "nucleo-f410rb.h"
diff --git a/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c
index 5eb82463d57..2cd11ecb96e 100644
--- a/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c
+++ b/boards/arm/stm32/nucleo-f412zg/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "nucleo-f412zg.h"
diff --git a/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c b/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c
index 2b530876ea4..4df2a90464d 100644
--- a/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c
@@ -31,7 +31,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-f412zg.h"
 /****************************************************************************
  * Public Functions
diff --git a/boards/arm/stm32/nucleo-f412zg/src/stm32_usb.c b/boards/arm/stm32/nucleo-f412zg/src/stm32_usb.c
index 7dee089adb4..cfb85f8d850 100644
--- a/boards/arm/stm32/nucleo-f412zg/src/stm32_usb.c
+++ b/boards/arm/stm32/nucleo-f412zg/src/stm32_usb.c
@@ -55,7 +55,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "nucleo-f412zg.h"
diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c
index 44a77786091..ae9cbb076f8 100644
--- a/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-144.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c
index 2fe58a9d4ca..c0d86e1a467 100644
--- a/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c
+++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-144.h"
 
diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c
index b58263a2ae8..5313e595a99 100644
--- a/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c
+++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c
index ad817e20e4e..b41addd049c 100644
--- a/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c
+++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c
index a149eeded19..b61af672c0e 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-f446re.h"
 
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c
index 97bbcacac3a..8916a94c042 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "nucleo-f446re.h"
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c
index 2e110cb9241..456de69d990 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-f446re.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_can.c b/boards/arm/stm32/nucleo-f446re/src/stm32_can.c
index 9c9c020bc62..e768f099151 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_can.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 #include "nucleo-f446re.h"
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f446re/src/stm32_pwm.c
index ee2c0de44ef..89058bb59e7 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_pwm.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-f446re.h"
 
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c
index f73e1dac254..924b9966db3 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c
index c425c4af1c5..6f41a7e389a 100644
--- a/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "nucleo-f446re.h"
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c
index e741061d538..a6488216e1f 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c
@@ -31,8 +31,7 @@
 #include <nuttx/analog/adc.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-f4x1re.h"
 
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c
index 1b3136575e4..72f35629ab5 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "nucleo-f4x1re.h"
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c
index 07c0830196c..a9dc718c54a 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c
@@ -31,7 +31,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-f4x1re.h"
 
 #include <nuttx/board.h>
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c
index d3bce1159b6..aa8f104ce9b 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
index 92d0b5b08b0..083cdae8409 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
@@ -32,7 +32,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "nucleo-f4x1re.h"
diff --git a/boards/arm/stm32/nucleo-g431kb/src/stm32_pwm.c b/boards/arm/stm32/nucleo-g431kb/src/stm32_pwm.c
index d6ee92126d8..03336689d0f 100644
--- a/boards/arm/stm32/nucleo-g431kb/src/stm32_pwm.c
+++ b/boards/arm/stm32/nucleo-g431kb/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-g431kb.h"
 
diff --git a/boards/arm/stm32/nucleo-g431rb/src/stm32_can.c b/boards/arm/stm32/nucleo-g431rb/src/stm32_can.c
index 0afb654985c..89f7bbfa31f 100644
--- a/boards/arm/stm32/nucleo-g431rb/src/stm32_can.c
+++ b/boards/arm/stm32/nucleo-g431rb/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_fdcan.h"
 #include "nucleo-g431rb.h"
diff --git a/boards/arm/stm32/nucleo-g431rb/src/stm32_pwm.c b/boards/arm/stm32/nucleo-g431rb/src/stm32_pwm.c
index 0358c9526d7..7aa1118e351 100644
--- a/boards/arm/stm32/nucleo-g431rb/src/stm32_pwm.c
+++ b/boards/arm/stm32/nucleo-g431rb/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-g431rb.h"
 
diff --git a/boards/arm/stm32/nucleo-l152re/src/stm32_spi.c b/boards/arm/stm32/nucleo-l152re/src/stm32_spi.c
index 802a1b82c10..8b5687f889b 100644
--- a/boards/arm/stm32/nucleo-l152re/src/stm32_spi.c
+++ b/boards/arm/stm32/nucleo-l152re/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <nuttx/spi/spi_transfer.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32/nucleo-l152re/src/stm32_spisd.c b/boards/arm/stm32/nucleo-l152re/src/stm32_spisd.c
index b4758314b52..032b402377f 100644
--- a/boards/arm/stm32/nucleo-l152re/src/stm32_spisd.c
+++ b/boards/arm/stm32/nucleo-l152re/src/stm32_spisd.c
@@ -31,7 +31,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_spi.h"
 #include "stm32_gpio.h"
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c
index a80212ebb3c..2481d9d0dce 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "olimex-stm32-e407.h"
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c
index b72b9683895..99c24874ea9 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c
@@ -30,7 +30,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_ccm.h"
 #include "stm32.h"
 #include "stm32_i2c.h"
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c
index c7b0b02dea3..c604e5990cd 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "olimex-stm32-e407.h"
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c
index 16e4eaf64b4..8cbe4fdfd1a 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "olimex-stm32-e407.h"
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c
index 79ec22bb4bc..19e73acf671 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c
+++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "olimex-stm32-e407.h"
diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c
index 526a68c0462..f038f8786d5 100644
--- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c
+++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "olimex-stm32-h407.h"
diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c
index 8a0a2b53ae5..0417663fba9 100644
--- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c
+++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c
@@ -30,7 +30,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "olimex-stm32-h407.h"
 #include "stm32_ccm.h"
 
diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c
index bf37098628c..3bdf60caaa1 100644
--- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c
+++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "stm32_otghs.h"
diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c
index 0c4798e0d33..a4d6e8ff065 100644
--- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c
+++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "olimex-stm32-h407.h"
diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c
index 3ad856b480e..58b47f3b574 100644
--- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c
+++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c
@@ -26,7 +26,7 @@
 #include <debug.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "olimex-stm32-p107.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c
index 965604d271e..687c36b1285 100644
--- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c
+++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 
diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c
index 71c548a7938..81171e270a7 100644
--- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c
+++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c
@@ -35,7 +35,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c
index 98c9f5c6f6b..62f890ee9cc 100644
--- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c
+++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_spi.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_spi.c
index 097d287c405..9d578ec8559 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_spi.c
+++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c
index c600f4d044e..4484fb9d5fc 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c
+++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_st7735.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_st7735.c
index 260726157f6..231d49e44b7 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_st7735.c
+++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_st7735.c
@@ -35,9 +35,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/st7735.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
 #include "olimex-stm32-p407.h"
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c
index a3785ec4ac2..645e818dcba 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c
+++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "olimex-stm32-p407.h"
diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_can.c b/boards/arm/stm32/olimexino-stm32/src/stm32_can.c
index 48dcd3dbfd1..00bb7c67e26 100644
--- a/boards/arm/stm32/olimexino-stm32/src/stm32_can.c
+++ b/boards/arm/stm32/olimexino-stm32/src/stm32_can.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_boot.c b/boards/arm/stm32/omnibusf4/src/stm32_boot.c
index fcfa37634c7..57f787a1c41 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_boot.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "itm.h"
 
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c b/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c
index e07ee8dd5e8..aa48f4473d1 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c
@@ -31,7 +31,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_ostest.c b/boards/arm/stm32/omnibusf4/src/stm32_ostest.c
index 3966dac98fb..d5688371514 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_ostest.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "omnibusf4.h"
 
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_perfcount.c b/boards/arm/stm32/omnibusf4/src/stm32_perfcount.c
index f65f73a5e8a..df393a9c71d 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_perfcount.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_perfcount.c
@@ -28,7 +28,7 @@
 #include <fixedmath.h>
 
 #include "dwt.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <nuttx/clock.h>
 
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_pwm.c b/boards/arm/stm32/omnibusf4/src/stm32_pwm.c
index 5d1cd85a1fd..b5aec700cd2 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_pwm.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "omnibusf4.h"
 
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_spi.c b/boards/arm/stm32/omnibusf4/src/stm32_spi.c
index ea736d6e500..f94a7f4527d 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_spi.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_usb.c b/boards/arm/stm32/omnibusf4/src/stm32_usb.c
index 50ebb6cfc07..79fa7d566c7 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_usb.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "omnibusf4.h"
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_userleds.c b/boards/arm/stm32/omnibusf4/src/stm32_userleds.c
index 0104a84458c..cd7aa130fbd 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_userleds.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_userleds.c
@@ -33,9 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32.h"
 #include "omnibusf4.h"
 
diff --git a/boards/arm/stm32/photon/src/stm32_boot.c b/boards/arm/stm32/photon/src/stm32_boot.c
index e84f0cc28d5..f916878182f 100644
--- a/boards/arm/stm32/photon/src/stm32_boot.c
+++ b/boards/arm/stm32/photon/src/stm32_boot.c
@@ -27,7 +27,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "photon.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/photon/src/stm32_rgbled.c b/boards/arm/stm32/photon/src/stm32_rgbled.c
index f6b558649ce..4717fb8f8fd 100644
--- a/boards/arm/stm32/photon/src/stm32_rgbled.c
+++ b/boards/arm/stm32/photon/src/stm32_rgbled.c
@@ -35,7 +35,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "photon.h"
 
diff --git a/boards/arm/stm32/photon/src/stm32_spi.c b/boards/arm/stm32/photon/src/stm32_spi.c
index e2486c6a7eb..5ce0ea5a183 100644
--- a/boards/arm/stm32/photon/src/stm32_spi.c
+++ b/boards/arm/stm32/photon/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/shenzhou/src/stm32_adc.c b/boards/arm/stm32/shenzhou/src/stm32_adc.c
index 4073e6e6372..c87080855d5 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_adc.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "shenzhou.h"
 
diff --git a/boards/arm/stm32/shenzhou/src/stm32_autoleds.c b/boards/arm/stm32/shenzhou/src/stm32_autoleds.c
index 2de01b40ae5..9f9818c5566 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_autoleds.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_autoleds.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "shenzhou.h"
diff --git a/boards/arm/stm32/shenzhou/src/stm32_boot.c b/boards/arm/stm32/shenzhou/src/stm32_boot.c
index ea2cc4dd0b6..ff584c63db5 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_boot.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "shenzhou.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/shenzhou/src/stm32_can.c b/boards/arm/stm32/shenzhou/src/stm32_can.c
index 50ce4abdcbf..b5fd25a8d74 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_can.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 #include "shenzhou.h"
diff --git a/boards/arm/stm32/shenzhou/src/stm32_chipid.c b/boards/arm/stm32/shenzhou/src/stm32_chipid.c
index ac232a96f94..3aee32a6484 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_chipid.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_chipid.c
@@ -28,7 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c b/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c
index ea438a4a593..706e7590274 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c
@@ -116,7 +116,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "shenzhou.h"
 
diff --git a/boards/arm/stm32/shenzhou/src/stm32_spi.c b/boards/arm/stm32/shenzhou/src/stm32_spi.c
index 7673a66cdf7..d231d618c34 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_spi.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "shenzhou.h"
diff --git a/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c b/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c
index a11eea65269..d900b65b2b9 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c
@@ -40,7 +40,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "shenzhou.h"
 
diff --git a/boards/arm/stm32/shenzhou/src/stm32_usb.c b/boards/arm/stm32/shenzhou/src/stm32_usb.c
index 69355e165c0..92e97da87fb 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_usb.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "shenzhou.h"
diff --git a/boards/arm/stm32/shenzhou/src/stm32_userleds.c b/boards/arm/stm32/shenzhou/src/stm32_userleds.c
index 65f3ce094bb..916a1d3207f 100644
--- a/boards/arm/stm32/shenzhou/src/stm32_userleds.c
+++ b/boards/arm/stm32/shenzhou/src/stm32_userleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "shenzhou.h"
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c b/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c
index bc98b8c2326..86130fbb011 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c b/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c
index 3c8b577e0fa..1cb48026f17 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm3210e-eval.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_can.c b/boards/arm/stm32/stm3210e-eval/src/stm32_can.c
index dbcb65075f1..8e6e3778ba9 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_can.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 #include "stm3210e-eval.h"
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c
index 68785e03a01..bfb5f272faa 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c
index 8b531dd54f4..7d05b97358f 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c
index 9da97e39791..0a57cf71eca 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c b/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c
index ec929cba074..04eebf0acbc 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c
index 0b272c5e2a9..ad0be2e7141 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c
index d3c59ea3736..66d60c99539 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c
@@ -60,7 +60,7 @@
 #include <arch/board/board.h>
 #include <nuttx/power/pm.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c b/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c
index 8c22472a8cd..ba21de2e1f1 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c
@@ -33,7 +33,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c b/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c
index 7c4ff04fd4c..d3931c1beb2 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c
@@ -32,7 +32,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c
index 140dd949039..5db4ecc61fd 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c
index 6e34834c7f4..71395636c3e 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c
index b86cac8f917..e24e4771380 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c b/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c
index b3642294621..5ab76329445 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c b/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c
index 563575fe0a2..88efe434f25 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3210e-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c b/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c
index 9c3b9a98fa0..8ae8b09f622 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm3220g-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c b/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c
index 1cde39c7394..ca2b0859af2 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c b/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c
index 82b0f2bbfab..a76350bc5d9 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm3220g-eval.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_can.c b/boards/arm/stm32/stm3220g-eval/src/stm32_can.c
index af7ab59caca..58a1bd9ac58 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_can.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 #include "stm3220g-eval.h"
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c
index ffc0387d349..59a7322fae9 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c
index d19d8728ab4..3c3c89d8e0a 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c
index 6bb427b23b7..8d65e424585 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c
index 27bb9cd00a5..7b2e021a416 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c
@@ -45,7 +45,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c b/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c
index 2b74db1b4ea..d6ad7eeeafa 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm3220g-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c
index 86097627cd7..92bfc0c6d6c 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c
index 2b621a4f201..d5af1b7ae0e 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
 
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c b/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c
index c9bc107df4a..f4155ae9311 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c b/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c
index 566dc542360..660d94ea205 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "stm3220g-eval.h"
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c
index a1a53b18630..169340f1902 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm3220g-eval.h"
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c b/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c
index d06892de12f..646bbae1224 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c b/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c
index e11bd264039..6221ae73c21 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_can.c b/boards/arm/stm32/stm3240g-eval/src/stm32_can.c
index b5009c48da6..83efbb56f98 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_can.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 #include "stm3240g-eval.h"
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c
index 334f3dce622..499ec956d4e 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c
index 3df316d838f..8dda23eb3a9 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c
@@ -26,7 +26,7 @@
 
 #include <debug.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c
index a1c2076e882..f7799b949ac 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c
index a1a9cf0d20e..0dcf590d160 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c
@@ -45,7 +45,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c b/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c
index 86a9601c98e..6a7a06c9b2a 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c b/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c
index 83ed43b10c4..53821fe0ee4 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c
index 5e4b45510b5..23c1f085e35 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c
index 362177c6121..591853f04f0 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c
@@ -28,8 +28,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
 
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c b/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c
index f89bad12cb5..b67b65b58c9 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c b/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c
index b0d0fd34656..7116d1bc426 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "stm3240g-eval.h"
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c
index f17699648ea..66af4220b63 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm3240g-eval.h"
diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_boot.c b/boards/arm/stm32/stm32_tiny/src/stm32_boot.c
index 3ba691c86e5..365704b5144 100644
--- a/boards/arm/stm32/stm32_tiny/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32_tiny/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_tiny.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_leds.c b/boards/arm/stm32/stm32_tiny/src/stm32_leds.c
index 768712d37f9..1ee444c1bf6 100644
--- a/boards/arm/stm32/stm32_tiny/src/stm32_leds.c
+++ b/boards/arm/stm32/stm32_tiny/src/stm32_leds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_tiny.h"
diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c b/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c
index 43dce68c592..3064000847a 100644
--- a/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32_tiny.h"
 
diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_spi.c b/boards/arm/stm32/stm32_tiny/src/stm32_spi.c
index 4a1d1d27b59..9492cfc56f0 100644
--- a/boards/arm/stm32/stm32_tiny/src/stm32_spi.c
+++ b/boards/arm/stm32/stm32_tiny/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_tiny.h"
diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c b/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c
index b6d80b7a6e2..70bc4148be8 100644
--- a/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c
+++ b/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_tiny.h"
 
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c
index 1744399f66a..03a2d2243b8 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f103_minimum.h"
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c
index ccec2ef26b9..9060bf22cfd 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f103_minimum.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_ds18b20.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_ds18b20.c
index ae5f15734f6..36e70ad9bea 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_ds18b20.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_ds18b20.c
@@ -35,7 +35,7 @@
 #include <nuttx/sensors/ds18b20.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_1wire.h"
 #include "stm32f103_minimum.h"
 
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c
index fea6a55e5a2..9f404cdfb73 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_hyt271.c
@@ -37,7 +37,7 @@
 #endif
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_i2c.h"
 #include "stm32f103_minimum.h"
 
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_st7567.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_st7567.c
index 1e1401b2d91..37a71001be3 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_st7567.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_st7567.c
@@ -35,9 +35,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/st7567.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
 #include "stm32f103_minimum.h"
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c
index 3fef9002a8e..ec815629843 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32f103_minimum.h"
 
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c
index addbd64ccb6..7ff4cb7d390 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32f103_minimum.h"
 
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c
index 06d2d941208..b79b5cb409d 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm32f103_minimum.h"
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c
index 356d9f6fc86..61dec759993 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c
@@ -32,7 +32,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f103_minimum.h"
 
diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c b/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c
index 7a05058196c..2016e88cecc 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f3discovery.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c b/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c
index 58445dc5e76..886d87fe86f 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32f3discovery.h"
 
diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c b/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c
index 1463096443a..e32e1d6cb3b 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm32f3discovery.h"
diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c b/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c
index 7da24d2264c..8cf77153471 100644
--- a/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c
+++ b/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c
@@ -34,7 +34,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f3discovery.h"
 
diff --git a/boards/arm/stm32/stm32f411-minimum/src/stm32_autoleds.c b/boards/arm/stm32/stm32f411-minimum/src/stm32_autoleds.c
index bd65c2381d1..5c32661dd73 100644
--- a/boards/arm/stm32/stm32f411-minimum/src/stm32_autoleds.c
+++ b/boards/arm/stm32/stm32f411-minimum/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f411-minimum.h"
diff --git a/boards/arm/stm32/stm32f411-minimum/src/stm32_boot.c b/boards/arm/stm32/stm32f411-minimum/src/stm32_boot.c
index 90cc8f64ddd..aa96300dfd4 100644
--- a/boards/arm/stm32/stm32f411-minimum/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32f411-minimum/src/stm32_boot.c
@@ -31,7 +31,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f411-minimum.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32f411-minimum/src/stm32_usb.c b/boards/arm/stm32/stm32f411-minimum/src/stm32_usb.c
index d59e964b02b..3d750b27896 100644
--- a/boards/arm/stm32/stm32f411-minimum/src/stm32_usb.c
+++ b/boards/arm/stm32/stm32f411-minimum/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "stm32f411-minimum.h"
diff --git a/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c
index 08fedacca98..274f17d514b 100644
--- a/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c
@@ -31,7 +31,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f411e-disco.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c
index 5346d1fbfa9..cd65546cd8a 100644
--- a/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c
+++ b/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c
@@ -55,7 +55,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "stm32f411e-disco.h"
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c
index 6a63ef599c2..7ce32bcbfbb 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f429i-disco.h"
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c
index cdc620f15fb..a6c08c83019 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f429i-disco.h"
 #include "stm32_ccm.h"
 
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c
index 5d95e6cfeb3..bdd3c1acc58 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f429i-disco.h"
 
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c
index 796ff26575e..d67a39a7757 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c
@@ -35,7 +35,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f429i-disco.h"
 #include "stm32_ltdc.h"
 
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c
index 785e5714c65..12c6f91e9a3 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32f429i-disco.h"
 
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c
index 76a206ca7dd..488920c22e8 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <nuttx/timers/pwm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32f429i-disco.h"
 
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c
index a3d96584860..5d927acaf37 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm32f429i-disco.h"
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c
index 62721c1640a..704907d24f4 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otghs.h"
 #include "stm32f429i-disco.h"
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c
index a7da09061aa..7ffc921cd9d 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c
@@ -32,7 +32,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f429i-disco.h"
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c
index 95b18d47549..91abce3bee6 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f4discovery.h"
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c b/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c
index 42a29580487..5c9278fa4a4 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "itm.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_can.c b/boards/arm/stm32/stm32f4discovery/src/stm32_can.c
index 6d85cf42467..1b66bd67bb5 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_can.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 #include "stm32f4discovery.h"
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c b/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c
index aa5a6dd2163..92521004208 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c
@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c b/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c
index 73ff11c134b..fcad766ac50 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f4discovery.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c b/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c
index 37ec99c68b8..27b0a330d3c 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c
@@ -33,7 +33,7 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/wireless/gs2200m.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c b/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c
index 93bcf89ca56..7815a7fc4bb 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c
@@ -31,7 +31,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c
index 65bca7faedf..5a24458fc50 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32f4discovery.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_perfcount.c b/boards/arm/stm32/stm32f4discovery/src/stm32_perfcount.c
index f1d0c8f8b8d..8053b205e07 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_perfcount.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_perfcount.c
@@ -28,7 +28,7 @@
 #include <fixedmath.h>
 
 #include "dwt.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <nuttx/clock.h>
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c
index 5268e608f17..50cf23afddf 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c
@@ -32,7 +32,7 @@
 #include <nuttx/power/pm.h>
 #include <arch/irq.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c
index e20674cf64f..0ba219be46e 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32f4discovery.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c b/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c
index 0bf748ec0f0..4b916fa359d 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32f4discovery.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c b/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c
index 542f6582d93..4ce87df04b3 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c
index 22e5a81233a..5a7ca310bf8 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c
@@ -40,7 +40,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32f4discovery.h"
 
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c b/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c
index 29f5922702f..976c0213252 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c
@@ -35,9 +35,7 @@
 #include <nuttx/lcd/lcd.h>
 #include <nuttx/lcd/st7567.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
 #include "stm32f4discovery.h"
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c b/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c
index d76c7301ee3..c0df65df219 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
 #include "stm32f4discovery.h"
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c
index bc3cf8fe2b3..a058cdaa5a2 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c
@@ -33,9 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
-
 #include "stm32.h"
 #include "stm32f4discovery.h"
 
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c
index 291d950282e..4bb68496e98 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32ldiscovery.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
index 5d365c038c3..5c30c0252db 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
@@ -50,7 +50,7 @@
 #include <nuttx/lcd/slcd_codec.h>
 #include <nuttx/semaphore.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
 #include "hardware/stm32_lcd.h"
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c
index c41de05f4de..f1a51e3d6c4 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32ldiscovery.h"
 
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c
index 1bf7e1c6f23..79df0eb72e9 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "stm32ldiscovery.h"
diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c
index 2ae573548d4..1f9c45b57c6 100644
--- a/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c
+++ b/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32vldiscovery.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c
index 7c373da534d..3c465ab92ff 100644
--- a/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c
+++ b/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32.h"
 #include "stm32vldiscovery.h"
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c
index 8fa533e06b5..a21dda6e5a5 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c
@@ -36,7 +36,7 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c
index 06f83414f05..3349f7d5c7c 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c
@@ -26,7 +26,7 @@
 #include <debug.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "viewtool_stm32f107.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c
index 0dd1ba366d3..d96f09c70f5 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32.h"
 #include "stm32_can.h"
 
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c
index a23a9815d3b..c8060728b0c 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c
@@ -35,7 +35,7 @@
 #include <nuttx/spi/spi.h>
 #include <nuttx/lcd/ft80x.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c
index 6fe4d736077..cb29146ecda 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c
@@ -43,7 +43,7 @@
 #  include <nuttx/usb/rndis.h>
 #endif
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c
index ee00f5c0c30..89332a7c87b 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "viewtool_stm32f107.h"
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c
index f325be367ba..fac7b874f5a 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -39,7 +39,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32.h"
 #include "viewtool_stm32f107.h"
 
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c
index 94cc5016c75..6088033fdc3 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c
index cd655fa999c..59dc371c2b7 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "nucleo-f072rb.h"
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c
index 55df4ad1b15..0679b5dc974 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-f072rb.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c
index 55ade16a619..6b9d2111a77 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "nucleo-f072rb.h"
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c
index 8ef8c2d4fae..b6f9295775b 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "nucleo-f091rc.h"
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c
index 5eacdb4f497..0bba6150384 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-f091rc.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c
index fedbf6ba2b3..2f4cfa37b68 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c
index 369a75fd3d1..a4e15a67259 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32_gpio.h"
 #include "nucleo-f091rc.h"
diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c
index 4bec5df356a..d2bd00ae282 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c
@@ -33,7 +33,7 @@
 #include <nuttx/wireless/nrf24l01.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "nucleo-l073rz.h"
diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c
index 7ca6f905d90..1fcf9f1f0e3 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c
index c580fd6bf03..63821a1c87f 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f051-discovery.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c
index 42f246abc6a..541c7d56e65 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f072-discovery.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
index 4364c5e4ea9..e3f15c98986 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-144.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c b/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
index d6a45af8a65..aeb66ea64c5 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
@@ -33,7 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-144.h"
 
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c b/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
index 0cf08a8a535..6d82a0bf7e2 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_qencoder.h"
 #include "nucleo-144.h"
 
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
index a4d254ebd24..e113dd18a13 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c b/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
index ef3f62f81b9..65eec7623c6 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c
index 9d0eb6a4382..471da058521 100644
--- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c
+++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f746-ws.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c
index c278d2fa523..8499472e8e3 100644
--- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c
+++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c
index cf058fd6686..204fe8b36bc 100644
--- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c
+++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_otg.h"
 #include "stm32_gpio.h"
 #include "stm32f746-ws.h"
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c
index 73bc92567cf..9b9a9d11eee 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f746g-disco.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c
index 366a6293dcc..304615cac11 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c
@@ -44,8 +44,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_fmc.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c
index 99f0f61ee8b..43c0378726c 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c
@@ -33,7 +33,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f746g-disco.h"
 #include "stm32_gpio.h"
 #include "stm32_ltdc.h"
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c
index f417d5a0945..46d1762d66f 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32f746g-disco.h"
 
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c
index 67842d62da5..55b62805bd2 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c
index 6d80dca953f..c1985e1712c 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32f769i-disco.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c
index 1f4750751d9..781bfb6e95b 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c
@@ -31,8 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32_fmc.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c
index 2c583a057ef..92b490faad6 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32f769i-disco.h"
 
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c
index be1286a13db..d0950027776 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "stm32f769i-disco.h"
 
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c
index 199371c3e6d..57d00318d4c 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_spi.h"
 
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c
index c2335a5fec1..e5db33a34a8 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_start.h"
 #include "nucleo-h743zi.h"
 
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c
index 7b071df95e4..f3ae4905995 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c
@@ -33,7 +33,7 @@
 #include <nuttx/wireless/nrf24l01.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32.h"
 #include "nucleo-h743zi.h"
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c
index 2407ac39231..fda556ed90b 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_pwm.h"
 #include "nucleo-h743zi.h"
 
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c
index 15eddcbd02e..aac9345fe71 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c
index 8127e222e39..70df1389fa8 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c
index 8d0ba135424..eea8065eebe 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c
+++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_start.h"
 #include "nucleo-h743zi2.h"
 
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_ostest.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_ostest.c
index de46b2b124d..e058a385140 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_ostest.c
+++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "nucleo-h743zi2.h"
 
diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c
index 1079d7d0c78..4d315e46f89 100644
--- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c
+++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c
index 02ca7ed5848..596df355eb2 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c
+++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32_start.h"
 #include "stm32h747i-disco.h"
 
diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c
index a720cc30315..90662287701 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c
+++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c
index a5d97cfe657..2523be71dc3 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c
+++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c
index dc20cf224d8..82c572c59be 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c
+++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c
@@ -27,7 +27,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_start.h"
 #include "b-l475e-iot01a.h"
 
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c
index f11a621f54d..4ea22360785 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l4_adc.h"
 #include "nucleo-l432kc.h"
 
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c
index 7e2dee2fa8e..d51b08ef245 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "nucleo-l432kc.h"
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c
index 0c7475a6648..36c1cc67999 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-l432kc.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c
index 26915fd18b8..355a15a3bf4 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_pwm.h"
 #include "nucleo-l432kc.h"
 
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c
index daeeaa65552..0bfb326768d 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_qencoder.h"
 #include "nucleo-l432kc.h"
 
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c
index 7c4fae073e8..9882910250d 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c
@@ -32,7 +32,6 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include <arm_arch.h>
 #include "chip.h"
 #include <stm32l4.h>
 
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c
index 7499dfba104..c520c5b4a00 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "nucleo-l432kc.h"
diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c
index 9abde972258..280f97a7b4c 100644
--- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c
+++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4_gpio.h"
 #include "nucleo-l452re.h"
diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c
index fe5647b02fb..9d19116ba3b 100644
--- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c
+++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c
@@ -28,7 +28,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-l452re.h"
 
 #include <arch/board/board.h>
diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c
index b79b47bde6f..2096f2c8ae7 100644
--- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c
+++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c
@@ -31,7 +31,6 @@
 
 #include <nuttx/spi/spi.h>
 
-#include <arm_arch.h>
 #include "chip.h"
 #include <stm32l4.h>
 
diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c
index 5aad15ec623..aaf2f51b19d 100644
--- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c
@@ -32,7 +32,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4_gpio.h"
 #include "nucleo-l452re.h"
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c
index 203462dd47f..ab2c49c9926 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c
@@ -32,8 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
-
+#include "arm_internal.h"
 #include "stm32l4_pwm.h"
 #include "nucleo-l476rg.h"
 
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c
index 4249a0c145a..389a2b1c616 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "nucleo-l476rg.h"
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c
index 75a273e9ebf..0c1c02271a3 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-l476rg.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c
index 8d17daa9b77..1900860cbe2 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c
@@ -34,7 +34,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_pwm.h"
 #include "nucleo-l476rg.h"
 
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c
index 5cba9604719..3dd71546beb 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4_qencoder.h"
 #include "nucleo-l476rg.h"
 
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c
index da027fa6703..364ab07ca8b 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c
@@ -32,7 +32,6 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include <arm_arch.h>
 #include "chip.h"
 #include <stm32l4.h>
 
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c
index 5761d57d4f2..2e9e1da6795 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "nucleo-l476rg.h"
diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c
index 8800a5b43b2..55653c07164 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c
+++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-144.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c
index f1857612734..52793010546 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c
+++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c
@@ -32,7 +32,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_spi.h"
diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c
index 9e6afab1062..67533dd8a5a 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c
+++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32l4_gpio.h"
 #include "stm32l4_otgfs.h"
diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c
index 171680a0348..170f88c9ce3 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c
+++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l476-mdk.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c
index 3b7a3ebaa78..4662ae3bdfd 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c
+++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c
@@ -29,7 +29,7 @@
 #include <arch/board/board.h>
 #include <arch/board/stm32l476-mdk-clocking.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l476-mdk.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c
index 01cbd8a5afe..5092fab7908 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c
+++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c
@@ -32,7 +32,6 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include <arm_arch.h>
 #include "chip.h"
 #include <stm32l4.h>
 
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c
index 3009e380ede..3e7282b7143 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "stm32l476vg-disco.h"
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c
index b8482a2707d..08f41c63a14 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l476vg-disco.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c
index 8112aa7a57e..68852c6959f 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c
@@ -29,7 +29,7 @@
 #include <arch/board/board.h>
 #include <arch/board/stm32l476vg-disco-clocking.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l476vg-disco.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c
index b2eabea83fe..4216bfb6cb8 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c
@@ -32,7 +32,6 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include <arm_arch.h>
 #include "chip.h"
 #include <stm32l4.h>
 
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c
index 6cc51f7e7eb..6fc97bce5a0 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4.h"
 #include "stm32l4_otgfs.h"
 #include "stm32l476vg-disco.h"
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c
index 06dd46c41d8..4a4c5955272 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "stm32l476vg-disco.h"
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c
index 45a2eaaf17f..517592771bf 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c
@@ -32,7 +32,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "stm32l4r9ai-disco.h"
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c
index 10a3c15c64c..3442ba19bdd 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4r9ai-disco.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c
index d7ba2a308ce..8df9761bad1 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c
@@ -29,7 +29,7 @@
 #include <arch/board/board.h>
 #include <arch/board/stm32l4r9ai-disco-clocking.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4r9ai-disco.h"
 
 /****************************************************************************
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c
index 8ce4c1bff24..261747d3f92 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c
@@ -33,7 +33,6 @@
 #include <nuttx/spi/spi_transfer.h>
 #include <arch/board/board.h>
 
-#include <arm_arch.h>
 #include "chip.h"
 #include <stm32l4.h>
 
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c
index 577d0bf79ea..6074418fe37 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c
@@ -37,7 +37,7 @@
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l4.h"
 #include "stm32l4_otgfs.h"
 #include "stm32l4r9ai-disco.h"
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c
index 0d8c4422b1a..ee8866c7958 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c
@@ -33,7 +33,6 @@
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l4.h"
 #include "stm32l4r9ai-disco.h"
diff --git a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_autoleds.c b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_autoleds.c
index 1a457f47e52..a478c68f5b2 100644
--- a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_autoleds.c
+++ b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_autoleds.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l5_gpio.h"
 #include "nucleo-l552ze.h"
diff --git a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_boot.c b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_boot.c
index f62e6b6f8ac..5197c890837 100644
--- a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_boot.c
+++ b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_boot.c
@@ -28,7 +28,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "nucleo-l552ze.h"
 
 #include <arch/board/board.h>
diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_autoleds.c b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_autoleds.c
index bbb7db2885c..1a9d8249b59 100644
--- a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_autoleds.c
+++ b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_autoleds.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "stm32l5_gpio.h"
 #include "stm32l562e-dk.h"
diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_boot.c b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_boot.c
index 0a343e1aafd..14c71f414de 100644
--- a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_boot.c
+++ b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_boot.c
@@ -28,7 +28,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "stm32l562e-dk.h"
 #include "stm32l5_pwr.h"
 
diff --git a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_boot.c b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_boot.c
index df04b1cb8ba..71b7e5a074e 100644
--- a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_boot.c
+++ b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_boot.c
@@ -28,7 +28,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "b-u585i-iot02a.h"
 
 #include <arch/board/board.h>
diff --git a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c
index 41862f15878..6de222688bd 100644
--- a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c
+++ b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c
@@ -31,7 +31,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "stm32_gpio.h"
 #include "stm32_spi.h"
diff --git a/boards/arm/str71x/olimex-strp711/src/str71_buttons.c b/boards/arm/str71x/olimex-strp711/src/str71_buttons.c
index 2fad139adab..7f41e23989c 100644
--- a/boards/arm/str71x/olimex-strp711/src/str71_buttons.c
+++ b/boards/arm/str71x/olimex-strp711/src/str71_buttons.c
@@ -29,7 +29,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c
index 209692dd09c..6de7295437b 100644
--- a/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c
+++ b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c
@@ -76,7 +76,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "str71x.h"
 
diff --git a/boards/arm/str71x/olimex-strp711/src/str71_leds.c b/boards/arm/str71x/olimex-strp711/src/str71_leds.c
index 70d0a64b9d2..c0af6a4eec1 100644
--- a/boards/arm/str71x/olimex-strp711/src/str71_leds.c
+++ b/boards/arm/str71x/olimex-strp711/src/str71_leds.c
@@ -30,7 +30,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/str71x/olimex-strp711/src/str71_spi.c b/boards/arm/str71x/olimex-strp711/src/str71_spi.c
index e6a8c7dd37a..058e84d3081 100644
--- a/boards/arm/str71x/olimex-strp711/src/str71_spi.c
+++ b/boards/arm/str71x/olimex-strp711/src/str71_spi.c
@@ -39,8 +39,6 @@
 #include <arch/board/board.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
-
 #include "chip.h"
 #include "str71x.h"
 
diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c
index 03572db0521..9786a84f3a7 100644
--- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c
+++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "dk-tm4c129x.h"
 
diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c
index 85c0c98d555..aca32b52109 100644
--- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c
+++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 #include <net/ethernet.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/tiva_flash.h"
 #include "tiva_ethernet.h"
diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c
index 0155b1148a5..e8fd32477ad 100644
--- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c
+++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "dk-tm4c129x.h"
diff --git a/boards/arm/tiva/eagle100/src/lm_boot.c b/boards/arm/tiva/eagle100/src/lm_boot.c
index 1a3348bf5fb..e2826b163ae 100644
--- a/boards/arm/tiva/eagle100/src/lm_boot.c
+++ b/boards/arm/tiva/eagle100/src/lm_boot.c
@@ -29,7 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "eagle100.h"
 
 /****************************************************************************
diff --git a/boards/arm/tiva/eagle100/src/lm_ethernet.c b/boards/arm/tiva/eagle100/src/lm_ethernet.c
index 1f7530cbb66..10ef7432dfc 100644
--- a/boards/arm/tiva/eagle100/src/lm_ethernet.c
+++ b/boards/arm/tiva/eagle100/src/lm_ethernet.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 #include <net/ethernet.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_ethernet.h"
 
diff --git a/boards/arm/tiva/eagle100/src/lm_leds.c b/boards/arm/tiva/eagle100/src/lm_leds.c
index cdfd93ea30d..55cce391979 100644
--- a/boards/arm/tiva/eagle100/src/lm_leds.c
+++ b/boards/arm/tiva/eagle100/src/lm_leds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "eagle100.h"
diff --git a/boards/arm/tiva/eagle100/src/lm_ssi.c b/boards/arm/tiva/eagle100/src/lm_ssi.c
index 4a55b0afa19..4acfb63e767 100644
--- a/boards/arm/tiva/eagle100/src/lm_ssi.c
+++ b/boards/arm/tiva/eagle100/src/lm_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "eagle100.h"
diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c
index 9383bc851df..70dd2546a07 100644
--- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c
+++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "ekk-lm3s9b96.h"
 
diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c
index c7008bb6a89..84e3ce53884 100644
--- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c
+++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 #include <net/ethernet.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_ethernet.h"
 
diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c
index 4a14781c2ba..eb26a703b73 100644
--- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c
+++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "ekk-lm3s9b96.h"
diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c
index 67a2ee199b2..a49b0a97d89 100644
--- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c
+++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "ekk-lm3s9b96.h"
diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c
index 9dda5be1a0b..812cd936904 100644
--- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c
+++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c
@@ -32,7 +32,7 @@
 #include <nuttx/board.h>
 #include <nuttx/clock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_start.h"
 #include "launchxl-cc1310.h"
 
diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c
index fa09c2c7cf8..50852dec8a1 100644
--- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c
+++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 
diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c
index 8ce5db4e977..bc8805a7128 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c
+++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c
@@ -32,7 +32,7 @@
 #include <nuttx/board.h>
 #include <nuttx/clock.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tiva_start.h"
 #include "launchxl-cc1312r1.h"
 
diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c
index 94d2103a50f..1b84d12ee74 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c
+++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 
diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c
index d358fc0cdfb..a61e5536f25 100644
--- a/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c
+++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "chip.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c
index 22223626c86..86fdf2d58ca 100644
--- a/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c
+++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 #include <net/ethernet.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_ethernet.h"
 
diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c
index ba4efbedfd6..74c03ee5449 100644
--- a/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c
+++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "lm3s6432-s2e.h"
diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c
index 9c651a5bac0..0ad17ef4bb5 100644
--- a/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c
+++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "lm3s6432-s2e.h"
diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c b/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c
index 30c59443b77..82f34a1764e 100644
--- a/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c
+++ b/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lm3s6965-ek.h"
 
diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c b/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c
index 5dc64f98867..627aa435010 100644
--- a/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c
+++ b/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 #include <net/ethernet.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_ethernet.h"
 
diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c b/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c
index 703314227dd..a2d987ccae4 100644
--- a/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c
+++ b/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "lm3s6965-ek.h"
diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c
index 20694e5d33a..8047921bf09 100644
--- a/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c
+++ b/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "lm3s6965-ek.h"
diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c b/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c
index d33f8cb8758..c1cf101af9f 100644
--- a/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c
+++ b/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lm3s8962-ek.h"
 
diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c b/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c
index 831cfe795af..ec1c6b7db5a 100644
--- a/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c
+++ b/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c
@@ -31,7 +31,7 @@
 #include <arch/board/board.h>
 #include <net/ethernet.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_ethernet.h"
 
diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c b/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c
index 3124dddbd73..c8693499865 100644
--- a/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c
+++ b/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "lm3s8962-ek.h"
diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c
index 635e08fc5e1..0a7c1efe837 100644
--- a/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c
+++ b/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "lm3s8962-ek.h"
diff --git a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c
index f21cc9633dd..6f30ddfb5d1 100644
--- a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "lmf4120-launchpad.h"
diff --git a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c
index 48cd77314d8..4d5b0c9f3aa 100644
--- a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c
+++ b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c
@@ -28,7 +28,6 @@
 
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "lmf4120-launchpad.h"
 
diff --git a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c
index feafbbce93b..96a779eae61 100644
--- a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "lmf4120-launchpad.h"
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c
index aa639cdc4fb..2fc72b24a3e 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -31,7 +31,6 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tiva_gpio.h"
 #include "tm4c123g-launchpad.h"
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c
index 952d1522fc0..309d8b7e091 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "tm4c123g-launchpad.h"
 
diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c
index 48d7bcd579b..391fda5363f 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tiva_gpio.h"
 #include "tm4c123g-launchpad.h"
diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c
index 337bdbae797..ed2d73b28f9 100644
--- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c
+++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c
@@ -30,7 +30,6 @@
 #include <arch/board/board.h>
 
 #include "tm4c1294-launchpad.h"
-#include "arm_arch.h"
 #include "arm_internal.h"
 
 /****************************************************************************
diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c
index e7231187a0d..8f970b68fcc 100644
--- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c
+++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 #include <net/ethernet.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/tiva_flash.h"
 #include "tiva_ethernet.h"
diff --git a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c
index 18418ef75ef..1610ad0917d 100644
--- a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c
+++ b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c
@@ -34,7 +34,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tms570_gio.h"
 #include "launchxl-tms57004.h"
 
diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c
index e2fe7cca273..4f686431cfb 100644
--- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c
+++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c
@@ -34,7 +34,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "tms570_gio.h"
 #include "tms570ls31x_usb_kit.h"
 
diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c
index 7e50f7c9b1a..0dd6733f588 100644
--- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c
+++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "tms570_spi.h"
 #include "tms570ls31x_usb_kit.h"
diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c
index 107f648c800..f3e566c9b99 100644
--- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c
+++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "xmc4500-relax.h"
 
diff --git a/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c b/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c
index 3e746718bee..ef3f59bc4ee 100644
--- a/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c
+++ b/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c
@@ -32,7 +32,6 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
 #include "arm_internal.h"
 #include "xmc4700-relax.h"
 
diff --git a/boards/avr/at32uc3/avr32dev1/src/avr32_boot.c b/boards/avr/at32uc3/avr32dev1/src/avr32_boot.c
index fdc115c9d37..a1c25718972 100644
--- a/boards/avr/at32uc3/avr32dev1/src/avr32_boot.c
+++ b/boards/avr/at32uc3/avr32dev1/src/avr32_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "at32uc3.h"
 #include "avr32dev1.h"
 
diff --git a/boards/avr/at90usb/micropendous3/src/at90usb_boot.c b/boards/avr/at90usb/micropendous3/src/at90usb_boot.c
index e68e55e4ba3..4efe0cf220a 100644
--- a/boards/avr/at90usb/micropendous3/src/at90usb_boot.c
+++ b/boards/avr/at90usb/micropendous3/src/at90usb_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "at90usb.h"
 #include "micropendous3.h"
 
diff --git a/boards/avr/at90usb/teensy-2.0/src/at90usb_boot.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_boot.c
index 7bbd181dcc4..1418fbb4840 100644
--- a/boards/avr/at90usb/teensy-2.0/src/at90usb_boot.c
+++ b/boards/avr/at90usb/teensy-2.0/src/at90usb_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "at90usb.h"
 #include "teensy-20.h"
 
diff --git a/boards/avr/at90usb/teensy-2.0/src/at90usb_leds.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_leds.c
index 1fea8c6fa41..0580bc4fde9 100644
--- a/boards/avr/at90usb/teensy-2.0/src/at90usb_leds.c
+++ b/boards/avr/at90usb/teensy-2.0/src/at90usb_leds.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "at90usb.h"
 #include "teensy-20.h"
 
diff --git a/boards/avr/at90usb/teensy-2.0/src/at90usb_spi.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_spi.c
index 48076ad7ae0..204b7e26fb3 100644
--- a/boards/avr/at90usb/teensy-2.0/src/at90usb_spi.c
+++ b/boards/avr/at90usb/teensy-2.0/src/at90usb_spi.c
@@ -32,7 +32,7 @@
 #include <arch/board/board.h>
 #include <avr/io.h>
 
-#include "up_arch.h"
+#include "up_internal.h"
 #include "chip.h"
 #include "at90usb.h"
 #include "teensy-20.h"
diff --git a/boards/avr/atmega/amber/src/atmega_boot.c b/boards/avr/atmega/amber/src/atmega_boot.c
index 0287866c19a..b7192b932f7 100644
--- a/boards/avr/atmega/amber/src/atmega_boot.c
+++ b/boards/avr/atmega/amber/src/atmega_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "atmega.h"
 #include "amber.h"
 
diff --git a/boards/avr/atmega/arduino-mega2560/src/avr_boot.c b/boards/avr/atmega/arduino-mega2560/src/avr_boot.c
index 767fc065da9..f4d03d72c06 100644
--- a/boards/avr/atmega/arduino-mega2560/src/avr_boot.c
+++ b/boards/avr/atmega/arduino-mega2560/src/avr_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "atmega.h"
 #include "arduino_mega2560.h"
 
diff --git a/boards/avr/atmega/arduino-mega2560/src/avr_leds.c b/boards/avr/atmega/arduino-mega2560/src/avr_leds.c
index 6915e1eee59..0d8980b1b9a 100644
--- a/boards/avr/atmega/arduino-mega2560/src/avr_leds.c
+++ b/boards/avr/atmega/arduino-mega2560/src/avr_leds.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "atmega2560.h"
 #include "arduino_mega2560.h"
 
diff --git a/boards/avr/atmega/moteino-mega/src/avr_boot.c b/boards/avr/atmega/moteino-mega/src/avr_boot.c
index cd359d2c6bf..8243a92a346 100644
--- a/boards/avr/atmega/moteino-mega/src/avr_boot.c
+++ b/boards/avr/atmega/moteino-mega/src/avr_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "atmega.h"
 #include "moteino_mega.h"
 
diff --git a/boards/avr/atmega/moteino-mega/src/avr_leds.c b/boards/avr/atmega/moteino-mega/src/avr_leds.c
index cf3b2359419..0ec0f3bb34c 100644
--- a/boards/avr/atmega/moteino-mega/src/avr_leds.c
+++ b/boards/avr/atmega/moteino-mega/src/avr_leds.c
@@ -30,9 +30,7 @@
 
 #include <nuttx/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "atmega.h"
 #include "moteino_mega.h"
 
diff --git a/boards/mips/pic32mx/mirtoo/src/pic32_boot.c b/boards/mips/pic32mx/mirtoo/src/pic32_boot.c
index c00eab13c1a..a0d21ef39be 100644
--- a/boards/mips/pic32mx/mirtoo/src/pic32_boot.c
+++ b/boards/mips/pic32mx/mirtoo/src/pic32_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "pic32mx_pps.h"
 #include "mirtoo.h"
diff --git a/boards/mips/pic32mx/mirtoo/src/pic32_spi2.c b/boards/mips/pic32mx/mirtoo/src/pic32_spi2.c
index 9f82eb83797..f1b5168c5da 100644
--- a/boards/mips/pic32mx/mirtoo/src/pic32_spi2.c
+++ b/boards/mips/pic32mx/mirtoo/src/pic32_spi2.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "chip.h"
 #include "pic32mx.h"
 #include "pic32mx_pps.h"
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_boot.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_boot.c
index e67ebade277..88fdd9631be 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_boot.c
+++ b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "pic32mx-starterkit.h"
 
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c
index da0c8434181..fc98670665b 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "pic32mx_ioport.h"
 #include "pic32mx-starterkit.h"
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_spi.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_spi.c
index 0e9bc89ee5b..bb698365896 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "chip.h"
 #include "pic32mx.h"
 #include "pic32mx-starterkit.h"
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_boot.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_boot.c
index 4ca032b4d41..7ec9c53e595 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_boot.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "pic32mx7mmb.h"
 
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c
index f521a291cea..756d22f15c8 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -43,7 +43,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "pic32mx.h"
 #include "pic32mx_pmp.h"
 #include "pic32mx7mmb.h"
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_spi.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_spi.c
index 56e108f0635..520901267a4 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_spi.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "chip.h"
 #include "pic32mx.h"
 #include "pic32mx7mmb.h"
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
index 6e419dd09f0..efb3a2bcd23 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
@@ -40,9 +40,7 @@
 #include <nuttx/semaphore.h>
 
 #include <arch/board/board.h>
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "pic32mx_adc.h"
 #include "pic32mx_ioport.h"
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_autoleds.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_autoleds.c
index ce9a96a5852..9fcbca599ff 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_autoleds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "pic32mx_ioport.h"
 #include "sure-pic32mx.h"
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_boot.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_boot.c
index 2bb22c36aba..6f472b391fb 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_boot.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "sure-pic32mx.h"
 
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c
index 08420bba7d8..636774f1c2f 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c
@@ -33,8 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "mips_arch.h"
-
+#include "mips_internal.h"
 #include "pic32mx.h"
 #include "pic32mx_ioport.h"
 #include "pic32mx_adc.h"
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
index e729c6a76a8..51c12c6cbbe 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -75,7 +75,7 @@
 #include <nuttx/lcd/slcd_codec.h>
 #include <nuttx/semaphore.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "pic32mx_ioport.h"
 #include "pic32mx_int.h"
 #include "pic32mx.h"
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_spi.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_spi.c
index 57cfc353f3d..8a6bcb84c26 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_spi.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_spi.c
@@ -31,7 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "chip.h"
 #include "pic32mx.h"
 #include "sure-pic32mx.h"
diff --git a/boards/mips/pic32mx/ubw32/src/pic32_boot.c b/boards/mips/pic32mx/ubw32/src/pic32_boot.c
index 38d6e09eb5d..4b886b5ca66 100644
--- a/boards/mips/pic32mx/ubw32/src/pic32_boot.c
+++ b/boards/mips/pic32mx/ubw32/src/pic32_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "ubw32.h"
 
diff --git a/boards/mips/pic32mx/ubw32/src/pic32_buttons.c b/boards/mips/pic32mx/ubw32/src/pic32_buttons.c
index 3d65b8cc0ee..c5e5caceef5 100644
--- a/boards/mips/pic32mx/ubw32/src/pic32_buttons.c
+++ b/boards/mips/pic32mx/ubw32/src/pic32_buttons.c
@@ -33,8 +33,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "mips_arch.h"
-
+#include "mips_internal.h"
 #include "pic32mx.h"
 #include "ubw32.h"
 
diff --git a/boards/mips/pic32mx/ubw32/src/pic32_leds.c b/boards/mips/pic32mx/ubw32/src/pic32_leds.c
index 3da174105df..b73009ca48e 100644
--- a/boards/mips/pic32mx/ubw32/src/pic32_leds.c
+++ b/boards/mips/pic32mx/ubw32/src/pic32_leds.c
@@ -32,9 +32,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mx.h"
 #include "ubw32.h"
 
diff --git a/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_autoleds.c b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_autoleds.c
index 2f8cb3bff41..64cf7f6082e 100644
--- a/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_autoleds.c
+++ b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_autoleds.c
@@ -31,9 +31,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_gpio.h"
 #include "chipkit-wifire.h"
 
diff --git a/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_spi.c b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_spi.c
index 2cac668a65e..fd7dbabdeeb 100644
--- a/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_spi.c
+++ b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_spi.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "pic32mz_gpio.h"
 
 #include "chipkit-wifire.h"
diff --git a/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_userleds.c b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_userleds.c
index c9d78ff0d80..d53bd03fe1a 100644
--- a/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_userleds.c
+++ b/boards/mips/pic32mz/chipkit-wifire/src/pic32mz_userleds.c
@@ -40,9 +40,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_gpio.h"
 #include "chipkit-wifire.h"
 
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_autoleds.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_autoleds.c
index f8d33afde01..3ab68a6c8bd 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_autoleds.c
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_autoleds.c
@@ -31,9 +31,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_gpio.h"
 #include "flipnclick-pic32mz.h"
 
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_spi.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_spi.c
index ddf9a3395ff..1d2f1fe3fb6 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_spi.c
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_spi.c
@@ -32,7 +32,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
+#include "mips_internal.h"
 #include "pic32mz_gpio.h"
 
 #include "flipnclick-pic32mz.h"
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c
index bb51e753fde..28426f18dc1 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c
@@ -45,9 +45,7 @@
 
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_gpio.h"
 #include "flipnclick-pic32mz.h"
 
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_autoleds.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_autoleds.c
index ddb547d0919..8d165bb8fdd 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_autoleds.c
+++ b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_autoleds.c
@@ -31,9 +31,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_gpio.h"
 #include "pic32mz-starterkit.h"
 
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_spi.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_spi.c
index 0e1a4e43a20..af057a600c5 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_spi.c
+++ b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_spi.c
@@ -31,8 +31,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "mips_arch.h"
-
+#include "mips_internal.h"
 #include "pic32mz-starterkit.h"
 
 #ifdef CONFIG_PIC32MZ_SPI
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c
index 5506e9a3e9e..7c2a64d66a3 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -31,9 +31,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "mips_arch.h"
 #include "mips_internal.h"
-
 #include "pic32mz_gpio.h"
 #include "pic32mz-starterkit.h"
 
diff --git a/boards/or1k/mor1kx/or1k/src/or1k_autoled.c b/boards/or1k/mor1kx/or1k/src/or1k_autoled.c
index f179cf26901..d9365e7280e 100644
--- a/boards/or1k/mor1kx/or1k/src/or1k_autoled.c
+++ b/boards/or1k/mor1kx/or1k/src/or1k_autoled.c
@@ -31,7 +31,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/boards/renesas/m16c/skp16c26/src/m16c_buttons.c b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c
index 2b900345b23..22c098bd2be 100644
--- a/boards/renesas/m16c/skp16c26/src/m16c_buttons.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/boards/renesas/m16c/skp16c26/src/m16c_lcd.c b/boards/renesas/m16c/skp16c26/src/m16c_lcd.c
index cf063e7f34a..fc558cae9a3 100644
--- a/boards/renesas/m16c/skp16c26/src/m16c_lcd.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_lcd.c
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <ctype.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "chip.h"
 
diff --git a/boards/renesas/m16c/skp16c26/src/m16c_leds.c b/boards/renesas/m16c/skp16c26/src/m16c_leds.c
index 62d373fd101..244e4cb70ee 100644
--- a/boards/renesas/m16c/skp16c26/src/m16c_leds.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_leds.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 #include "chip.h"
 
diff --git a/boards/renesas/sh1/us7032evb1/src/sh1_leds.c b/boards/renesas/sh1/us7032evb1/src/sh1_leds.c
index 4b630ccc97a..28ec17d178e 100644
--- a/boards/renesas/sh1/us7032evb1/src/sh1_leds.c
+++ b/boards/renesas/sh1/us7032evb1/src/sh1_leds.c
@@ -29,7 +29,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c b/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c
index be0aa352287..a0129f77460 100644
--- a/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c
+++ b/boards/risc-v/bl602/bl602evb/src/bl602_gpio.c
@@ -31,7 +31,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/ioexpander/gpio.h>
 #include <arch/board/board.h>
-#include "riscv_arch.h"
+#include "riscv_internal.h"
 #include "bl602_gpio.h"
 
 #if defined(CONFIG_DEV_GPIO) && !defined(CONFIG_GPIO_LOWER_HALF)
diff --git a/boards/sparc/bm3803/xx3803/src/bm3803_boot.c b/boards/sparc/bm3803/xx3803/src/bm3803_boot.c
index 38989c26058..bd35d63d75f 100644
--- a/boards/sparc/bm3803/xx3803/src/bm3803_boot.c
+++ b/boards/sparc/bm3803/xx3803/src/bm3803_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "bm3803.h"
 #include "xx3803.h"
 
diff --git a/boards/sparc/bm3823/xx3823/src/bm3823_boot.c b/boards/sparc/bm3823/xx3823/src/bm3823_boot.c
index 5d6f742d268..f1efbd9dbbb 100644
--- a/boards/sparc/bm3823/xx3823/src/bm3823_boot.c
+++ b/boards/sparc/bm3823/xx3823/src/bm3823_boot.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "bm3823.h"
 #include "xx3823.h"
 
diff --git a/boards/sparc/bm3823/xx3823/src/bm3823_leds.c b/boards/sparc/bm3823/xx3823/src/bm3823_leds.c
index d9c810f0c19..d1c0bcd1639 100644
--- a/boards/sparc/bm3823/xx3823/src/bm3823_leds.c
+++ b/boards/sparc/bm3823/xx3823/src/bm3823_leds.c
@@ -28,9 +28,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "bm3823.h"
 #include "xx3823.h"
 
diff --git a/boards/x86/qemu/qemu-i486/src/qemu_boot.c b/boards/x86/qemu/qemu-i486/src/qemu_boot.c
index 252f6dff153..88b41ec9fbc 100644
--- a/boards/x86/qemu/qemu-i486/src/qemu_boot.c
+++ b/boards/x86/qemu/qemu-i486/src/qemu_boot.c
@@ -29,9 +29,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "qemu.h"
 #include "qemu_i486.h"
 
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_boot.c b/boards/x86_64/intel64/qemu-intel64/src/qemu_boot.c
index 213b2e39144..d0d76260ea7 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_boot.c
+++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_boot.c
@@ -30,9 +30,7 @@
 #include <nuttx/serial/uart_16550.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
-
 #include "qemu_intel64.h"
 
 /****************************************************************************
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c b/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c
index 7c727408775..6241220771d 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c
+++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c
@@ -30,7 +30,6 @@
 #include <arch/arch.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
index 2ffff65076e..0d6c5686932 100644
--- a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
+++ b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c
@@ -30,7 +30,6 @@
 #include <nuttx/board.h>
 
 #include "chip.h"
-#include "z80_arch.h"
 #include "z80_internal.h"
 
 /****************************************************************************
diff --git a/boards/z80/z80/z80sim/src/z80_irq.c b/boards/z80/z80/z80sim/src/z80_irq.c
index 446d0e06d2e..0de8b1833ba 100644
--- a/boards/z80/z80/z80sim/src/z80_irq.c
+++ b/boards/z80/z80/z80sim/src/z80_irq.c
@@ -26,7 +26,6 @@
 
 #include <nuttx/irq.h>
 
-#include "z80_arch.h"
 #include "z80_internal.h"
 
 /****************************************************************************
diff --git a/boards/z80/z80/z80sim/src/z80_serial.c b/boards/z80/z80/z80sim/src/z80_serial.c
index f7be2ecc6a9..9769115a50c 100644
--- a/boards/z80/z80/z80sim/src/z80_serial.c
+++ b/boards/z80/z80/z80sim/src/z80_serial.c
@@ -36,7 +36,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/serial/serial.h>
 
-#include "z80_arch.h"
 #include "z80_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index 6b8e419da29..fd7d0dc5003 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -36,8 +36,6 @@
 #include <nuttx/spi/spi.h>
 #include <nuttx/lcd/lcd.h>
 
-#include "up_arch.h"
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/