You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/03/14 07:32:27 UTC

[incubator-nuttx] 02/02: arch: Merge up_arch.h into up_internal.h

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 54e630e14d7e32d6f81ae79d4e5df3d2fa787ef0
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Mar 12 00:41:15 2022 +0800

    arch: Merge up_arch.h into up_internal.h
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/arm/src/a1x/a1x_boot.c                        |   2 -
 arch/arm/src/a1x/a1x_irq.c                         |   1 -
 arch/arm/src/a1x/a1x_lowputc.c                     |   2 -
 arch/arm/src/a1x/a1x_pio.c                         |   2 -
 arch/arm/src/a1x/a1x_serial.c                      |   2 -
 arch/arm/src/a1x/a1x_timerisr.c                    |   2 +-
 arch/arm/src/am335x/am335x_boot.c                  |   2 -
 arch/arm/src/am335x/am335x_can.c                   |   2 +-
 arch/arm/src/am335x/am335x_clockconfig.c           |   2 +-
 arch/arm/src/am335x/am335x_gpio.c                  |   2 +-
 arch/arm/src/am335x/am335x_gpioirq.c               |   3 +-
 arch/arm/src/am335x/am335x_i2c.c                   |   2 +-
 arch/arm/src/am335x/am335x_irq.c                   |   1 -
 arch/arm/src/am335x/am335x_lcdc.c                  |   2 +-
 arch/arm/src/am335x/am335x_lowputc.c               |   2 -
 arch/arm/src/am335x/am335x_pinmux.c                |   2 +-
 arch/arm/src/am335x/am335x_serial.c                |   2 -
 arch/arm/src/am335x/am335x_sysclk.c                |   2 +-
 arch/arm/src/am335x/am335x_timerisr.c              |   2 +-
 arch/arm/src/am335x/am335x_wdog.c                  |   2 +-
 arch/arm/src/arm/arm_doirq.c                       |   2 -
 arch/arm/src/arm/arm_initialstate.c                |   1 -
 arch/arm/src/arm/arm_schedulesigaction.c           |   1 -
 arch/arm/src/arm/arm_sigdeliver.c                  |   1 -
 arch/arm/src/arm/arm_syscall.c                     |   1 -
 arch/arm/src/armv6-m/arm_doirq.c                   |   1 -
 arch/arm/src/armv6-m/arm_dumpnvic.c                |   3 +-
 arch/arm/src/armv6-m/arm_hardfault.c               |   1 -
 arch/arm/src/armv6-m/arm_initialstate.c            |   2 -
 arch/arm/src/armv6-m/arm_ramvec_initialize.c       |   1 -
 arch/arm/src/armv6-m/arm_schedulesigaction.c       |   2 -
 arch/arm/src/armv6-m/arm_sigdeliver.c              |   1 -
 arch/arm/src/armv6-m/arm_systemreset.c             |   2 +-
 arch/arm/src/armv7-a/arm_doirq.c                   |   2 -
 arch/arm/src/armv7-a/arm_gicv2.c                   |   1 -
 arch/arm/src/armv7-a/arm_gicv2_dump.c              |   2 +-
 arch/arm/src/armv7-a/arm_initialstate.c            |   1 -
 arch/arm/src/armv7-a/arm_l2cc_pl310.c              |   2 +-
 arch/arm/src/armv7-a/arm_schedulesigaction.c       |   2 -
 arch/arm/src/armv7-a/arm_scu.c                     |   2 +-
 arch/arm/src/armv7-a/arm_sigdeliver.c              |   1 -
 arch/arm/src/armv7-a/gic.h                         |   2 +-
 arch/arm/src/armv7-m/arm_busfault.c                |   1 -
 arch/arm/src/armv7-m/arm_cache.c                   |   2 +-
 arch/arm/src/armv7-m/arm_doirq.c                   |   1 -
 arch/arm/src/armv7-m/arm_hardfault.c               |   1 -
 arch/arm/src/armv7-m/arm_initialstate.c            |   2 -
 arch/arm/src/armv7-m/arm_itm.c                     |   2 +-
 arch/arm/src/armv7-m/arm_itm_syslog.c              |   2 +-
 arch/arm/src/armv7-m/arm_memfault.c                |   1 -
 arch/arm/src/armv7-m/arm_ramvec_initialize.c       |   1 -
 arch/arm/src/armv7-m/arm_schedulesigaction.c       |   2 -
 arch/arm/src/armv7-m/arm_sigdeliver.c              |   1 -
 arch/arm/src/armv7-m/arm_stackcheck.c              |   2 +-
 arch/arm/src/armv7-m/arm_systemreset.c             |   2 +-
 arch/arm/src/armv7-m/arm_systick.c                 |   2 +-
 arch/arm/src/armv7-m/arm_trigger_irq.c             |   2 +-
 arch/arm/src/armv7-m/arm_usagefault.c              |   1 -
 arch/arm/src/armv7-m/dwt.h                         |   2 +-
 arch/arm/src/armv7-m/mpu.h                         |   2 -
 arch/arm/src/armv7-r/arm_doirq.c                   |   2 -
 arch/arm/src/armv7-r/arm_gicv2.c                   |   1 -
 arch/arm/src/armv7-r/arm_initialstate.c            |   1 -
 arch/arm/src/armv7-r/arm_l2cc_pl310.c              |   2 +-
 arch/arm/src/armv7-r/arm_schedulesigaction.c       |   1 -
 arch/arm/src/armv7-r/arm_sigdeliver.c              |   1 -
 arch/arm/src/armv7-r/mpu.h                         |   1 -
 arch/arm/src/armv8-m/arm_busfault.c                |   1 -
 arch/arm/src/armv8-m/arm_cache.c                   |   2 +-
 arch/arm/src/armv8-m/arm_doirq.c                   |   1 -
 arch/arm/src/armv8-m/arm_hardfault.c               |   1 -
 arch/arm/src/armv8-m/arm_initialstate.c            |   2 -
 arch/arm/src/armv8-m/arm_itm.c                     |   2 +-
 arch/arm/src/armv8-m/arm_itm_syslog.c              |   2 +-
 arch/arm/src/armv8-m/arm_memfault.c                |   1 -
 arch/arm/src/armv8-m/arm_ramvec_initialize.c       |   1 -
 arch/arm/src/armv8-m/arm_schedulesigaction.c       |   2 -
 arch/arm/src/armv8-m/arm_secure_irq.c              |   2 +-
 arch/arm/src/armv8-m/arm_securefault.c             |   1 -
 arch/arm/src/armv8-m/arm_sigdeliver.c              |   1 -
 arch/arm/src/armv8-m/arm_stackcheck.c              |   2 +-
 arch/arm/src/armv8-m/arm_systemreset.c             |   2 +-
 arch/arm/src/armv8-m/arm_systick.c                 |   2 +-
 arch/arm/src/armv8-m/arm_trigger_irq.c             |   2 +-
 arch/arm/src/armv8-m/arm_usagefault.c              |   1 -
 arch/arm/src/armv8-m/mpu.h                         |   2 -
 arch/arm/src/c5471/c5471_ethernet.c                |   1 -
 arch/arm/src/c5471/c5471_irq.c                     |   1 -
 arch/arm/src/c5471/c5471_serial.c                  |   1 -
 arch/arm/src/c5471/c5471_timerisr.c                |   1 -
 arch/arm/src/c5471/c5471_watchdog.c                |   2 +-
 arch/arm/src/common/arm_allocateheap.c             |   1 -
 arch/arm/src/common/arm_arch.h                     |  77 ----------------
 arch/arm/src/common/arm_assert.c                   |   2 -
 arch/arm/src/common/arm_backtrace_fp.c             |   1 -
 arch/arm/src/common/arm_backtrace_thumb.c          |   1 -
 arch/arm/src/common/arm_createstack.c              |   1 -
 arch/arm/src/common/arm_initialize.c               |   1 -
 arch/arm/src/common/arm_internal.h                 |  18 ++++
 arch/arm/src/common/arm_modifyreg16.c              |   2 +-
 arch/arm/src/common/arm_modifyreg32.c              |   2 +-
 arch/arm/src/common/arm_modifyreg8.c               |   2 +-
 arch/arm/src/cxd56xx/cxd56_adc.c                   |   2 +-
 arch/arm/src/cxd56xx/cxd56_allocateheap.c          |   1 -
 arch/arm/src/cxd56xx/cxd56_cisif.c                 |   3 +-
 arch/arm/src/cxd56xx/cxd56_clock.c                 |   3 +-
 arch/arm/src/cxd56xx/cxd56_cpufifo.c               |   3 +-
 arch/arm/src/cxd56xx/cxd56_cpuindex.c              |   2 +-
 arch/arm/src/cxd56xx/cxd56_cpupause.c              |   1 -
 arch/arm/src/cxd56xx/cxd56_cpustart.c              |   1 -
 arch/arm/src/cxd56xx/cxd56_emmc.c                  |   2 +-
 arch/arm/src/cxd56xx/cxd56_farapi.c                |   1 -
 arch/arm/src/cxd56xx/cxd56_ge2d.c                  |   2 +-
 arch/arm/src/cxd56xx/cxd56_gpio.c                  |   3 +-
 arch/arm/src/cxd56xx/cxd56_gpioint.c               |   2 +-
 arch/arm/src/cxd56xx/cxd56_hostif.c                |   3 +-
 arch/arm/src/cxd56xx/cxd56_i2c.c                   |   2 -
 arch/arm/src/cxd56xx/cxd56_icc.c                   |   2 +-
 arch/arm/src/cxd56xx/cxd56_irq.c                   |   1 -
 arch/arm/src/cxd56xx/cxd56_pinconfig.c             |   3 +-
 arch/arm/src/cxd56xx/cxd56_powermgr.c              |   1 -
 arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c       |   2 +-
 arch/arm/src/cxd56xx/cxd56_pwm.c                   |   3 +-
 arch/arm/src/cxd56xx/cxd56_rtc.c                   |   2 +-
 arch/arm/src/cxd56xx/cxd56_scu.c                   |   3 +-
 arch/arm/src/cxd56xx/cxd56_scufifo.c               |   3 +-
 arch/arm/src/cxd56xx/cxd56_sdhci.c                 |   2 +-
 arch/arm/src/cxd56xx/cxd56_serial.c                |   2 -
 arch/arm/src/cxd56xx/cxd56_sph.c                   |   2 +-
 arch/arm/src/cxd56xx/cxd56_spi.c                   |   2 -
 arch/arm/src/cxd56xx/cxd56_start.c                 |   1 -
 arch/arm/src/cxd56xx/cxd56_testset.c               |   3 +-
 arch/arm/src/cxd56xx/cxd56_timer.c                 |   2 +-
 arch/arm/src/cxd56xx/cxd56_timerisr.c              |   1 -
 arch/arm/src/cxd56xx/cxd56_uart.c                  |   2 -
 arch/arm/src/cxd56xx/cxd56_uart0.c                 |   2 +-
 arch/arm/src/cxd56xx/cxd56_udmac.c                 |   2 +-
 arch/arm/src/cxd56xx/cxd56_uid.c                   |   2 +-
 arch/arm/src/cxd56xx/cxd56_usbdev.c                |   1 -
 arch/arm/src/cxd56xx/cxd56_wdt.c                   |   2 +-
 arch/arm/src/dm320/dm320_allocateheap.c            |   1 -
 arch/arm/src/dm320/dm320_boot.c                    |   1 -
 arch/arm/src/dm320/dm320_decodeirq.c               |   2 -
 arch/arm/src/dm320/dm320_framebuffer.c             |   2 +-
 arch/arm/src/dm320/dm320_gio.h                     |   5 +-
 arch/arm/src/dm320/dm320_irq.c                     |   2 -
 arch/arm/src/dm320/dm320_serial.c                  |   1 -
 arch/arm/src/dm320/dm320_timerisr.c                |   1 -
 arch/arm/src/dm320/dm320_usbdev.c                  |   1 -
 arch/arm/src/efm32/efm32_adc.c                     |   2 -
 arch/arm/src/efm32/efm32_clockconfig.c             |   3 +-
 arch/arm/src/efm32/efm32_dma.c                     |   2 +-
 arch/arm/src/efm32/efm32_flash.c                   |   4 +-
 arch/arm/src/efm32/efm32_gpio.c                    |   2 +-
 arch/arm/src/efm32/efm32_gpioirq.c                 |   2 +-
 arch/arm/src/efm32/efm32_i2c.c                     |   3 +-
 arch/arm/src/efm32/efm32_irq.c                     |   2 -
 arch/arm/src/efm32/efm32_leserial.c                |   2 -
 arch/arm/src/efm32/efm32_lowputc.c                 |   3 +-
 arch/arm/src/efm32/efm32_pwm.c                     |   2 -
 arch/arm/src/efm32/efm32_rmu.c                     |   3 +-
 arch/arm/src/efm32/efm32_rtc_burtc.c               |   3 +-
 arch/arm/src/efm32/efm32_serial.c                  |   2 -
 arch/arm/src/efm32/efm32_spi.c                     |   2 -
 arch/arm/src/efm32/efm32_start.c                   |   2 -
 arch/arm/src/efm32/efm32_timer.c                   |   2 -
 arch/arm/src/efm32/efm32_timerisr.c                |   2 -
 arch/arm/src/efm32/efm32_usbdev.c                  |   2 -
 arch/arm/src/efm32/efm32_usbhost.c                 |   2 -
 arch/arm/src/eoss3/eoss3_clockconfig.c             |   2 -
 arch/arm/src/eoss3/eoss3_gpio.c                    |   2 -
 arch/arm/src/eoss3/eoss3_irq.c                     |   2 -
 arch/arm/src/eoss3/eoss3_lowputc.c                 |   2 -
 arch/arm/src/eoss3/eoss3_serial.c                  |   2 -
 arch/arm/src/eoss3/eoss3_start.c                   |   1 -
 arch/arm/src/eoss3/eoss3_timerisr.c                |   2 -
 arch/arm/src/imx1/imx_allocateheap.c               |   1 -
 arch/arm/src/imx1/imx_boot.c                       |   1 -
 arch/arm/src/imx1/imx_decodeirq.c                  |   2 -
 arch/arm/src/imx1/imx_gpio.c                       |   2 +-
 arch/arm/src/imx1/imx_gpio.h                       |   6 +-
 arch/arm/src/imx1/imx_irq.c                        |   1 -
 arch/arm/src/imx1/imx_serial.c                     |   1 -
 arch/arm/src/imx1/imx_spi.c                        |   2 -
 arch/arm/src/imx1/imx_timerisr.c                   |   1 -
 arch/arm/src/imx6/imx_boot.c                       |   2 -
 arch/arm/src/imx6/imx_clockconfig.c                |   2 +-
 arch/arm/src/imx6/imx_cpuboot.c                    |   2 -
 arch/arm/src/imx6/imx_ecspi.c                      |   2 -
 arch/arm/src/imx6/imx_enet.c                       |   2 +-
 arch/arm/src/imx6/imx_gpio.c                       |   2 +-
 arch/arm/src/imx6/imx_iomuxc.c                     |   2 +-
 arch/arm/src/imx6/imx_lowputc.c                    |   4 -
 arch/arm/src/imx6/imx_serial.c                     |   2 -
 arch/arm/src/imx6/imx_timerisr.c                   |   2 +-
 arch/arm/src/imxrt/imxrt_adc.c                     |   2 -
 arch/arm/src/imxrt/imxrt_allocateheap.c            |   2 -
 arch/arm/src/imxrt/imxrt_clockconfig.c             |   2 +-
 arch/arm/src/imxrt/imxrt_clrpend.c                 |   3 +-
 arch/arm/src/imxrt/imxrt_daisy.c                   |   2 +-
 arch/arm/src/imxrt/imxrt_edma.c                    |   1 -
 arch/arm/src/imxrt/imxrt_ehci.c                    |   2 +-
 arch/arm/src/imxrt/imxrt_enc.c                     |   3 +-
 arch/arm/src/imxrt/imxrt_enet.c                    |   2 +-
 arch/arm/src/imxrt/imxrt_flexcan.c                 |   2 +-
 arch/arm/src/imxrt/imxrt_flexpwm.c                 |   2 +-
 arch/arm/src/imxrt/imxrt_flexspi.c                 |   1 -
 arch/arm/src/imxrt/imxrt_gpio.c                    |   2 +-
 arch/arm/src/imxrt/imxrt_gpioirq.c                 |   3 +-
 arch/arm/src/imxrt/imxrt_hprtc.c                   |   3 +-
 arch/arm/src/imxrt/imxrt_iomuxc.c                  |   2 +-
 arch/arm/src/imxrt/imxrt_irq.c                     |   1 -
 arch/arm/src/imxrt/imxrt_lcd.c                     |   2 +-
 arch/arm/src/imxrt/imxrt_lowputc.c                 |   3 -
 arch/arm/src/imxrt/imxrt_lpi2c.c                   |   3 +-
 arch/arm/src/imxrt/imxrt_lpspi.c                   |   2 -
 arch/arm/src/imxrt/imxrt_lpsrtc.c                  |   3 +-
 arch/arm/src/imxrt/imxrt_ocotp.c                   |   2 +-
 arch/arm/src/imxrt/imxrt_periphclks.c              |   2 +-
 arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c           |   3 +-
 arch/arm/src/imxrt/imxrt_serial.c                  |   2 -
 arch/arm/src/imxrt/imxrt_start.c                   |   1 -
 arch/arm/src/imxrt/imxrt_tickless.c                |   2 +-
 arch/arm/src/imxrt/imxrt_timerisr.c                |   2 -
 arch/arm/src/imxrt/imxrt_usbdev.c                  |   2 -
 arch/arm/src/imxrt/imxrt_usdhc.c                   |   3 +-
 arch/arm/src/imxrt/imxrt_wdog.c                    |   2 +-
 arch/arm/src/imxrt/imxrt_xbar.c                    |   2 +-
 arch/arm/src/kinetis/kinetis_allocateheap.c        |   1 -
 arch/arm/src/kinetis/kinetis_clockconfig.c         |   3 +-
 arch/arm/src/kinetis/kinetis_clrpend.c             |   2 +-
 arch/arm/src/kinetis/kinetis_edma.c                |   1 -
 arch/arm/src/kinetis/kinetis_enet.c                |   2 +-
 arch/arm/src/kinetis/kinetis_flexcan.c             |   2 +-
 arch/arm/src/kinetis/kinetis_i2c.c                 |   2 -
 arch/arm/src/kinetis/kinetis_irq.c                 |   1 -
 arch/arm/src/kinetis/kinetis_lowputc.c             |   2 -
 arch/arm/src/kinetis/kinetis_lpserial.c            |   2 -
 arch/arm/src/kinetis/kinetis_mpuinit.c             |   2 +
 arch/arm/src/kinetis/kinetis_pin.c                 |   2 -
 arch/arm/src/kinetis/kinetis_pindma.c              |   2 -
 arch/arm/src/kinetis/kinetis_pindump.c             |   3 +-
 arch/arm/src/kinetis/kinetis_pingpio.c             |   2 -
 arch/arm/src/kinetis/kinetis_pinirq.c              |   2 -
 arch/arm/src/kinetis/kinetis_pwm.c                 |   2 -
 arch/arm/src/kinetis/kinetis_rtc.c                 |   3 +-
 arch/arm/src/kinetis/kinetis_sdhc.c                |   3 +-
 arch/arm/src/kinetis/kinetis_serial.c              |   2 -
 arch/arm/src/kinetis/kinetis_spi.c                 |   3 +-
 arch/arm/src/kinetis/kinetis_start.c               |   2 -
 arch/arm/src/kinetis/kinetis_timerisr.c            |   2 -
 arch/arm/src/kinetis/kinetis_usbdev.c              |   2 +-
 arch/arm/src/kinetis/kinetis_usbhshost.c           |   2 +-
 arch/arm/src/kinetis/kinetis_wdog.c                |   2 +-
 arch/arm/src/kl/kl_clockconfig.c                   |   3 +-
 arch/arm/src/kl/kl_dumpgpio.c                      |   3 +-
 arch/arm/src/kl/kl_gpio.c                          |   2 -
 arch/arm/src/kl/kl_gpioirq.c                       |   3 +-
 arch/arm/src/kl/kl_irq.c                           |   2 -
 arch/arm/src/kl/kl_irqprio.c                       |   3 +-
 arch/arm/src/kl/kl_lowputc.c                       |   2 -
 arch/arm/src/kl/kl_pwm.c                           |   2 -
 arch/arm/src/kl/kl_serial.c                        |   2 -
 arch/arm/src/kl/kl_spi.c                           |   2 +-
 arch/arm/src/kl/kl_start.c                         |   2 -
 arch/arm/src/kl/kl_timerisr.c                      |   2 -
 arch/arm/src/lc823450/lc823450_adc.c               |   2 +-
 arch/arm/src/lc823450/lc823450_allocateheap2.c     |   1 -
 arch/arm/src/lc823450/lc823450_clockconfig.c       |   2 +-
 arch/arm/src/lc823450/lc823450_cpuidlestack.c      |   2 +-
 arch/arm/src/lc823450/lc823450_cpuindex.c          |   2 +-
 arch/arm/src/lc823450/lc823450_cpupause.c          |   1 -
 arch/arm/src/lc823450/lc823450_cpustart.c          |   2 -
 arch/arm/src/lc823450/lc823450_dma.c               |   2 +-
 arch/arm/src/lc823450/lc823450_dvfs2.c             |   3 +-
 arch/arm/src/lc823450/lc823450_gpio.c              |   2 +-
 arch/arm/src/lc823450/lc823450_i2c.c               |   3 +-
 arch/arm/src/lc823450/lc823450_i2s.c               |   2 +-
 arch/arm/src/lc823450/lc823450_idle.c              |   1 -
 arch/arm/src/lc823450/lc823450_ipl2.c              |   1 -
 arch/arm/src/lc823450/lc823450_irq.c               |   1 -
 arch/arm/src/lc823450/lc823450_lowputc.c           |   2 -
 arch/arm/src/lc823450/lc823450_rtc.c               |   2 +-
 arch/arm/src/lc823450/lc823450_sdc.c               |   3 +-
 arch/arm/src/lc823450/lc823450_sddrv_dep.c         |   2 +-
 arch/arm/src/lc823450/lc823450_serial.c            |   2 -
 arch/arm/src/lc823450/lc823450_spi.c               |   2 +-
 arch/arm/src/lc823450/lc823450_spifi2.c            |   3 +-
 arch/arm/src/lc823450/lc823450_start.c             |   1 -
 arch/arm/src/lc823450/lc823450_syscontrol.c        |   2 -
 arch/arm/src/lc823450/lc823450_testset.c           |   2 +-
 arch/arm/src/lc823450/lc823450_timer.c             |   2 -
 arch/arm/src/lc823450/lc823450_usbdev.c            |   3 +-
 arch/arm/src/lc823450/lc823450_wdt.c               |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c    |   1 -
 arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c           |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c            |   2 -
 .../src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c    |   1 -
 arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c      |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c  |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_can.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c       |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c           |   3 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c      |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c         |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c       |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c       |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c           |   2 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c       |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c         |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c        |   3 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c        |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c           |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_start.c         |   1 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c         |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c      |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c        |   4 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c       |   2 -
 arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c           |   2 +-
 arch/arm/src/lpc214x/lpc214x_decodeirq.c           |   2 -
 arch/arm/src/lpc214x/lpc214x_irq.c                 |   2 -
 arch/arm/src/lpc214x/lpc214x_serial.c              |   2 -
 arch/arm/src/lpc214x/lpc214x_timerisr.c            |   2 -
 arch/arm/src/lpc214x/lpc214x_usbdev.c              |   4 +-
 arch/arm/src/lpc2378/lpc23xx_decodeirq.c           |   2 +-
 arch/arm/src/lpc2378/lpc23xx_i2c.c                 |   2 -
 arch/arm/src/lpc2378/lpc23xx_io.c                  |   2 +-
 arch/arm/src/lpc2378/lpc23xx_irq.c                 |   2 -
 arch/arm/src/lpc2378/lpc23xx_pllsetup.c            |   2 +-
 arch/arm/src/lpc2378/lpc23xx_serial.c              |   3 +-
 arch/arm/src/lpc2378/lpc23xx_spi.c                 |   2 -
 arch/arm/src/lpc2378/lpc23xx_timerisr.c            |   3 +-
 arch/arm/src/lpc31xx/lpc31.h                       |   1 -
 arch/arm/src/lpc31xx/lpc31_allocateheap.c          |   1 -
 arch/arm/src/lpc31xx/lpc31_bcrndx.c                |   2 +-
 arch/arm/src/lpc31xx/lpc31_boot.c                  |   1 -
 arch/arm/src/lpc31xx/lpc31_cgudrvr.h               |   5 +-
 arch/arm/src/lpc31xx/lpc31_clkdomain.c             |   2 +-
 arch/arm/src/lpc31xx/lpc31_clkfreq.c               |   2 +-
 arch/arm/src/lpc31xx/lpc31_decodeirq.c             |   2 -
 arch/arm/src/lpc31xx/lpc31_ehci.c                  |   2 +-
 arch/arm/src/lpc31xx/lpc31_esrndx.c                |   2 +-
 arch/arm/src/lpc31xx/lpc31_fdcndx.c                |   2 +-
 arch/arm/src/lpc31xx/lpc31_i2c.c                   |   2 -
 arch/arm/src/lpc31xx/lpc31_irq.c                   |   2 -
 arch/arm/src/lpc31xx/lpc31_lowputc.c               |   2 -
 arch/arm/src/lpc31xx/lpc31_serial.c                |   2 -
 arch/arm/src/lpc31xx/lpc31_softreset.c             |   2 +-
 arch/arm/src/lpc31xx/lpc31_timerisr.c              |   2 -
 arch/arm/src/lpc31xx/lpc31_usbdev.c                |   2 -
 arch/arm/src/lpc43xx/lpc43_adc.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_aes.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_allocateheap.c          |   2 -
 arch/arm/src/lpc43xx/lpc43_can.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_cgu.c                   |   2 +-
 arch/arm/src/lpc43xx/lpc43_clrpend.c               |   3 +-
 arch/arm/src/lpc43xx/lpc43_dac.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_debug.c                 |   2 +-
 arch/arm/src/lpc43xx/lpc43_ehci.c                  |   3 +-
 arch/arm/src/lpc43xx/lpc43_emc.c                   |   3 +-
 arch/arm/src/lpc43xx/lpc43_ethernet.c              |   3 +-
 arch/arm/src/lpc43xx/lpc43_gpdma.c                 |   2 -
 arch/arm/src/lpc43xx/lpc43_gpio.c                  |   2 +-
 arch/arm/src/lpc43xx/lpc43_gpioint.c               |   2 +-
 arch/arm/src/lpc43xx/lpc43_i2c.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_irq.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_pinconfig.c             |   2 +-
 arch/arm/src/lpc43xx/lpc43_rgu.c                   |   3 +-
 arch/arm/src/lpc43xx/lpc43_rit.c                   |   2 +-
 arch/arm/src/lpc43xx/lpc43_rtc.c                   |   1 -
 arch/arm/src/lpc43xx/lpc43_sdmmc.c                 |   3 +-
 arch/arm/src/lpc43xx/lpc43_serial.c                |   2 -
 arch/arm/src/lpc43xx/lpc43_spi.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_spifi.c                 |   3 +-
 arch/arm/src/lpc43xx/lpc43_ssp.c                   |   2 -
 arch/arm/src/lpc43xx/lpc43_start.c                 |   1 -
 arch/arm/src/lpc43xx/lpc43_tickless_rit.c          |   2 +-
 arch/arm/src/lpc43xx/lpc43_timer.c                 |   2 +-
 arch/arm/src/lpc43xx/lpc43_timerisr.c              |   2 -
 arch/arm/src/lpc43xx/lpc43_uart.c                  |   2 -
 arch/arm/src/lpc43xx/lpc43_usb0dev.c               |   2 -
 arch/arm/src/lpc43xx/lpc43_wwdt.c                  |   2 +-
 arch/arm/src/lpc54xx/lpc546x_enableclk.h           |   2 +-
 arch/arm/src/lpc54xx/lpc546x_power.h               |   2 +-
 arch/arm/src/lpc54xx/lpc54_allocateheap.c          |   2 -
 arch/arm/src/lpc54xx/lpc54_clockconfig.c           |   2 -
 arch/arm/src/lpc54xx/lpc54_clrpend.c               |   3 +-
 arch/arm/src/lpc54xx/lpc54_dma.c                   |   2 -
 arch/arm/src/lpc54xx/lpc54_emc.c                   |   5 +-
 arch/arm/src/lpc54xx/lpc54_ethernet.c              |  14 ++-
 arch/arm/src/lpc54xx/lpc54_gpio.c                  |   2 +-
 arch/arm/src/lpc54xx/lpc54_gpioirq.c               |   3 +-
 arch/arm/src/lpc54xx/lpc54_i2c_master.c            |   2 -
 arch/arm/src/lpc54xx/lpc54_irq.c                   |   2 -
 arch/arm/src/lpc54xx/lpc54_lcd.c                   |   2 +-
 arch/arm/src/lpc54xx/lpc54_lowputc.c               |   2 -
 arch/arm/src/lpc54xx/lpc54_reset.c                 |   2 +-
 arch/arm/src/lpc54xx/lpc54_rtc.c                   |   3 +-
 arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c         |   3 +-
 arch/arm/src/lpc54xx/lpc54_sdmmc.c                 |   2 +-
 arch/arm/src/lpc54xx/lpc54_serial.c                |   2 -
 arch/arm/src/lpc54xx/lpc54_spi_master.c            |   2 -
 arch/arm/src/lpc54xx/lpc54_start.c                 |   1 -
 arch/arm/src/lpc54xx/lpc54_tickless.c              |   2 +-
 arch/arm/src/lpc54xx/lpc54_timerisr.c              |   2 -
 arch/arm/src/lpc54xx/lpc54_usb0_ohci.c             |   2 -
 arch/arm/src/lpc54xx/lpc54_wwdt.c                  |   2 +-
 arch/arm/src/max326xx/common/max326_clrpend.c      |   3 +-
 arch/arm/src/max326xx/common/max326_icc.c          |   2 +-
 arch/arm/src/max326xx/common/max326_irq.c          |   2 -
 .../arm/src/max326xx/common/max326_rtc_lowerhalf.c |   3 +-
 arch/arm/src/max326xx/common/max326_start.c        |   1 -
 arch/arm/src/max326xx/common/max326_timerisr.c     |   1 -
 .../src/max326xx/max32660/max32660_clockconfig.c   |   3 +-
 arch/arm/src/max326xx/max32660/max32660_dma.c      |   3 +-
 arch/arm/src/max326xx/max32660/max32660_gpio.c     |   3 +-
 arch/arm/src/max326xx/max32660/max32660_gpioirq.c  |   3 +-
 arch/arm/src/max326xx/max32660/max32660_lowputc.c  |   2 -
 .../src/max326xx/max32660/max32660_periphclks.h    |   2 +-
 arch/arm/src/max326xx/max32660/max32660_rtc.c      |   3 +-
 arch/arm/src/max326xx/max32660/max32660_serial.c   |   2 -
 arch/arm/src/max326xx/max32660/max32660_spim.c     |   2 -
 arch/arm/src/max326xx/max32660/max32660_wdt.c      |   2 -
 arch/arm/src/moxart/moxart_16550.c                 |   2 +-
 arch/arm/src/moxart/moxart_irq.c                   |   1 -
 arch/arm/src/moxart/moxart_systemreset.c           |   2 +-
 arch/arm/src/moxart/moxart_timer.c                 |   2 +-
 arch/arm/src/nrf52/nrf52832_errdata.c              |   3 +-
 arch/arm/src/nrf52/nrf52_adc.c                     |   3 +-
 arch/arm/src/nrf52/nrf52_allocateheap.c            |   2 -
 arch/arm/src/nrf52/nrf52_clockconfig.c             |   2 -
 arch/arm/src/nrf52/nrf52_flash.c                   |   4 +-
 arch/arm/src/nrf52/nrf52_gpio.c                    |   2 +-
 arch/arm/src/nrf52/nrf52_gpiote.c                  |   3 +-
 arch/arm/src/nrf52/nrf52_i2c.c                     |   3 +-
 arch/arm/src/nrf52/nrf52_i2c_bitbang.c             |   2 +-
 arch/arm/src/nrf52/nrf52_irq.c                     |   2 -
 arch/arm/src/nrf52/nrf52_lowputc.c                 |   2 -
 arch/arm/src/nrf52/nrf52_nvmc.c                    |   3 +-
 arch/arm/src/nrf52/nrf52_ppi.c                     |   2 +-
 arch/arm/src/nrf52/nrf52_pwm.c                     |   2 -
 arch/arm/src/nrf52/nrf52_radio.c                   |   3 +-
 arch/arm/src/nrf52/nrf52_rng.c                     |   3 +-
 arch/arm/src/nrf52/nrf52_rtc.c                     |   3 +-
 arch/arm/src/nrf52/nrf52_sdc.c                     |   1 -
 arch/arm/src/nrf52/nrf52_serial.c                  |   2 -
 arch/arm/src/nrf52/nrf52_spi.c                     |   2 +-
 arch/arm/src/nrf52/nrf52_start.c                   |   1 -
 arch/arm/src/nrf52/nrf52_tickless_rtc.c            |   3 +-
 arch/arm/src/nrf52/nrf52_tim.c                     |   3 +-
 arch/arm/src/nrf52/nrf52_tim_lowerhalf.c           |   3 +-
 arch/arm/src/nrf52/nrf52_uid.c                     |   3 +-
 arch/arm/src/nrf52/nrf52_utils.c                   |   3 +-
 arch/arm/src/nrf52/nrf52_wdt.c                     |   2 -
 arch/arm/src/nuc1xx/nuc_clockconfig.c              |   3 +-
 arch/arm/src/nuc1xx/nuc_dumpgpio.c                 |   3 +-
 arch/arm/src/nuc1xx/nuc_gpio.c                     |   3 +-
 arch/arm/src/nuc1xx/nuc_irq.c                      |   2 -
 arch/arm/src/nuc1xx/nuc_lowputc.c                  |   3 +-
 arch/arm/src/nuc1xx/nuc_serial.c                   |   2 -
 arch/arm/src/nuc1xx/nuc_start.c                    |   2 -
 arch/arm/src/nuc1xx/nuc_timerisr.c                 |   2 -
 arch/arm/src/phy62xx/irq.c                         |   1 -
 arch/arm/src/phy62xx/phy62xx_hardfault.c           |   1 -
 arch/arm/src/phy62xx/phyplus_tim.c                 |   2 +-
 arch/arm/src/phy62xx/phyplus_timerisr.c            |   2 -
 arch/arm/src/phy62xx/start.c                       |   2 -
 arch/arm/src/phy62xx/systick.c                     |   2 +-
 arch/arm/src/phy62xx/timer.c                       |   2 +-
 arch/arm/src/rp2040/hardware/rp2040_memorymap.h    |   3 +-
 arch/arm/src/rp2040/rp2040_clock.c                 |   3 +-
 arch/arm/src/rp2040/rp2040_cpuindex.c              |   3 +-
 arch/arm/src/rp2040/rp2040_cpupause.c              |   1 -
 arch/arm/src/rp2040/rp2040_cpustart.c              |   2 -
 arch/arm/src/rp2040/rp2040_dmac.c                  |   2 +-
 arch/arm/src/rp2040/rp2040_gpio.c                  |   3 +-
 arch/arm/src/rp2040/rp2040_i2c.c                   |   2 -
 arch/arm/src/rp2040/rp2040_i2s.c                   |   2 -
 arch/arm/src/rp2040/rp2040_irq.c                   |   1 -
 arch/arm/src/rp2040/rp2040_pll.c                   |   3 +-
 arch/arm/src/rp2040/rp2040_serial.c                |   2 -
 arch/arm/src/rp2040/rp2040_spi.c                   |   2 -
 arch/arm/src/rp2040/rp2040_start.c                 |   2 -
 arch/arm/src/rp2040/rp2040_testset.c               |   3 +-
 arch/arm/src/rp2040/rp2040_timerisr.c              |   2 -
 arch/arm/src/rp2040/rp2040_uart.c                  |   2 -
 arch/arm/src/rp2040/rp2040_usbdev.c                |   1 -
 arch/arm/src/rp2040/rp2040_xosc.c                  |   3 +-
 arch/arm/src/rtl8720c/ameba_nvic.c                 |   1 -
 arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c         |   2 -
 arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c    |   1 -
 arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c     |   3 +-
 arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c         |   2 -
 arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c    |   2 -
 arch/arm/src/s32k1xx/s32k1xx_clockconfig.c         |   2 -
 arch/arm/src/s32k1xx/s32k1xx_edma.c                |   1 -
 arch/arm/src/s32k1xx/s32k1xx_eeeprom.c             |   3 -
 arch/arm/src/s32k1xx/s32k1xx_enet.c                |   2 +-
 arch/arm/src/s32k1xx/s32k1xx_flexcan.c             |   2 +-
 arch/arm/src/s32k1xx/s32k1xx_lowputc.c             |   3 -
 arch/arm/src/s32k1xx/s32k1xx_lpi2c.c               |   3 +-
 arch/arm/src/s32k1xx/s32k1xx_lpi2c_slave.c         |   3 +-
 arch/arm/src/s32k1xx/s32k1xx_lpspi.c               |   2 -
 arch/arm/src/s32k1xx/s32k1xx_periphclocks.c        |   2 +-
 arch/arm/src/s32k1xx/s32k1xx_periphclocks.h        |   2 -
 arch/arm/src/s32k1xx/s32k1xx_pin.c                 |   2 -
 arch/arm/src/s32k1xx/s32k1xx_pindma.c              |   2 -
 arch/arm/src/s32k1xx/s32k1xx_pindump.c             |   3 +-
 arch/arm/src/s32k1xx/s32k1xx_pingpio.c             |   2 +-
 arch/arm/src/s32k1xx/s32k1xx_pinirq.c              |   2 -
 arch/arm/src/s32k1xx/s32k1xx_progmem.c             |   3 -
 arch/arm/src/s32k1xx/s32k1xx_pwm.c                 |   2 -
 arch/arm/src/s32k1xx/s32k1xx_resetcause_procfs.c   |   3 +-
 arch/arm/src/s32k1xx/s32k1xx_rtc.c                 |   3 +-
 arch/arm/src/s32k1xx/s32k1xx_serial.c              |   2 -
 arch/arm/src/s32k1xx/s32k1xx_start.c               |   1 -
 arch/arm/src/s32k1xx/s32k1xx_uid.c                 |   3 +-
 arch/arm/src/s32k1xx/s32k1xx_wdog.h                |   2 +-
 arch/arm/src/sam34/sam4cm_cpupause.c               |   1 -
 arch/arm/src/sam34/sam4cm_cpustart.c               |   1 -
 arch/arm/src/sam34/sam4cm_supc.c                   |   2 -
 arch/arm/src/sam34/sam4cm_tc.c                     |   2 +-
 arch/arm/src/sam34/sam4l_clockconfig.c             |   2 -
 arch/arm/src/sam34/sam4l_gpio.c                    |   2 -
 arch/arm/src/sam34/sam4l_periphclks.c              |   2 -
 arch/arm/src/sam34/sam4s_nand.c                    |   2 +-
 arch/arm/src/sam34/sam4s_nand.h                    |   2 +-
 arch/arm/src/sam34/sam_aes.c                       |   2 -
 arch/arm/src/sam34/sam_allocateheap.c              |   2 -
 arch/arm/src/sam34/sam_clockconfig.c               |   2 -
 arch/arm/src/sam34/sam_cmcc.c                      |   2 +-
 arch/arm/src/sam34/sam_dmac.c                      |   1 -
 arch/arm/src/sam34/sam_emac.c                      |   2 -
 arch/arm/src/sam34/sam_gpio.c                      |   2 -
 arch/arm/src/sam34/sam_gpioirq.c                   |   2 -
 arch/arm/src/sam34/sam_hsmci.c                     |   3 +-
 arch/arm/src/sam34/sam_irq.c                       |   1 -
 arch/arm/src/sam34/sam_lowputc.c                   |   2 -
 arch/arm/src/sam34/sam_rtc.c                       |   2 +-
 arch/arm/src/sam34/sam_rtt.c                       |   2 +-
 arch/arm/src/sam34/sam_serial.c                    |   2 -
 arch/arm/src/sam34/sam_spi.c                       |   2 -
 arch/arm/src/sam34/sam_start.c                     |   1 -
 arch/arm/src/sam34/sam_tc.c                        |   2 +-
 arch/arm/src/sam34/sam_timerisr.c                  |   2 -
 arch/arm/src/sam34/sam_twi.c                       |   3 +-
 arch/arm/src/sam34/sam_udp.c                       |   2 -
 arch/arm/src/sam34/sam_wdt.c                       |   2 +-
 arch/arm/src/sama5/sam_adc.c                       |   2 -
 arch/arm/src/sama5/sam_allocateheap.c              |   1 -
 arch/arm/src/sama5/sam_boot.c                      |   2 -
 arch/arm/src/sama5/sam_can.c                       |   2 -
 arch/arm/src/sama5/sam_clockconfig.c               |   2 -
 arch/arm/src/sama5/sam_dbgu.c                      |   2 -
 arch/arm/src/sama5/sam_dmac.c                      |   1 -
 arch/arm/src/sama5/sam_ehci.c                      |   2 +-
 arch/arm/src/sama5/sam_emaca.c                     |   2 -
 arch/arm/src/sama5/sam_emacb.c                     |   2 -
 arch/arm/src/sama5/sam_flexcom_serial.c            |   2 -
 arch/arm/src/sama5/sam_gmac.c                      |   2 -
 arch/arm/src/sama5/sam_hsmci.c                     |   3 +-
 arch/arm/src/sama5/sam_irq.c                       |   1 -
 arch/arm/src/sama5/sam_lcd.c                       |   4 +-
 arch/arm/src/sama5/sam_lowputc.c                   |   2 -
 arch/arm/src/sama5/sam_nand.c                      |   3 +-
 arch/arm/src/sama5/sam_nand.h                      |   2 +-
 arch/arm/src/sama5/sam_ohci.c                      |   2 -
 arch/arm/src/sama5/sam_pck.c                       |   3 +-
 arch/arm/src/sama5/sam_pioirq.c                    |   2 -
 arch/arm/src/sama5/sam_pmc.c                       |   3 +-
 arch/arm/src/sama5/sam_pwm.c                       |   2 -
 arch/arm/src/sama5/sam_rtc.c                       |   2 +-
 arch/arm/src/sama5/sam_sckc.c                      |   2 +-
 arch/arm/src/sama5/sam_sdmmc.c                     |   2 -
 arch/arm/src/sama5/sam_serial.c                    |   2 -
 arch/arm/src/sama5/sam_spi.c                       |   2 -
 arch/arm/src/sama5/sam_ssc.c                       |   2 -
 arch/arm/src/sama5/sam_systemreset.c               |   2 +-
 arch/arm/src/sama5/sam_tc.c                        |   2 +-
 arch/arm/src/sama5/sam_timerisr.c                  |   2 +-
 arch/arm/src/sama5/sam_trng.c                      |   2 -
 arch/arm/src/sama5/sam_tsd.c                       |   2 +-
 arch/arm/src/sama5/sam_twi.c                       |   3 +-
 arch/arm/src/sama5/sam_udphs.c                     |   2 -
 arch/arm/src/sama5/sam_wdt.c                       |   2 +-
 arch/arm/src/sama5/sam_xdmac.c                     |   1 -
 arch/arm/src/sama5/sama5d2x_pio.c                  |   2 -
 arch/arm/src/sama5/sama5d3x4x_pio.c                |   2 -
 arch/arm/src/samd2l2/sam_ac.c                      |   3 +-
 arch/arm/src/samd2l2/sam_adc.c                     |   2 +-
 arch/arm/src/samd2l2/sam_dmac.c                    |   1 -
 arch/arm/src/samd2l2/sam_eic.c                     |   3 +-
 arch/arm/src/samd2l2/sam_i2c_master.c              |   2 -
 arch/arm/src/samd2l2/sam_irq.c                     |   2 -
 arch/arm/src/samd2l2/sam_irqprio.c                 |   3 +-
 arch/arm/src/samd2l2/sam_lowputc.c                 |   2 +-
 arch/arm/src/samd2l2/sam_port.c                    |   2 -
 arch/arm/src/samd2l2/sam_sercom.c                  |   4 +-
 arch/arm/src/samd2l2/sam_sercom.h                  |   2 +-
 arch/arm/src/samd2l2/sam_serial.c                  |   2 -
 arch/arm/src/samd2l2/sam_spi.c                     |   2 -
 arch/arm/src/samd2l2/sam_start.c                   |   2 -
 arch/arm/src/samd2l2/sam_timerisr.c                |   2 -
 arch/arm/src/samd2l2/sam_usart.h                   |   2 +-
 arch/arm/src/samd2l2/sam_usb.c                     |   2 -
 arch/arm/src/samd2l2/samd_clockconfig.c            |   3 +-
 arch/arm/src/samd2l2/samd_gclk.c                   |   2 +-
 arch/arm/src/samd2l2/saml_clockconfig.c            |   3 +-
 arch/arm/src/samd2l2/saml_gclk.c                   |   2 +-
 arch/arm/src/samd5e5/sam_clockconfig.c             |   3 +-
 arch/arm/src/samd5e5/sam_cmcc.c                    |   2 +-
 arch/arm/src/samd5e5/sam_dmac.c                    |   1 -
 arch/arm/src/samd5e5/sam_eic.c                     |   2 +-
 arch/arm/src/samd5e5/sam_gclk.c                    |   2 +-
 arch/arm/src/samd5e5/sam_gclk.h                    |   2 +-
 arch/arm/src/samd5e5/sam_gmac.c                    |   2 -
 arch/arm/src/samd5e5/sam_i2c_master.c              |   2 -
 arch/arm/src/samd5e5/sam_irq.c                     |   1 -
 arch/arm/src/samd5e5/sam_lowputc.c                 |   2 +-
 arch/arm/src/samd5e5/sam_port.c                    |   2 -
 arch/arm/src/samd5e5/sam_progmem.c                 |   3 +-
 arch/arm/src/samd5e5/sam_progmem.h                 |   2 +-
 arch/arm/src/samd5e5/sam_sercom.c                  |   3 +-
 arch/arm/src/samd5e5/sam_sercom.h                  |   2 +-
 arch/arm/src/samd5e5/sam_serial.c                  |   2 -
 arch/arm/src/samd5e5/sam_spi.c                     |   2 -
 arch/arm/src/samd5e5/sam_start.c                   |   1 -
 arch/arm/src/samd5e5/sam_tc.c                      |   2 -
 arch/arm/src/samd5e5/sam_tickless.c                |   2 +-
 arch/arm/src/samd5e5/sam_timerisr.c                |   1 -
 arch/arm/src/samd5e5/sam_usart.h                   |   2 +-
 arch/arm/src/samd5e5/sam_usb.c                     |   2 -
 arch/arm/src/samd5e5/sam_wdt.c                     |   1 -
 arch/arm/src/samv7/sam_afec.c                      |   2 -
 arch/arm/src/samv7/sam_allocateheap.c              |   2 -
 arch/arm/src/samv7/sam_clockconfig.c               |   2 -
 arch/arm/src/samv7/sam_dac.c                       |   2 -
 arch/arm/src/samv7/sam_eefc.h                      |   1 -
 arch/arm/src/samv7/sam_emac.c                      |   2 -
 arch/arm/src/samv7/sam_gpio.c                      |   2 -
 arch/arm/src/samv7/sam_gpioirq.c                   |   2 -
 arch/arm/src/samv7/sam_hsmci.c                     |   3 +-
 arch/arm/src/samv7/sam_irq.c                       |   1 -
 arch/arm/src/samv7/sam_lowputc.c                   |   2 -
 arch/arm/src/samv7/sam_mcan.c                      |   2 -
 arch/arm/src/samv7/sam_pck.c                       |   3 +-
 arch/arm/src/samv7/sam_progmem.c                   |   1 -
 arch/arm/src/samv7/sam_progmem.h                   |   2 +-
 arch/arm/src/samv7/sam_pwm.c                       |   2 +-
 arch/arm/src/samv7/sam_qencoder.c                  |   2 -
 arch/arm/src/samv7/sam_qspi.c                      |   1 -
 arch/arm/src/samv7/sam_qspi_spi.c                  |   2 -
 arch/arm/src/samv7/sam_rswdt.c                     |   2 +-
 arch/arm/src/samv7/sam_serial.c                    |   1 -
 arch/arm/src/samv7/sam_spi.c                       |   2 -
 arch/arm/src/samv7/sam_spi_slave.c                 |   3 +-
 arch/arm/src/samv7/sam_ssc.c                       |   2 -
 arch/arm/src/samv7/sam_start.c                     |   1 -
 arch/arm/src/samv7/sam_systemreset.c               |   2 +-
 arch/arm/src/samv7/sam_tc.c                        |   2 +-
 arch/arm/src/samv7/sam_timerisr.c                  |   2 -
 arch/arm/src/samv7/sam_trng.c                      |   2 -
 arch/arm/src/samv7/sam_twihs.c                     |   3 +-
 arch/arm/src/samv7/sam_usbdevhs.c                  |   1 -
 arch/arm/src/samv7/sam_wdt.c                       |   2 +-
 arch/arm/src/samv7/sam_xdmac.c                     |   1 -
 arch/arm/src/stm32/stm32_1wire.c                   |   3 +-
 arch/arm/src/stm32/stm32_adc.c                     |   2 -
 arch/arm/src/stm32/stm32_aes.c                     |   2 -
 arch/arm/src/stm32/stm32_allocateheap.c            |   2 -
 arch/arm/src/stm32/stm32_can.c                     |   2 -
 arch/arm/src/stm32/stm32_can_sock.c                |   2 -
 arch/arm/src/stm32/stm32_capture.c                 |   2 -
 arch/arm/src/stm32/stm32_comp.c                    |   2 +-
 arch/arm/src/stm32/stm32_cordic.c                  |   2 +-
 arch/arm/src/stm32/stm32_dac.c                     |   2 -
 arch/arm/src/stm32/stm32_dma2d.c                   |   1 -
 arch/arm/src/stm32/stm32_dma_v1.c                  |   1 -
 arch/arm/src/stm32/stm32_dma_v1mux.c               |   2 -
 arch/arm/src/stm32/stm32_dma_v2.c                  |   1 -
 arch/arm/src/stm32/stm32_dumpgpio.c                |   2 +-
 arch/arm/src/stm32/stm32_eth.c                     |   1 -
 arch/arm/src/stm32/stm32_exti_alarm.c              |   2 +-
 arch/arm/src/stm32/stm32_exti_gpio.c               |   2 +-
 arch/arm/src/stm32/stm32_exti_pwr.c                |   2 +-
 arch/arm/src/stm32/stm32_exti_wakeup.c             |   2 +-
 arch/arm/src/stm32/stm32_fdcan.c                   |   2 -
 arch/arm/src/stm32/stm32_fdcan_sock.c              |   2 -
 arch/arm/src/stm32/stm32_foc.c                     |   3 +-
 arch/arm/src/stm32/stm32_gpio.c                    |   2 +-
 arch/arm/src/stm32/stm32_hall3ph.c                 |   2 +-
 arch/arm/src/stm32/stm32_hciuart.c                 |   2 -
 arch/arm/src/stm32/stm32_i2c.c                     |   3 +-
 arch/arm/src/stm32/stm32_i2c_alt.c                 |   3 +-
 arch/arm/src/stm32/stm32_i2c_v2.c                  |   3 +-
 arch/arm/src/stm32/stm32_i2s.c                     |   2 -
 arch/arm/src/stm32/stm32_irq.c                     |   1 -
 arch/arm/src/stm32/stm32_iwdg.c                    |   2 +-
 arch/arm/src/stm32/stm32_lowputc.c                 |   2 -
 arch/arm/src/stm32/stm32_lse.c                     |   3 +-
 arch/arm/src/stm32/stm32_lsi.c                     |   3 +-
 arch/arm/src/stm32/stm32_ltdc.c                    |   1 -
 arch/arm/src/stm32/stm32_otgfsdev.c                |   2 -
 arch/arm/src/stm32/stm32_otgfshost.c               |   2 -
 arch/arm/src/stm32/stm32_otghsdev.c                |   2 -
 arch/arm/src/stm32/stm32_otghshost.c               |   2 -
 arch/arm/src/stm32/stm32_pmsleep.c                 |   2 +-
 arch/arm/src/stm32/stm32_pmstandby.c               |   2 +-
 arch/arm/src/stm32/stm32_pmstop.c                  |   2 +-
 arch/arm/src/stm32/stm32_pwm.c                     |   2 -
 arch/arm/src/stm32/stm32_pwr.c                     |   2 +-
 arch/arm/src/stm32/stm32_qencoder.c                |   2 -
 arch/arm/src/stm32/stm32_rcc.c                     |   2 -
 arch/arm/src/stm32/stm32_rcc.h                     |   2 +-
 arch/arm/src/stm32/stm32_rng.c                     |   1 -
 arch/arm/src/stm32/stm32_rtc_lowerhalf.c           |   3 +-
 arch/arm/src/stm32/stm32_rtcc.c                    |   3 +-
 arch/arm/src/stm32/stm32_rtcounter.c               |   3 +-
 arch/arm/src/stm32/stm32_sdadc.c                   |   4 +-
 arch/arm/src/stm32/stm32_sdio.c                    |   3 +-
 arch/arm/src/stm32/stm32_serial.c                  |   1 -
 arch/arm/src/stm32/stm32_spi.c                     |   2 -
 arch/arm/src/stm32/stm32_start.c                   |   1 -
 arch/arm/src/stm32/stm32_tickless.c                |   3 +-
 arch/arm/src/stm32/stm32_tim.c                     |   2 -
 arch/arm/src/stm32/stm32_timerisr.c                |   1 -
 arch/arm/src/stm32/stm32_usbdev.c                  |   2 +-
 arch/arm/src/stm32/stm32_wwdg.c                    |   2 +-
 arch/arm/src/stm32/stm32f10xxf30xx_flash.c         |   3 +-
 arch/arm/src/stm32/stm32f20xxf40xx_flash.c         |   3 +-
 arch/arm/src/stm32/stm32f40xxx_i2c.c               |   3 +-
 arch/arm/src/stm32/stm32f40xxx_rtcc.c              |   3 +-
 arch/arm/src/stm32/stm32l15xx_flash.c              |   3 +-
 arch/arm/src/stm32/stm32l15xxx_rtcc.c              |   3 +-
 arch/arm/src/stm32f0l0g0/stm32_adc.c               |   2 -
 arch/arm/src/stm32f0l0g0/stm32_aes.c               |   2 -
 arch/arm/src/stm32f0l0g0/stm32_dma_v1.c            |   1 -
 arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c         |   2 +-
 arch/arm/src/stm32f0l0g0/stm32_gpio.c              |   3 +-
 arch/arm/src/stm32f0l0g0/stm32_hsi48.c             |   2 +-
 arch/arm/src/stm32f0l0g0/stm32_i2c.c               |   3 +-
 arch/arm/src/stm32f0l0g0/stm32_irq.c               |   1 -
 arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c        |   2 -
 arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c        |   2 -
 arch/arm/src/stm32f0l0g0/stm32_lse.c               |   3 +-
 arch/arm/src/stm32f0l0g0/stm32_pwm.c               |   2 -
 arch/arm/src/stm32f0l0g0/stm32_rcc.c               |   2 -
 arch/arm/src/stm32f0l0g0/stm32_rcc.h               |   2 +-
 arch/arm/src/stm32f0l0g0/stm32_rng.c               |   1 -
 arch/arm/src/stm32f0l0g0/stm32_serial_v1.c         |   1 -
 arch/arm/src/stm32f0l0g0/stm32_serial_v2.c         |   2 -
 arch/arm/src/stm32f0l0g0/stm32_spi.c               |   2 -
 arch/arm/src/stm32f0l0g0/stm32_start.c             |   2 -
 arch/arm/src/stm32f0l0g0/stm32_tim.c               |   2 -
 arch/arm/src/stm32f0l0g0/stm32_timerisr.c          |   2 -
 arch/arm/src/stm32f0l0g0/stm32_usbdev.c            |   1 -
 arch/arm/src/stm32f0l0g0/stm32f0_rcc.c             |   1 -
 arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c           |   2 +-
 arch/arm/src/stm32f0l0g0/stm32g0_pwr.c             |   2 +-
 arch/arm/src/stm32f7/stm32_adc.c                   |   2 -
 arch/arm/src/stm32f7/stm32_allocateheap.c          |   2 -
 arch/arm/src/stm32f7/stm32_can.c                   |   2 -
 arch/arm/src/stm32f7/stm32_capture.c               |   2 -
 arch/arm/src/stm32f7/stm32_dma.c                   |   2 -
 arch/arm/src/stm32f7/stm32_dma2d.c                 |   1 -
 arch/arm/src/stm32f7/stm32_dumpgpio.c              |   3 +-
 arch/arm/src/stm32f7/stm32_exti_alarm.c            |   2 +-
 arch/arm/src/stm32f7/stm32_exti_gpio.c             |   2 +-
 arch/arm/src/stm32f7/stm32_exti_pwr.c              |   2 +-
 arch/arm/src/stm32f7/stm32_exti_wakeup.c           |   2 +-
 arch/arm/src/stm32f7/stm32_flash.c                 |   2 +-
 arch/arm/src/stm32f7/stm32_fmc.c                   |   2 +-
 arch/arm/src/stm32f7/stm32_gpio.c                  |   2 +-
 arch/arm/src/stm32f7/stm32_i2c.c                   |   3 +-
 arch/arm/src/stm32f7/stm32_irq.c                   |   1 -
 arch/arm/src/stm32f7/stm32_lowputc.c               |   2 -
 arch/arm/src/stm32f7/stm32_lse.c                   |   3 +-
 arch/arm/src/stm32f7/stm32_lsi.c                   |   3 +-
 arch/arm/src/stm32f7/stm32_ltdc.c                  |   1 -
 arch/arm/src/stm32f7/stm32_otgdev.c                |   1 -
 arch/arm/src/stm32f7/stm32_otghost.c               |   2 -
 arch/arm/src/stm32f7/stm32_pmsleep.c               |   2 +-
 arch/arm/src/stm32f7/stm32_pmstandby.c             |   2 +-
 arch/arm/src/stm32f7/stm32_pmstop.c                |   2 +-
 arch/arm/src/stm32f7/stm32_pwm.c                   |   2 -
 arch/arm/src/stm32f7/stm32_pwr.c                   |   2 +-
 arch/arm/src/stm32f7/stm32_qencoder.c              |   2 -
 arch/arm/src/stm32f7/stm32_qspi.c                  |   1 -
 arch/arm/src/stm32f7/stm32_rcc.c                   |   2 -
 arch/arm/src/stm32f7/stm32_rcc.h                   |   3 +-
 arch/arm/src/stm32f7/stm32_rng.c                   |   1 -
 arch/arm/src/stm32f7/stm32_rtc.c                   |   3 +-
 arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c         |   3 +-
 arch/arm/src/stm32f7/stm32_sai.c                   |   3 +-
 arch/arm/src/stm32f7/stm32_sdmmc.c                 |   3 +-
 arch/arm/src/stm32f7/stm32_serial.c                |   2 -
 arch/arm/src/stm32f7/stm32_spi.c                   |   2 -
 arch/arm/src/stm32f7/stm32_start.c                 |   1 -
 arch/arm/src/stm32f7/stm32_tickless.c              |   3 +-
 arch/arm/src/stm32f7/stm32_tim.c                   |   2 -
 arch/arm/src/stm32f7/stm32_timerisr.c              |   2 -
 arch/arm/src/stm32h7/stm32_allocateheap.c          |   2 -
 arch/arm/src/stm32h7/stm32_dma.c                   |   2 -
 arch/arm/src/stm32h7/stm32_exti_alarm.c            |   2 +-
 arch/arm/src/stm32h7/stm32_exti_gpio.c             |   2 +-
 arch/arm/src/stm32h7/stm32_exti_wakeup.c           |   2 +-
 arch/arm/src/stm32h7/stm32_flash.c                 |   2 +-
 arch/arm/src/stm32h7/stm32_gpio.c                  |   3 +-
 arch/arm/src/stm32h7/stm32_i2c.c                   |   3 +-
 arch/arm/src/stm32h7/stm32_irq.c                   |   1 -
 arch/arm/src/stm32h7/stm32_iwdg.c                  |   2 +-
 arch/arm/src/stm32h7/stm32_lowputc.c               |   2 -
 arch/arm/src/stm32h7/stm32_lptim.c                 |   2 -
 arch/arm/src/stm32h7/stm32_lse.c                   |   3 +-
 arch/arm/src/stm32h7/stm32_lsi.c                   |   3 +-
 arch/arm/src/stm32h7/stm32_otgdev.c                |   1 -
 arch/arm/src/stm32h7/stm32_otghost.c               |   2 -
 arch/arm/src/stm32h7/stm32_pmsleep.c               |   2 +-
 arch/arm/src/stm32h7/stm32_pmstandby.c             |   2 +-
 arch/arm/src/stm32h7/stm32_pmstop.c                |   2 +-
 arch/arm/src/stm32h7/stm32_pwm.c                   |   2 -
 arch/arm/src/stm32h7/stm32_pwr.c                   |   2 +-
 arch/arm/src/stm32h7/stm32_qencoder.c              |   2 -
 arch/arm/src/stm32h7/stm32_qspi.c                  |   1 -
 arch/arm/src/stm32h7/stm32_rcc.c                   |   2 -
 arch/arm/src/stm32h7/stm32_rcc.h                   |   3 +-
 arch/arm/src/stm32h7/stm32_rtc.c                   |   3 +-
 arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c         |   3 +-
 arch/arm/src/stm32h7/stm32_sdmmc.c                 |   3 +-
 arch/arm/src/stm32h7/stm32_serial.c                |   2 -
 arch/arm/src/stm32h7/stm32_spi.c                   |   2 -
 arch/arm/src/stm32h7/stm32_spi_slave.c             |   2 -
 arch/arm/src/stm32h7/stm32_start.c                 |   1 -
 arch/arm/src/stm32h7/stm32_tim.c                   |   2 -
 arch/arm/src/stm32h7/stm32_timerisr.c              |   2 -
 arch/arm/src/stm32h7/stm32_wwdg.c                  |   2 +-
 arch/arm/src/stm32l4/stm32l4_1wire.c               |   3 +-
 arch/arm/src/stm32l4/stm32l4_allocateheap.c        |   1 -
 arch/arm/src/stm32l4/stm32l4_can.c                 |   2 -
 arch/arm/src/stm32l4/stm32l4_comp.c                |   2 +-
 arch/arm/src/stm32l4/stm32l4_dac.c                 |   2 -
 arch/arm/src/stm32l4/stm32l4_dumpgpio.c            |   2 +-
 arch/arm/src/stm32l4/stm32l4_exti_alarm.c          |   2 +-
 arch/arm/src/stm32l4/stm32l4_exti_comp.c           |   2 +-
 arch/arm/src/stm32l4/stm32l4_exti_gpio.c           |   2 +-
 arch/arm/src/stm32l4/stm32l4_exti_pwr.c            |   2 +-
 arch/arm/src/stm32l4/stm32l4_exti_wakeup.c         |   2 +-
 arch/arm/src/stm32l4/stm32l4_firewall.c            |   2 +-
 arch/arm/src/stm32l4/stm32l4_flash.c               |   3 +-
 arch/arm/src/stm32l4/stm32l4_gpio.c                |   3 +-
 arch/arm/src/stm32l4/stm32l4_hsi48.c               |   2 +-
 arch/arm/src/stm32l4/stm32l4_i2c.c                 |   3 +-
 arch/arm/src/stm32l4/stm32l4_irq.c                 |   1 -
 arch/arm/src/stm32l4/stm32l4_iwdg.c                |   2 +-
 arch/arm/src/stm32l4/stm32l4_lowputc.c             |   2 -
 arch/arm/src/stm32l4/stm32l4_lse.c                 |   3 +-
 arch/arm/src/stm32l4/stm32l4_lsi.c                 |   2 +-
 arch/arm/src/stm32l4/stm32l4_otgfsdev.c            |   2 -
 arch/arm/src/stm32l4/stm32l4_otgfshost.c           |   2 -
 arch/arm/src/stm32l4/stm32l4_pmlpr.c               |   2 +-
 arch/arm/src/stm32l4/stm32l4_pmsleep.c             |   2 +-
 arch/arm/src/stm32l4/stm32l4_pmstandby.c           |   2 +-
 arch/arm/src/stm32l4/stm32l4_pmstop.c              |   2 +-
 arch/arm/src/stm32l4/stm32l4_pwm.c                 |   2 -
 arch/arm/src/stm32l4/stm32l4_pwr.c                 |   2 +-
 arch/arm/src/stm32l4/stm32l4_qencoder.c            |   2 -
 arch/arm/src/stm32l4/stm32l4_qspi.c                |   1 -
 arch/arm/src/stm32l4/stm32l4_rcc.c                 |   2 -
 arch/arm/src/stm32l4/stm32l4_rcc.h                 |   2 +-
 arch/arm/src/stm32l4/stm32l4_rng.c                 |   1 -
 arch/arm/src/stm32l4/stm32l4_rtc.c                 |   3 +-
 arch/arm/src/stm32l4/stm32l4_sdmmc.c               |   3 +-
 arch/arm/src/stm32l4/stm32l4_serial.c              |   1 -
 arch/arm/src/stm32l4/stm32l4_spi.c                 |   2 -
 arch/arm/src/stm32l4/stm32l4_start.c               |   1 -
 arch/arm/src/stm32l4/stm32l4_tim.c                 |   2 -
 arch/arm/src/stm32l4/stm32l4_timerisr.c            |   2 -
 arch/arm/src/stm32l4/stm32l4_usbdev.c              |   2 +-
 arch/arm/src/stm32l4/stm32l4x6xx_dma.c             |   1 -
 arch/arm/src/stm32l4/stm32l4xrxx_dma.c             |   2 -
 arch/arm/src/stm32l5/stm32l5_allocateheap.c        |   1 -
 arch/arm/src/stm32l5/stm32l5_dumpgpio.c            |   2 +-
 arch/arm/src/stm32l5/stm32l5_exti_gpio.c           |   2 +-
 arch/arm/src/stm32l5/stm32l5_flash.c               |   3 +-
 arch/arm/src/stm32l5/stm32l5_gpio.c                |   3 +-
 arch/arm/src/stm32l5/stm32l5_irq.c                 |   1 -
 arch/arm/src/stm32l5/stm32l5_lowputc.c             |   2 -
 arch/arm/src/stm32l5/stm32l5_lse.c                 |   3 +-
 arch/arm/src/stm32l5/stm32l5_lsi.c                 |   2 +-
 arch/arm/src/stm32l5/stm32l5_pwr.c                 |   2 +-
 arch/arm/src/stm32l5/stm32l5_rcc.c                 |   2 -
 arch/arm/src/stm32l5/stm32l5_rcc.h                 |   2 +-
 arch/arm/src/stm32l5/stm32l5_serial.c              |   1 -
 arch/arm/src/stm32l5/stm32l5_spi.c                 |   2 -
 arch/arm/src/stm32l5/stm32l5_start.c               |   1 -
 arch/arm/src/stm32l5/stm32l5_tim.c                 |   2 -
 arch/arm/src/stm32l5/stm32l5_timerisr.c            |   2 -
 arch/arm/src/stm32u5/stm32_allocateheap.c          |   1 -
 arch/arm/src/stm32u5/stm32_dumpgpio.c              |   2 +-
 arch/arm/src/stm32u5/stm32_exti_gpio.c             |   2 +-
 arch/arm/src/stm32u5/stm32_flash.c                 |   3 +-
 arch/arm/src/stm32u5/stm32_gpio.c                  |   3 +-
 arch/arm/src/stm32u5/stm32_irq.c                   |   1 -
 arch/arm/src/stm32u5/stm32_lowputc.c               |   2 -
 arch/arm/src/stm32u5/stm32_lse.c                   |   3 +-
 arch/arm/src/stm32u5/stm32_lsi.c                   |   2 +-
 arch/arm/src/stm32u5/stm32_pwr.c                   |   2 +-
 arch/arm/src/stm32u5/stm32_rcc.c                   |   2 -
 arch/arm/src/stm32u5/stm32_rcc.h                   |   2 +-
 arch/arm/src/stm32u5/stm32_serial.c                |   1 -
 arch/arm/src/stm32u5/stm32_spi.c                   |   2 -
 arch/arm/src/stm32u5/stm32_start.c                 |   1 -
 arch/arm/src/stm32u5/stm32_tim.c                   |   2 -
 arch/arm/src/stm32u5/stm32_timerisr.c              |   2 -
 arch/arm/src/str71x/str71x_decodeirq.c             |   1 -
 arch/arm/src/str71x/str71x_irq.c                   |   1 -
 arch/arm/src/str71x/str71x_lowputc.c               |   2 -
 arch/arm/src/str71x/str71x_prccu.c                 |   2 +-
 arch/arm/src/str71x/str71x_serial.c                |   2 -
 arch/arm/src/str71x/str71x_timerisr.c              |   2 -
 arch/arm/src/str71x/str71x_xti.c                   |   1 -
 arch/arm/src/tiva/cc13xx/cc13x0_rom.c              |   3 +-
 arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c        |   3 +-
 arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c    |   3 +-
 arch/arm/src/tiva/cc13xx/cc13xx_gpio.c             |   2 +-
 arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c          |   2 -
 arch/arm/src/tiva/cc13xx/cc13xx_prcm.c             |   2 +-
 arch/arm/src/tiva/cc13xx/cc13xx_prcm.h             |   2 +-
 arch/arm/src/tiva/cc13xx/cc13xx_start.c            |   2 -
 arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c      |   1 -
 arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h    |   2 +-
 arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h     |   2 +-
 arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c       |   2 -
 arch/arm/src/tiva/common/lmxx_tm4c_start.c         |   2 -
 arch/arm/src/tiva/common/tiva_adclib.c             |   1 -
 arch/arm/src/tiva/common/tiva_adclow.c             |   1 -
 arch/arm/src/tiva/common/tiva_allocateheap.c       |   1 -
 arch/arm/src/tiva/common/tiva_dumpgpio.c           |   3 +-
 arch/arm/src/tiva/common/tiva_eeprom.c             |   2 +-
 arch/arm/src/tiva/common/tiva_flash.c              |   2 +-
 arch/arm/src/tiva/common/tiva_hciuart.c            |   2 -
 arch/arm/src/tiva/common/tiva_i2c.c                |   3 +-
 arch/arm/src/tiva/common/tiva_irq.c                |   2 -
 arch/arm/src/tiva/common/tiva_lowputc.c            |   2 -
 arch/arm/src/tiva/common/tiva_pwm.c                |   2 +-
 arch/arm/src/tiva/common/tiva_qencoder.c           |   2 +-
 arch/arm/src/tiva/common/tiva_serial.c             |   2 -
 arch/arm/src/tiva/common/tiva_ssi.c                |   2 -
 arch/arm/src/tiva/common/tiva_timerisr.c           |   2 -
 arch/arm/src/tiva/common/tiva_timerlib.c           |   2 +-
 arch/arm/src/tiva/lm/lm3s_ethernet.c               |   3 +-
 arch/arm/src/tiva/lm/lm3s_gpio.c                   |   2 +-
 arch/arm/src/tiva/lm/lm4f_gpio.c                   |   2 +-
 arch/arm/src/tiva/tiva_chipinfo.h                  |   2 +-
 arch/arm/src/tiva/tiva_periphrdy.h                 |   2 +-
 arch/arm/src/tiva/tiva_timer.h                     |   2 +-
 arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c           |   1 -
 arch/arm/src/tiva/tm4c/tm4c_ethernet.c             |   1 -
 arch/arm/src/tiva/tm4c/tm4c_gpio.c                 |   2 +-
 arch/arm/src/tms570/tms570_boot.c                  |   1 -
 arch/arm/src/tms570/tms570_clockconfig.c           |   3 +-
 arch/arm/src/tms570/tms570_esm.c                   |   2 -
 arch/arm/src/tms570/tms570_gio.c                   |   2 -
 arch/arm/src/tms570/tms570_gioirq.c                |   2 -
 arch/arm/src/tms570/tms570_irq.c                   |   2 -
 arch/arm/src/tms570/tms570_lowputc.c               |   2 -
 arch/arm/src/tms570/tms570_selftest.c              |   3 +-
 arch/arm/src/tms570/tms570_serial.c                |   2 -
 arch/arm/src/tms570/tms570_timerisr.c              |   2 -
 arch/arm/src/xmc4/xmc4_allocateheap.c              |   1 -
 arch/arm/src/xmc4/xmc4_clockconfig.c               |   2 +-
 arch/arm/src/xmc4/xmc4_clockutils.c                |   2 +-
 arch/arm/src/xmc4/xmc4_clrpend.c                   |   2 +-
 arch/arm/src/xmc4/xmc4_gpio.c                      |   2 -
 arch/arm/src/xmc4/xmc4_irq.c                       |   1 -
 arch/arm/src/xmc4/xmc4_lowputc.c                   |   1 -
 arch/arm/src/xmc4/xmc4_serial.c                    |   2 -
 arch/arm/src/xmc4/xmc4_spi.c                       |   2 -
 arch/arm/src/xmc4/xmc4_start.c                     |   1 -
 arch/arm/src/xmc4/xmc4_timerisr.c                  |   2 -
 arch/arm/src/xmc4/xmc4_usic.c                      |   2 +-
 arch/avr/src/at32uc3/at32uc3_clkinit.c             |   2 -
 arch/avr/src/at32uc3/at32uc3_gpio.c                |   1 -
 arch/avr/src/at32uc3/at32uc3_gpioirq.c             |   2 +-
 arch/avr/src/at32uc3/at32uc3_irq.c                 |   1 -
 arch/avr/src/at32uc3/at32uc3_lowconsole.c          |   1 -
 arch/avr/src/at32uc3/at32uc3_serial.c              |   1 -
 arch/avr/src/at32uc3/at32uc3_timerisr.c            |   3 +-
 arch/avr/src/at90usb/at90usb_lowconsole.c          |   2 -
 arch/avr/src/at90usb/at90usb_serial.c              |   1 -
 arch/avr/src/at90usb/at90usb_timerisr.c            |   3 +-
 arch/avr/src/at90usb/at90usb_usbdev.c              |   1 -
 arch/avr/src/atmega/atmega_lowconsole.c            |   1 -
 arch/avr/src/atmega/atmega_serial.c                |   1 -
 arch/avr/src/atmega/atmega_timerisr.c              |   3 +-
 arch/avr/src/avr/up_createstack.c                  |   1 -
 arch/avr/src/avr/up_doirq.c                        |   1 -
 arch/avr/src/avr/up_dumpstate.c                    |   1 -
 arch/avr/src/avr/up_initialstate.c                 |   1 -
 arch/avr/src/avr/up_irq.c                          |   1 -
 arch/avr/src/avr/up_schedulesigaction.c            |   1 -
 arch/avr/src/avr/up_sigdeliver.c                   |   1 -
 arch/avr/src/avr/up_spi.c                          |   2 -
 arch/avr/src/avr32/up_createstack.c                |   1 -
 arch/avr/src/avr32/up_doirq.c                      |   2 -
 arch/avr/src/avr32/up_dumpstate.c                  |   1 -
 arch/avr/src/avr32/up_initialstate.c               |   1 -
 arch/avr/src/avr32/up_nommuhead.S                  |   1 -
 arch/avr/src/avr32/up_schedulesigaction.c          |   1 -
 arch/avr/src/avr32/up_sigdeliver.c                 |   1 -
 arch/avr/src/common/up_allocateheap.c              |   1 -
 arch/avr/src/common/up_arch.h                      |  75 ---------------
 arch/avr/src/common/up_assert.c                    |   1 -
 arch/avr/src/common/up_initialize.c                |   1 -
 arch/avr/src/common/up_internal.h                  |  12 +++
 arch/avr/src/common/up_modifyreg16.c               |   2 +-
 arch/avr/src/common/up_modifyreg32.c               |   2 +-
 arch/avr/src/common/up_modifyreg8.c                |   2 +-
 arch/ceva/src/common/up_arch.h                     |  76 ----------------
 arch/ceva/src/common/up_heap.c                     |   1 -
 arch/ceva/src/common/up_initialize.c               |   1 -
 arch/ceva/src/common/up_internal.h                 |  12 +++
 arch/ceva/src/common/up_modifyreg16.c              |   2 +-
 arch/ceva/src/common/up_modifyreg32.c              |   2 +-
 arch/ceva/src/common/up_modifyreg8.c               |   2 +-
 arch/hc/src/common/up_allocateheap.c               |   1 -
 arch/hc/src/common/up_arch.h                       |  78 ----------------
 arch/hc/src/common/up_createstack.c                |   1 -
 arch/hc/src/common/up_doirq.c                      |   2 -
 arch/hc/src/common/up_initialize.c                 |   1 -
 arch/hc/src/common/up_internal.h                   |  13 +++
 arch/hc/src/common/up_modifyreg16.c                |   2 +-
 arch/hc/src/common/up_modifyreg32.c                |   2 +-
 arch/hc/src/common/up_modifyreg8.c                 |   2 +-
 arch/hc/src/m9s12/m9s12_assert.c                   |   1 -
 arch/hc/src/m9s12/m9s12_dumpgpio.c                 |   2 +-
 arch/hc/src/m9s12/m9s12_gpio.c                     |   2 +-
 arch/hc/src/m9s12/m9s12_gpioirq.c                  |   2 +-
 arch/hc/src/m9s12/m9s12_irq.c                      |   1 -
 arch/hc/src/m9s12/m9s12_timerisr.c                 |   2 -
 arch/mips/src/common/mips_allocateheap.c           |   1 -
 arch/mips/src/common/mips_arch.h                   |  75 ---------------
 arch/mips/src/common/mips_createstack.c            |   1 -
 arch/mips/src/common/mips_initialize.c             |   1 -
 arch/mips/src/common/mips_internal.h               |  13 +++
 arch/mips/src/common/mips_modifyreg16.c            |   2 +-
 arch/mips/src/common/mips_modifyreg32.c            |   2 +-
 arch/mips/src/common/mips_modifyreg8.c             |   2 +-
 arch/mips/src/mips32/mips_assert.c                 |   1 -
 arch/mips/src/mips32/mips_cache.S                  |   2 +-
 arch/mips/src/mips32/mips_doirq.c                  |   2 -
 arch/mips/src/mips32/mips_dumpstate.c              |   1 -
 arch/mips/src/mips32/mips_initialstate.c           |   1 -
 arch/mips/src/mips32/mips_schedulesigaction.c      |   1 -
 arch/mips/src/mips32/mips_sigdeliver.c             |   1 -
 arch/mips/src/pic32mx/pic32mx_decodeirq.c          |   3 +-
 arch/mips/src/pic32mx/pic32mx_ethernet.c           |   2 +-
 arch/mips/src/pic32mx/pic32mx_exception.c          |   3 +-
 arch/mips/src/pic32mx/pic32mx_gpio.c               |   4 +-
 arch/mips/src/pic32mx/pic32mx_gpioirq.c            |   2 +-
 arch/mips/src/pic32mx/pic32mx_irq.c                |   2 -
 arch/mips/src/pic32mx/pic32mx_lowconsole.c         |   2 -
 arch/mips/src/pic32mx/pic32mx_lowinit.c            |   2 -
 arch/mips/src/pic32mx/pic32mx_serial.c             |   2 -
 arch/mips/src/pic32mx/pic32mx_spi.c                |   2 -
 arch/mips/src/pic32mx/pic32mx_timerisr.c           |   2 -
 arch/mips/src/pic32mx/pic32mx_usbdev.c             |   2 +-
 arch/mips/src/pic32mz/pic32mz_decodeirq.c          |   2 -
 arch/mips/src/pic32mz/pic32mz_dma.c                |   1 -
 arch/mips/src/pic32mz/pic32mz_ethernet.c           |   2 -
 arch/mips/src/pic32mz/pic32mz_exception.c          |   2 -
 arch/mips/src/pic32mz/pic32mz_gpio.c               |   5 +-
 arch/mips/src/pic32mz/pic32mz_gpioirq.c            |   1 -
 arch/mips/src/pic32mz/pic32mz_i2c.c                |   2 -
 arch/mips/src/pic32mz/pic32mz_irq.c                |   2 -
 arch/mips/src/pic32mz/pic32mz_lowconsole.c         |   2 -
 arch/mips/src/pic32mz/pic32mz_lowinit.c            |   2 -
 arch/mips/src/pic32mz/pic32mz_serial.c             |   2 -
 arch/mips/src/pic32mz/pic32mz_spi.c                |   2 -
 arch/mips/src/pic32mz/pic32mz_timer.c              |   2 -
 arch/mips/src/pic32mz/pic32mz_timerisr.c           |   2 -
 arch/or1k/src/common/up_allocateheap.c             |   1 -
 arch/or1k/src/common/up_arch.h                     |  71 ---------------
 arch/or1k/src/common/up_assert.c                   |   1 -
 arch/or1k/src/common/up_createstack.c              |   1 -
 arch/or1k/src/common/up_doirq.c                    |   1 -
 arch/or1k/src/common/up_initialstate.c             |   1 -
 arch/or1k/src/common/up_internal.h                 |  12 +++
 arch/or1k/src/common/up_modifyreg16.c              |   2 +-
 arch/or1k/src/common/up_modifyreg32.c              |   2 +-
 arch/or1k/src/common/up_modifyreg8.c               |   2 +-
 arch/or1k/src/common/up_schedulesigaction.c        |   1 -
 arch/or1k/src/common/up_timer.c                    |   1 -
 arch/or1k/src/mor1kx/mor1kx_serial.c               |   1 -
 arch/or1k/src/mor1kx/up_irq.c                      |   1 -
 arch/renesas/src/common/up_allocateheap.c          |   2 +-
 arch/renesas/src/common/up_arch.h                  |  55 -----------
 arch/renesas/src/common/up_assert.c                |   3 +-
 arch/renesas/src/common/up_createstack.c           |   2 +-
 arch/renesas/src/common/up_doirq.c                 |   3 +-
 arch/renesas/src/common/up_initialize.c            |   1 -
 arch/renesas/src/common/up_internal.h              |   9 +-
 arch/renesas/src/m16c/m16c_dumpstate.c             |   1 -
 arch/renesas/src/m16c/m16c_initialstate.c          |   1 -
 arch/renesas/src/m16c/m16c_lowputc.c               |   3 -
 arch/renesas/src/m16c/m16c_schedulesigaction.c     |   1 -
 arch/renesas/src/m16c/m16c_serial.c                |   1 -
 arch/renesas/src/m16c/m16c_sigdeliver.c            |   1 -
 arch/renesas/src/m16c/m16c_timerisr.c              |   2 -
 arch/renesas/src/rx65n/rx65n_dtc.c                 |   3 -
 arch/renesas/src/rx65n/rx65n_dumpstate.c           |   1 -
 arch/renesas/src/rx65n/rx65n_eth.c                 |   2 -
 arch/renesas/src/rx65n/rx65n_hardware_setup.c      |   1 -
 arch/renesas/src/rx65n/rx65n_head.S                |   1 -
 arch/renesas/src/rx65n/rx65n_initialstate.c        |   1 -
 arch/renesas/src/rx65n/rx65n_irq.c                 |   1 -
 arch/renesas/src/rx65n/rx65n_lowputc.c             |   1 -
 arch/renesas/src/rx65n/rx65n_riic.c                |   2 +-
 arch/renesas/src/rx65n/rx65n_rspi.c                |   3 -
 arch/renesas/src/rx65n/rx65n_rspi_sw.c             |   3 -
 arch/renesas/src/rx65n/rx65n_rtc.c                 |   3 +-
 arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c       |   2 +-
 arch/renesas/src/rx65n/rx65n_schedulesigaction.c   |   1 -
 arch/renesas/src/rx65n/rx65n_sci.c                 |   1 -
 arch/renesas/src/rx65n/rx65n_serial.c              |   1 -
 arch/renesas/src/rx65n/rx65n_sigdeliver.c          |   2 +-
 arch/renesas/src/rx65n/rx65n_timerisr.c            |   1 -
 arch/renesas/src/rx65n/rx65n_usbdev.c              |   2 -
 arch/renesas/src/rx65n/rx65n_usbhost.c             |   2 -
 arch/renesas/src/sh1/sh1_dumpstate.c               |   1 -
 arch/renesas/src/sh1/sh1_head.S                    |   1 -
 arch/renesas/src/sh1/sh1_initialstate.c            |   1 -
 arch/renesas/src/sh1/sh1_irq.c                     |   1 -
 arch/renesas/src/sh1/sh1_lowputc.c                 |   3 -
 arch/renesas/src/sh1/sh1_schedulesigaction.c       |   1 -
 arch/renesas/src/sh1/sh1_serial.c                  |   1 -
 arch/renesas/src/sh1/sh1_sigdeliver.c              |   1 -
 arch/renesas/src/sh1/sh1_timerisr.c                |   2 -
 arch/risc-v/src/bl602/bl602_efuse.c                |   3 +-
 arch/risc-v/src/bl602/bl602_glb.c                  |   2 +-
 arch/risc-v/src/bl602/bl602_gpio.c                 |   3 +-
 arch/risc-v/src/bl602/bl602_hbn.c                  |   2 +-
 arch/risc-v/src/bl602/bl602_i2c.c                  |   3 +-
 arch/risc-v/src/bl602/bl602_irq.c                  |   2 -
 arch/risc-v/src/bl602/bl602_irq_dispatch.c         |   2 -
 arch/risc-v/src/bl602/bl602_lowputc.c              |   2 -
 arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c    |   1 -
 arch/risc-v/src/bl602/bl602_pwm_lowerhalf.c        |   2 -
 arch/risc-v/src/bl602/bl602_rtc.c                  |   3 +-
 arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c        |   3 +-
 arch/risc-v/src/bl602/bl602_serial.c               |   3 -
 arch/risc-v/src/bl602/bl602_spi.c                  |   2 +-
 arch/risc-v/src/bl602/bl602_start.c                |   1 -
 arch/risc-v/src/bl602/bl602_systemreset.c          |   7 +-
 arch/risc-v/src/bl602/bl602_tim.c                  |   1 -
 arch/risc-v/src/bl602/bl602_tim_lowerhalf.c        |   3 +-
 arch/risc-v/src/bl602/bl602_timerisr.c             |   3 +-
 arch/risc-v/src/c906/c906_clockconfig.c            |   2 +-
 arch/risc-v/src/c906/c906_irq.c                    |   4 +-
 arch/risc-v/src/c906/c906_irq_dispatch.c           |   2 -
 arch/risc-v/src/c906/c906_lowputc.c                |   2 -
 arch/risc-v/src/c906/c906_memorymap.h              |   1 -
 arch/risc-v/src/c906/c906_serial.c                 |   2 -
 arch/risc-v/src/c906/c906_start.c                  |   2 +-
 arch/risc-v/src/c906/c906_timerisr.c               |   3 +-
 arch/risc-v/src/common/riscv_allocateheap.c        |   1 -
 arch/risc-v/src/common/riscv_arch.h                |  75 ---------------
 arch/risc-v/src/common/riscv_assert.c              |   2 -
 arch/risc-v/src/common/riscv_backtrace.c           |   1 -
 arch/risc-v/src/common/riscv_cpuindex.c            |   2 +-
 arch/risc-v/src/common/riscv_cpupause.c            |   1 -
 arch/risc-v/src/common/riscv_cpustart.c            |   1 -
 arch/risc-v/src/common/riscv_createstack.c         |   1 -
 arch/risc-v/src/common/riscv_doirq.c               |   2 -
 arch/risc-v/src/common/riscv_exception.c           |   1 -
 arch/risc-v/src/common/riscv_fault.c               |   2 -
 arch/risc-v/src/common/riscv_initialize.c          |   1 -
 arch/risc-v/src/common/riscv_initialstate.c        |   2 -
 arch/risc-v/src/common/riscv_internal.h            |  12 +++
 arch/risc-v/src/common/riscv_modifyreg32.c         |   2 +-
 arch/risc-v/src/common/riscv_schedulesigaction.c   |   2 -
 arch/risc-v/src/common/riscv_sigdeliver.c          |   2 -
 arch/risc-v/src/esp32c3/esp32c3.h                  |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_adc.c              |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_aes.c              |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_bignum.c           | 101 ++++++++++++++++-----
 arch/risc-v/src/esp32c3/esp32c3_clockconfig.c      |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_dma.c              |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_efuse.c            |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_gpio.c             |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_i2c.c              |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_ledc.c             |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_lowputc.c          |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_pm.c               |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_rng.c              |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_rsa.c              |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_rtc.c              |   4 +-
 arch/risc-v/src/esp32c3/esp32c3_serial.c           |   1 -
 arch/risc-v/src/esp32c3/esp32c3_sha.c              |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_spi.c              |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_spi_slave.c        |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_tim.c              |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_usbserial.c        |   3 +-
 arch/risc-v/src/esp32c3/esp32c3_wdt.c              |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_wdt_lowerhalf.c    |   2 +-
 arch/risc-v/src/esp32c3/esp32c3_wireless.c         |   1 -
 arch/risc-v/src/fe310/fe310_clockconfig.c          |   2 +-
 arch/risc-v/src/fe310/fe310_gpio.c                 |   2 +-
 arch/risc-v/src/fe310/fe310_irq.c                  |   2 -
 arch/risc-v/src/fe310/fe310_irq_dispatch.c         |   2 -
 arch/risc-v/src/fe310/fe310_lowputc.c              |   2 -
 arch/risc-v/src/fe310/fe310_memorymap.h            |   1 -
 arch/risc-v/src/fe310/fe310_serial.c               |   2 -
 arch/risc-v/src/fe310/fe310_timerisr.c             |   3 +-
 arch/risc-v/src/k210/k210_clockconfig.c            |   2 +-
 arch/risc-v/src/k210/k210_fpioa.c                  |   2 -
 arch/risc-v/src/k210/k210_gpiohs.c                 |   3 +-
 arch/risc-v/src/k210/k210_irq.c                    |   2 -
 arch/risc-v/src/k210/k210_irq_dispatch.c           |   2 -
 arch/risc-v/src/k210/k210_lowputc.c                |   2 -
 arch/risc-v/src/k210/k210_memorymap.h              |   1 -
 arch/risc-v/src/k210/k210_serial.c                 |   2 -
 arch/risc-v/src/k210/k210_start.c                  |   2 +-
 arch/risc-v/src/k210/k210_timerisr.c               |   3 +-
 arch/risc-v/src/litex/litex_clockconfig.c          |   2 +-
 arch/risc-v/src/litex/litex_irq.c                  |   2 -
 arch/risc-v/src/litex/litex_irq_dispatch.c         |   2 -
 arch/risc-v/src/litex/litex_lowputc.c              |   2 -
 arch/risc-v/src/litex/litex_serial.c               |   2 -
 arch/risc-v/src/litex/litex_timerisr.c             |   3 +-
 arch/risc-v/src/mpfs/mpfs_cache.c                  |   2 +-
 arch/risc-v/src/mpfs/mpfs_clockconfig.c            |   2 +-
 arch/risc-v/src/mpfs/mpfs_corepwm.c                |   3 +-
 arch/risc-v/src/mpfs/mpfs_ddr.c                    |   5 +-
 arch/risc-v/src/mpfs/mpfs_dma.c                    |   2 +-
 arch/risc-v/src/mpfs/mpfs_emmcsd.c                 |   2 +-
 arch/risc-v/src/mpfs/mpfs_gpio.c                   |   3 +-
 arch/risc-v/src/mpfs/mpfs_i2c.c                    |   3 +-
 arch/risc-v/src/mpfs/mpfs_irq.c                    |   2 -
 arch/risc-v/src/mpfs/mpfs_irq_dispatch.c           |   2 -
 arch/risc-v/src/mpfs/mpfs_lowputc.c                |   2 -
 arch/risc-v/src/mpfs/mpfs_memorymap.h              |   1 -
 arch/risc-v/src/mpfs/mpfs_serial.c                 |   1 -
 arch/risc-v/src/mpfs/mpfs_spi.c                    |   2 +-
 arch/risc-v/src/mpfs/mpfs_start.c                  |   2 +-
 arch/risc-v/src/mpfs/mpfs_systemreset.c            |   2 +-
 arch/risc-v/src/mpfs/mpfs_timerisr.c               |   3 +-
 arch/risc-v/src/mpfs/mpfs_usb.c                    |   2 +-
 arch/risc-v/src/qemu-rv/qemu_rv_irq.c              |   2 -
 arch/risc-v/src/qemu-rv/qemu_rv_irq_dispatch.c     |   2 -
 arch/risc-v/src/qemu-rv/qemu_rv_start.c            |   1 -
 arch/risc-v/src/qemu-rv/qemu_rv_timerisr.c         |   3 +-
 arch/risc-v/src/rv32m1/rv32m1_clockconfig.c        |   2 +-
 arch/risc-v/src/rv32m1/rv32m1_gpio.c               |   2 +-
 arch/risc-v/src/rv32m1/rv32m1_irq.c                |   2 -
 arch/risc-v/src/rv32m1/rv32m1_irq_dispatch.c       |   2 -
 arch/risc-v/src/rv32m1/rv32m1_pcc.c                |   2 +-
 arch/risc-v/src/rv32m1/rv32m1_serial.c             |   2 -
 arch/risc-v/src/rv32m1/rv32m1_start.c              |   2 +-
 arch/risc-v/src/rv32m1/rv32m1_timerisr.c           |   3 +-
 arch/risc-v/src/rv32m1/rv32m1_timersvc.c           |   3 +-
 arch/sparc/src/bm3803/bm3803-irq.c                 |   2 -
 arch/sparc/src/bm3803/bm3803-lowconsole.c          |   1 -
 arch/sparc/src/bm3803/bm3803-serial.c              |   2 -
 arch/sparc/src/bm3803/bm3803-timerisr.c            |   2 -
 arch/sparc/src/bm3803/bm3803_exti_gpio.c           |   1 -
 arch/sparc/src/bm3803/bm3803_tim.c                 |   2 -
 arch/sparc/src/bm3803/bm3803_wdg.c                 |   2 +-
 arch/sparc/src/bm3823/bm3823-irq.c                 |   2 -
 arch/sparc/src/bm3823/bm3823-lowconsole.c          |   1 -
 arch/sparc/src/bm3823/bm3823-serial.c              |   2 -
 arch/sparc/src/bm3823/bm3823-timerisr.c            |   2 -
 arch/sparc/src/common/up_allocateheap.c            |   1 -
 arch/sparc/src/common/up_arch.h                    |  76 ----------------
 arch/sparc/src/common/up_assert.c                  |   1 -
 arch/sparc/src/common/up_createstack.c             |   1 -
 arch/sparc/src/common/up_initialize.c              |   1 -
 arch/sparc/src/common/up_internal.h                |  13 +++
 arch/sparc/src/common/up_modifyreg16.c             |   2 +-
 arch/sparc/src/common/up_modifyreg32.c             |   2 +-
 arch/sparc/src/common/up_modifyreg8.c              |   2 +-
 arch/sparc/src/sparc_v8/up_doirq.c                 |   2 -
 arch/sparc/src/sparc_v8/up_dumpstate.c             |   1 -
 arch/sparc/src/sparc_v8/up_initialstate.c          |   1 -
 arch/sparc/src/sparc_v8/up_schedulesigaction.c     |   1 -
 arch/sparc/src/sparc_v8/up_sigdeliver.c            |   1 -
 arch/sparc/src/sparc_v8/up_systemreset.c           |   2 +-
 arch/x86/src/common/up_allocateheap.c              |   1 -
 arch/x86/src/common/up_arch.h                      |  76 ----------------
 arch/x86/src/common/up_assert.c                    |   1 -
 arch/x86/src/common/up_initialize.c                |   1 -
 arch/x86/src/common/up_internal.h                  |  13 +++
 arch/x86/src/common/up_modifyreg16.c               |   2 +-
 arch/x86/src/common/up_modifyreg32.c               |   2 +-
 arch/x86/src/common/up_modifyreg8.c                |   2 +-
 arch/x86/src/i486/up_createstack.c                 |   1 -
 arch/x86/src/i486/up_initialstate.c                |   1 -
 arch/x86/src/i486/up_irq.c                         |   1 -
 arch/x86/src/i486/up_schedulesigaction.c           |   1 -
 arch/x86/src/i486/up_sigdeliver.c                  |   1 -
 arch/x86/src/qemu/qemu_timerisr.c                  |   2 -
 arch/x86_64/src/common/up_allocateheap.c           |   1 -
 arch/x86_64/src/common/up_arch.h                   |  76 ----------------
 arch/x86_64/src/common/up_assert.c                 |   1 -
 arch/x86_64/src/common/up_initialize.c             |   1 -
 arch/x86_64/src/common/up_internal.h               |  13 +++
 arch/x86_64/src/common/up_modifyreg16.c            |   2 +-
 arch/x86_64/src/common/up_modifyreg32.c            |   2 +-
 arch/x86_64/src/common/up_modifyreg8.c             |   2 +-
 arch/x86_64/src/intel64/intel64_timerisr.c         |   1 -
 arch/x86_64/src/intel64/up_createstack.c           |   1 -
 arch/x86_64/src/intel64/up_initialstate.c          |   1 -
 arch/x86_64/src/intel64/up_irq.c                   |   1 -
 arch/x86_64/src/intel64/up_map_region.c            |   1 -
 arch/x86_64/src/intel64/up_rtc.c                   |   2 +-
 arch/x86_64/src/intel64/up_schedulesigaction.c     |   1 -
 arch/x86_64/src/intel64/up_sigdeliver.c            |   1 -
 arch/z16/src/common/z16_arch.h                     |  37 --------
 arch/z16/src/common/z16_initialize.c               |   1 -
 arch/z16/src/common/z16_internal.h                 |   9 ++
 arch/z16/src/z16f/chip.h                           |  11 ---
 arch/z16/src/z16f/z16f_clkinit.c                   |   1 +
 arch/z16/src/z16f/z16f_espi.c                      |   2 +-
 arch/z80/src/common/z80_allocateheap.c             |   1 -
 arch/z80/src/common/z80_arch.h                     |  37 --------
 arch/z80/src/common/z80_assert.c                   |   1 -
 arch/z80/src/common/z80_createstack.c              |   1 -
 arch/z80/src/common/z80_doirq.c                    |   2 -
 arch/z80/src/common/z80_initialize.c               |   1 -
 arch/z80/src/common/z80_internal.h                 |  15 +++
 arch/z80/src/common/z80_stackdump.c                |   1 -
 arch/z80/src/ez80/ez80_initialstate.c              |   1 -
 arch/z80/src/ez80/ez80_rtc.c                       |   1 -
 arch/z80/src/ez80/ez80_rtc_lowerhalf.c             |   2 -
 arch/z80/src/ez80/ez80_spi.c                       |   3 -
 arch/z80/src/z180/z180_initialstate.c              |   1 -
 arch/z80/src/z180/z180_scc.c                       |   1 -
 arch/z80/src/z180/z180_timerisr.c                  |   1 -
 arch/z80/src/z8/chip.h                             |  16 ----
 arch/z80/src/z8/z8_initialstate.c                  |   1 -
 arch/z80/src/z80/z80_initialstate.c                |   1 -
 boards/arm/a1x/pcduino-a10/src/a1x_leds.c          |   2 -
 .../arm/am335x/beaglebone-black/src/am335x_leds.c  |   2 -
 boards/arm/cxd56xx/common/src/cxd56_audio.c        |   2 +-
 boards/arm/cxd56xx/common/src/cxd56_boot.c         |   1 -
 boards/arm/cxd56xx/common/src/cxd56_crashdump.c    |   2 -
 boards/arm/cxd56xx/common/src/cxd56_imageproc.c    |   2 +-
 boards/arm/cxd56xx/spresense/src/cxd56_ostest.c    |   1 -
 boards/arm/cxd56xx/spresense/src/cxd56_power.c     |   5 +-
 boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c    |   2 +-
 boards/arm/cxd56xx/spresense/src/cxd56_spi.c       |   2 +-
 boards/arm/dm320/ntosd-dm320/src/dm320_network.c   |   2 -
 .../arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c  |   2 -
 .../arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c  |   2 -
 boards/arm/eoss3/quickfeather/src/eoss3_autoleds.c |   1 -
 boards/arm/eoss3/quickfeather/src/eoss3_boot.c     |   2 +-
 boards/arm/imx6/sabre-6quad/src/imx_autoleds.c     |   2 +-
 boards/arm/imx6/sabre-6quad/src/imx_boardinit.c    |   3 +-
 boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c |   3 +-
 boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c     |   3 +-
 boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c |   3 +-
 .../arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c  |   2 +-
 boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c     |   3 +-
 boards/arm/imxrt/imxrt1060-evk/src/imxrt_adc.c     |   3 +-
 boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c    |   2 +-
 boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c |   3 +-
 .../arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c  |   2 +-
 boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c     |   3 +-
 boards/arm/imxrt/imxrt1064-evk/src/imxrt_adc.c     |   3 +-
 boards/arm/imxrt/imxrt1064-evk/src/imxrt_boot.c    |   2 +-
 boards/arm/imxrt/imxrt1064-evk/src/imxrt_buttons.c |   3 +-
 .../arm/imxrt/imxrt1064-evk/src/imxrt_mmcsd_spi.c  |   2 +-
 boards/arm/imxrt/imxrt1064-evk/src/imxrt_spi.c     |   3 +-
 boards/arm/imxrt/teensy-4.x/src/imxrt_adc.c        |   3 +-
 boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c       |   2 +-
 boards/arm/imxrt/teensy-4.x/src/imxrt_spi.c        |   3 +-
 boards/arm/kinetis/freedom-k28f/src/k28_i2c.c      |   2 +-
 boards/arm/kinetis/freedom-k28f/src/k28_pwm.c      |   2 +-
 boards/arm/kinetis/freedom-k28f/src/k28_spi.c      |   2 +-
 boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c   |   2 +-
 .../arm/kinetis/freedom-k28f/src/k28_usbhshost.c   |   2 +-
 boards/arm/kinetis/freedom-k64f/src/k64_boot.c     |   2 +-
 boards/arm/kinetis/freedom-k64f/src/k64_pwm.c      |   2 +-
 boards/arm/kinetis/freedom-k64f/src/k64_spi.c      |   2 +-
 boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c   |   2 +-
 boards/arm/kinetis/freedom-k66f/src/k66_boot.c     |   2 +-
 boards/arm/kinetis/freedom-k66f/src/k66_pwm.c      |   2 +-
 boards/arm/kinetis/freedom-k66f/src/k66_spi.c      |   2 +-
 boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c   |   2 +-
 boards/arm/kinetis/kwikstik-k40/src/k40_boot.c     |   2 +-
 boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c      |   2 +-
 boards/arm/kinetis/kwikstik-k40/src/k40_spi.c      |   2 +-
 boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c   |   2 +-
 boards/arm/kinetis/teensy-3.x/src/k20_boot.c       |   2 +-
 boards/arm/kinetis/teensy-3.x/src/k20_i2c.c        |   2 +-
 boards/arm/kinetis/teensy-3.x/src/k20_pwm.c        |   2 +-
 boards/arm/kinetis/teensy-3.x/src/k20_spi.c        |   2 +-
 boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c     |   2 +-
 boards/arm/kinetis/twr-k60n512/src/k60_boot.c      |   2 +-
 boards/arm/kinetis/twr-k60n512/src/k60_spi.c       |   2 +-
 boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c    |   2 +-
 boards/arm/kinetis/twr-k64f120m/src/k64_boot.c     |   2 +-
 .../arm/kl/freedom-kl25z/src/kl_boardinitialize.c  |   2 +-
 boards/arm/kl/freedom-kl25z/src/kl_pwm.c           |   2 +-
 boards/arm/kl/freedom-kl25z/src/kl_tsi.c           |   2 +-
 .../arm/kl/freedom-kl26z/src/kl_boardinitialize.c  |   2 +-
 boards/arm/kl/freedom-kl26z/src/kl_pwm.c           |   2 +-
 boards/arm/kl/freedom-kl26z/src/kl_tsi.c           |   2 +-
 boards/arm/kl/teensy-lc/src/kl_boardinitialize.c   |   3 +-
 boards/arm/kl/teensy-lc/src/kl_pwm.c               |   2 +-
 .../arm/lc823450/lc823450-xgevk/src/lc823450_adc.c |   2 +-
 .../lc823450-xgevk/src/lc823450_autoleds.c         |   2 -
 .../arm/lc823450/lc823450-xgevk/src/lc823450_bt.c  |   2 -
 .../arm/lc823450/lc823450-xgevk/src/lc823450_mux.c |   1 -
 .../lc823450/lc823450-xgevk/src/lc823450_st7565.c  |   2 +-
 .../lc823450/lc823450-xgevk/src/lc823450_wm8776.c  |   2 +-
 .../arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c |   2 -
 .../arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c |   2 -
 .../lpc4088-devkit/src/lpc17_40_autoleds.c         |   2 -
 .../lpc4088-devkit/src/lpc17_40_boardinitialize.c  |   2 -
 .../lpc4088-devkit/src/lpc17_40_nandinitialize.c   |   2 -
 .../lpc4088-devkit/src/lpc17_40_norinitialize.c    |   2 -
 .../lpc4088-devkit/src/lpc17_40_sdraminitialize.c  |   1 -
 .../lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c |   2 +-
 .../lpc4088-devkit/src/lpc17_40_userleds.c         |   2 -
 .../lpc4088-quickstart/src/lpc17_40_autoleds.c     |   2 -
 .../src/lpc17_40_boardinitialize.c                 |   2 -
 .../src/lpc17_40_nandinitialize.c                  |   2 -
 .../src/lpc17_40_sdraminitialize.c                 |   1 -
 .../lpc4088-quickstart/src/lpc17_40_ssp.c          |   2 +-
 .../lpc4088-quickstart/src/lpc17_40_userleds.c     |   2 -
 .../lpcxpresso-lpc1768/src/lpc17_40_adc.c          |   3 +-
 .../lpcxpresso-lpc1768/src/lpc17_40_boot.c         |   2 -
 .../lpcxpresso-lpc1768/src/lpc17_40_dac.c          |   2 -
 .../lpcxpresso-lpc1768/src/lpc17_40_leds.c         |   2 -
 .../lpcxpresso-lpc1768/src/lpc17_40_pwm.c          |   2 +-
 .../lpcxpresso-lpc1768/src/lpc17_40_ssp.c          |   2 +-
 .../lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c    |   2 -
 .../lx_cpu/src/lpc17_40_boardinitialize.c          |   2 -
 boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c  |   3 +-
 .../lx_cpu/src/lpc17_40_fpgainitialize.c           |   1 -
 .../lx_cpu/src/lpc17_40_sdraminitialize.c          |   1 -
 boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c  |   2 +-
 boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c |   1 -
 .../lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c    |   2 -
 boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c    |   3 +-
 boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c   |   2 -
 boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c    |   2 -
 boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c   |   2 -
 boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c    |   2 +-
 .../arm/lpc17xx_40xx/mbed/src/lpc17_40_userleds.c  |   2 -
 boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c |   3 +-
 .../arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c   |   2 -
 boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c |   2 -
 .../arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c   |   2 -
 boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c |   2 +-
 .../olimex-lpc1766stk/src/lpc17_40_boot.c          |   2 -
 .../olimex-lpc1766stk/src/lpc17_40_can.c           |   3 +-
 .../olimex-lpc1766stk/src/lpc17_40_leds.c          |   2 -
 .../olimex-lpc1766stk/src/lpc17_40_ssp.c           |   2 +-
 .../lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c  |   2 -
 .../open1788/src/lpc17_40_boardinitialize.c        |   2 -
 .../open1788/src/lpc17_40_nandinitialize.c         |   2 -
 .../open1788/src/lpc17_40_norinitialize.c          |   2 -
 .../open1788/src/lpc17_40_sdraminitialize.c        |   1 -
 .../arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c   |   2 +-
 .../lpc17xx_40xx/open1788/src/lpc17_40_userleds.c  |   2 -
 .../arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c |   2 -
 .../arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c |   2 -
 .../arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c  |   2 +-
 .../lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c    |   3 +-
 .../lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c   |   2 -
 .../lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c    |   2 -
 .../lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c   |   2 -
 .../lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c    |   2 +-
 .../lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c    |   2 +-
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c  |   3 +-
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c |   2 -
 .../zkit-arm-1769/src/lpc17_40_buttons.c           |   1 -
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c  |   3 +-
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c  |   2 -
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c  |   2 -
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c |   2 -
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c  |   2 +-
 .../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c  |   2 +-
 .../arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c  |   1 -
 .../arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c  |   2 -
 boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c     |   2 -
 .../lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c   |   2 +-
 .../arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c  |   1 -
 boards/arm/lpc31xx/ea3131/src/lpc31_boot.c         |   1 -
 boards/arm/lpc31xx/ea3131/src/lpc31_leds.c         |   1 -
 boards/arm/lpc31xx/ea3131/src/lpc31_mem.c          |   3 +-
 boards/arm/lpc31xx/ea3131/src/lpc31_spi.c          |   2 +-
 boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c      |   3 +-
 boards/arm/lpc31xx/ea3152/src/lpc31_boot.c         |   1 -
 boards/arm/lpc31xx/ea3152/src/lpc31_leds.c         |   1 -
 boards/arm/lpc31xx/ea3152/src/lpc31_mem.c          |   3 +-
 boards/arm/lpc31xx/ea3152/src/lpc31_spi.c          |   2 +-
 .../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c  |   1 -
 .../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c  |   1 -
 .../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c   |   3 +-
 .../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c   |   2 +-
 .../lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c   |   3 +-
 .../arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c  |   2 -
 boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c   |   2 -
 boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c |   1 -
 .../arm/lpc43xx/bambino-200e/src/lpc43_userleds.c  |   2 -
 .../lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c   |   2 -
 .../arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c   |   2 -
 .../arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c |   1 -
 .../lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c   |   2 -
 boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c      |   3 +-
 boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c     |   2 -
 .../arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c   |   2 -
 boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c    |   2 -
 boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c  |   1 -
 .../arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c   |   2 -
 boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c   |   3 +-
 .../arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c |   2 -
 boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c  |   2 -
 .../arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c   |   1 -
 .../lpc4370-link2/src/lpc43_spifilib_init.c        |   1 -
 .../arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c |   2 -
 .../arm/max326xx/max32660-evsys/src/max326_boot.c  |   2 +-
 .../arm/max326xx/max32660-evsys/src/max326_spi.c   |   2 +-
 .../arm/nrf52/nrf52-feather/src/nrf52_autoleds.c   |   2 -
 boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c    |   2 -
 .../arm/nrf52/nrf52-feather/src/nrf52_userleds.c   |   2 -
 boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c  |   2 -
 boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c      |   2 -
 boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c  |   2 -
 boards/arm/nrf52/nrf52832-mdk/src/nrf52_autoleds.c |   2 -
 boards/arm/nrf52/nrf52832-mdk/src/nrf52_boot.c     |   2 -
 .../nrf52/nrf52832-sparkfun/src/nrf52_autoleds.c   |   2 -
 .../arm/nrf52/nrf52832-sparkfun/src/nrf52_boot.c   |   2 -
 boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c  |   2 -
 boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c      |   2 -
 boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c       |   2 +-
 boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c  |   2 -
 .../arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c |   2 -
 boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c  |   2 -
 .../arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c |   2 -
 .../nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c |   2 +-
 boards/arm/phy62xx/phy6222/src/boot.c              |   2 +-
 boards/arm/rp2040/common/src/rp2040_enc28j60.c     |   2 -
 boards/arm/rp2040/common/src/rp2040_i2sdev.c       |   2 +-
 .../arm/rp2040/pimoroni-tiny2040/src/rp2040_gpio.c |   2 +-
 .../arm/rp2040/pimoroni-tiny2040/src/rp2040_spi.c  |   2 +-
 .../raspberrypi-pico/src/rp2040_boardinitialize.c  |   2 -
 .../arm/rp2040/raspberrypi-pico/src/rp2040_gpio.c  |   2 +-
 .../arm/rp2040/raspberrypi-pico/src/rp2040_spi.c   |   2 +-
 boards/arm/sam34/arduino-due/src/sam_mmcsd.c       |   2 +-
 boards/arm/sam34/arduino-due/src/sam_touchscreen.c |   2 +-
 boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c   |   2 +-
 boards/arm/sam34/sam3u-ek/src/sam_boot.c           |   2 +-
 boards/arm/sam34/sam3u-ek/src/sam_lcd.c            |   2 +-
 boards/arm/sam34/sam3u-ek/src/sam_leds.c           |   1 -
 boards/arm/sam34/sam3u-ek/src/sam_spi.c            |   2 +-
 boards/arm/sam34/sam3u-ek/src/sam_usbdev.c         |   2 +-
 boards/arm/sam34/sam4e-ek/src/sam_boot.c           |   2 +-
 boards/arm/sam34/sam4e-ek/src/sam_ili9325.c        |   4 +-
 boards/arm/sam34/sam4e-ek/src/sam_ili9341.c        |   2 +-
 boards/arm/sam34/sam4e-ek/src/sam_leds.c           |   1 -
 boards/arm/sam34/sam4e-ek/src/sam_spi.c            |   2 +-
 boards/arm/sam34/sam4e-ek/src/sam_udp.c            |   2 +-
 boards/arm/sam34/sam4l-xplained/src/sam_slcd.c     |   2 +-
 .../sam34/sam4s-xplained-pro/src/sam_nandflash.c   |   2 +-
 boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c  |   2 +-
 boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c  |   2 +-
 boards/arm/sam34/sam4s-xplained/src/sam_sram.c     |   2 +-
 boards/arm/sama5/giant-board/src/sam_ostest.c      |   1 -
 boards/arm/sama5/giant-board/src/sam_sdmmc.c       |   2 -
 boards/arm/sama5/giant-board/src/sam_sdram.c       |   3 +-
 boards/arm/sama5/giant-board/src/sam_spi.c         |   2 +-
 boards/arm/sama5/giant-board/src/sam_usb.c         |   2 +-
 boards/arm/sama5/sama5d2-xult/src/sam_can.c        |   3 +-
 boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c  |   2 +-
 boards/arm/sama5/sama5d2-xult/src/sam_ostest.c     |   1 -
 boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c      |   2 -
 boards/arm/sama5/sama5d2-xult/src/sam_sdram.c      |   3 +-
 boards/arm/sama5/sama5d2-xult/src/sam_spi.c        |   2 +-
 boards/arm/sama5/sama5d2-xult/src/sam_usb.c        |   2 +-
 boards/arm/sama5/sama5d3-xplained/src/sam_can.c    |   3 +-
 .../arm/sama5/sama5d3-xplained/src/sam_nandflash.c |   2 +-
 boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c |   1 -
 boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c  |   3 +-
 boards/arm/sama5/sama5d3-xplained/src/sam_spi.c    |   2 +-
 boards/arm/sama5/sama5d3-xplained/src/sam_usb.c    |   2 +-
 boards/arm/sama5/sama5d3x-ek/src/nor_main.c        |   2 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_can.c         |   3 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c   |   2 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c    |   2 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c      |   1 -
 boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c      |   3 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c       |   3 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_spi.c         |   2 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_usb.c         |   2 +-
 boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c      |   2 +-
 boards/arm/sama5/sama5d4-ek/src/dram_main.c        |   2 +-
 boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c     |   2 +-
 boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c    |   2 +-
 boards/arm/sama5/sama5d4-ek/src/sam_ostest.c       |   1 -
 boards/arm/sama5/sama5d4-ek/src/sam_sdram.c        |   2 +-
 boards/arm/sama5/sama5d4-ek/src/sam_spi.c          |   2 +-
 boards/arm/sama5/sama5d4-ek/src/sam_usb.c          |   2 +-
 boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c       |   2 +-
 boards/arm/samd5e5/metro-m4/src/sam_autoleds.c     |   1 -
 boards/arm/samd5e5/metro-m4/src/sam_bq27426.c      |   2 +-
 boards/arm/samd5e5/metro-m4/src/sam_i2c.c          |   2 +-
 boards/arm/samd5e5/metro-m4/src/sam_smartfs.c      |   2 +-
 boards/arm/samd5e5/metro-m4/src/sam_usbdev.c       |   2 +-
 boards/arm/samd5e5/metro-m4/src/sam_usbhost.c      |   2 +-
 boards/arm/samd5e5/metro-m4/src/sam_userleds.c     |   2 +-
 .../samd5e5/same54-xplained-pro/src/sam_autoleds.c |   1 -
 .../samd5e5/same54-xplained-pro/src/sam_userleds.c |   2 +-
 boards/arm/samv7/common/src/sam_boot_image.c       |   2 +-
 boards/arm/samv7/same70-qmtech/src/sam_afec.c      |   3 +-
 boards/arm/samv7/same70-qmtech/src/sam_boot.c      |   2 +-
 boards/arm/samv7/same70-qmtech/src/sam_buttons.c   |   2 +-
 boards/arm/samv7/same70-qmtech/src/sam_dac.c       |   2 +-
 boards/arm/samv7/same70-qmtech/src/sam_spi.c       |   2 +-
 boards/arm/samv7/same70-xplained/src/sam_afec.c    |   3 +-
 boards/arm/samv7/same70-xplained/src/sam_boot.c    |   2 +-
 boards/arm/samv7/same70-xplained/src/sam_buttons.c |   2 +-
 boards/arm/samv7/same70-xplained/src/sam_dac.c     |   2 +-
 boards/arm/samv7/same70-xplained/src/sam_sdram.c   |   3 +-
 boards/arm/samv7/same70-xplained/src/sam_spi.c     |   2 +-
 boards/arm/samv7/same70-xplained/src/sam_usbdev.c  |   2 +-
 boards/arm/samv7/samv71-xult/src/sam_boot.c        |   2 +-
 boards/arm/samv7/samv71-xult/src/sam_buttons.c     |   2 +-
 boards/arm/samv7/samv71-xult/src/sam_ili9488.c     |   2 +-
 boards/arm/samv7/samv71-xult/src/sam_maxtouch.c    |   2 +-
 boards/arm/samv7/samv71-xult/src/sam_sdram.c       |   3 +-
 boards/arm/samv7/samv71-xult/src/sam_spi.c         |   2 +-
 boards/arm/samv7/samv71-xult/src/sam_usbdev.c      |   2 +-
 boards/arm/samv7/samv71-xult/src/sam_wm8904.c      |   2 +-
 boards/arm/stm32/axoloti/src/stm32_boot.c          |   2 +-
 boards/arm/stm32/axoloti/src/stm32_extmem.c        |   3 +-
 boards/arm/stm32/axoloti/src/stm32_usbhost.c       |   2 +-
 boards/arm/stm32/axoloti/src/stm32_userleds.c      |   2 -
 boards/arm/stm32/b-g431b-esc1/src/stm32_can.c      |   3 +-
 boards/arm/stm32/b-g431b-esc1/src/stm32_foc.c      |   3 +-
 boards/arm/stm32/clicker2-stm32/src/stm32_spi.c    |   2 +-
 boards/arm/stm32/cloudctrl/src/stm32_adc.c         |   3 +-
 boards/arm/stm32/cloudctrl/src/stm32_autoleds.c    |   1 -
 boards/arm/stm32/cloudctrl/src/stm32_boot.c        |   2 +-
 boards/arm/stm32/cloudctrl/src/stm32_chipid.c      |   6 +-
 boards/arm/stm32/cloudctrl/src/stm32_spi.c         |   2 +-
 boards/arm/stm32/cloudctrl/src/stm32_usb.c         |   2 +-
 boards/arm/stm32/cloudctrl/src/stm32_userleds.c    |   1 -
 boards/arm/stm32/common/src/stm32_nrf24l01.c       |   2 +-
 boards/arm/stm32/common/src/stm32_qencoder.c       |   2 +-
 boards/arm/stm32/common/src/stm32_tone.c           |   2 +-
 boards/arm/stm32/emw3162/src/stm32_boot.c          |   2 +-
 boards/arm/stm32/et-stm32-stamp/src/stm32_boot.c   |   2 +-
 boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c |   1 -
 boards/arm/stm32/fire-stm32v2/src/stm32_boot.c     |   2 +-
 boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c |   1 -
 .../arm/stm32/fire-stm32v2/src/stm32_selectlcd.c   |   3 +-
 boards/arm/stm32/fire-stm32v2/src/stm32_spi.c      |   2 +-
 boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c   |   2 +-
 boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c |   1 -
 boards/arm/stm32/hymini-stm32v/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/hymini-stm32v/src/stm32_leds.c    |   1 -
 boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c |   2 +-
 boards/arm/stm32/hymini-stm32v/src/stm32_spi.c     |   2 +-
 boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c |   2 +-
 boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c  |   2 +-
 boards/arm/stm32/maple/src/stm32_boot.c            |   2 +-
 boards/arm/stm32/maple/src/stm32_lcd.c             |   1 -
 boards/arm/stm32/maple/src/stm32_leds.c            |   1 -
 boards/arm/stm32/maple/src/stm32_spi.c             |   2 +-
 boards/arm/stm32/maple/src/stm32_usbdev.c          |   2 +-
 boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c   |   2 +-
 .../stm32/mikroe-stm32f4/src/stm32_clockconfig.c   |   2 +-
 boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c |   3 +-
 .../arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c |   2 +-
 .../stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c    |   2 +-
 boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c    |   2 +-
 boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c    |   2 +-
 .../stm32/mikroe-stm32f4/src/stm32_touchscreen.c   |   2 -
 boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c    |   2 +-
 boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c |   2 +-
 boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c     |   2 +-
 boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c     |   2 +-
 boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c     |   2 +-
 boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c     |   2 +-
 boards/arm/stm32/nucleo-f303re/src/stm32_spi.c     |   2 +-
 boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c     |   3 +-
 .../arm/stm32/nucleo-f410rb/src/stm32_autoleds.c   |   1 -
 boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c    |   2 +-
 .../arm/stm32/nucleo-f410rb/src/stm32_userleds.c   |   1 -
 .../arm/stm32/nucleo-f412zg/src/stm32_autoleds.c   |   1 -
 boards/arm/stm32/nucleo-f412zg/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/nucleo-f412zg/src/stm32_usb.c     |   2 +-
 boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c     |   2 +-
 boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c     |   2 +-
 boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c     |   2 +-
 boards/arm/stm32/nucleo-f446re/src/stm32_adc.c     |   3 +-
 .../arm/stm32/nucleo-f446re/src/stm32_autoleds.c   |   1 -
 boards/arm/stm32/nucleo-f446re/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/nucleo-f446re/src/stm32_can.c     |   3 +-
 boards/arm/stm32/nucleo-f446re/src/stm32_pwm.c     |   2 +-
 boards/arm/stm32/nucleo-f446re/src/stm32_spi.c     |   2 +-
 .../arm/stm32/nucleo-f446re/src/stm32_userleds.c   |   1 -
 boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c     |   3 +-
 .../arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c   |   1 -
 boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c     |   2 +-
 .../arm/stm32/nucleo-f4x1re/src/stm32_userleds.c   |   1 -
 boards/arm/stm32/nucleo-g431kb/src/stm32_pwm.c     |   2 +-
 boards/arm/stm32/nucleo-g431rb/src/stm32_can.c     |   3 +-
 boards/arm/stm32/nucleo-g431rb/src/stm32_pwm.c     |   2 +-
 boards/arm/stm32/nucleo-l152re/src/stm32_spi.c     |   2 +-
 boards/arm/stm32/nucleo-l152re/src/stm32_spisd.c   |   2 +-
 .../stm32/olimex-stm32-e407/src/stm32_autoleds.c   |   1 -
 .../arm/stm32/olimex-stm32-e407/src/stm32_boot.c   |   2 +-
 boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c |   2 +-
 boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c |   2 +-
 .../stm32/olimex-stm32-e407/src/stm32_userleds.c   |   1 -
 .../stm32/olimex-stm32-h407/src/stm32_autoleds.c   |   1 -
 .../arm/stm32/olimex-stm32-h407/src/stm32_boot.c   |   2 +-
 boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c |   2 +-
 .../stm32/olimex-stm32-h407/src/stm32_userleds.c   |   1 -
 .../arm/stm32/olimex-stm32-p107/src/stm32_boot.c   |   2 +-
 boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c |   3 +-
 .../stm32/olimex-stm32-p107/src/stm32_encx24j600.c |   1 -
 boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c |   2 +-
 boards/arm/stm32/olimex-stm32-p407/src/stm32_spi.c |   2 +-
 .../arm/stm32/olimex-stm32-p407/src/stm32_sram.c   |   3 +-
 .../arm/stm32/olimex-stm32-p407/src/stm32_st7735.c |   2 -
 boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c |   2 +-
 boards/arm/stm32/olimexino-stm32/src/stm32_can.c   |   2 +-
 boards/arm/stm32/omnibusf4/src/stm32_boot.c        |   2 +-
 boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c       |   2 +-
 boards/arm/stm32/omnibusf4/src/stm32_ostest.c      |   1 -
 boards/arm/stm32/omnibusf4/src/stm32_perfcount.c   |   2 +-
 boards/arm/stm32/omnibusf4/src/stm32_pwm.c         |   2 +-
 boards/arm/stm32/omnibusf4/src/stm32_spi.c         |   2 +-
 boards/arm/stm32/omnibusf4/src/stm32_usb.c         |   2 +-
 boards/arm/stm32/omnibusf4/src/stm32_userleds.c    |   2 -
 boards/arm/stm32/photon/src/stm32_boot.c           |   2 +-
 boards/arm/stm32/photon/src/stm32_rgbled.c         |   2 +-
 boards/arm/stm32/photon/src/stm32_spi.c            |   2 +-
 boards/arm/stm32/shenzhou/src/stm32_adc.c          |   3 +-
 boards/arm/stm32/shenzhou/src/stm32_autoleds.c     |   1 -
 boards/arm/stm32/shenzhou/src/stm32_boot.c         |   2 +-
 boards/arm/stm32/shenzhou/src/stm32_can.c          |   3 +-
 boards/arm/stm32/shenzhou/src/stm32_chipid.c       |   2 +-
 boards/arm/stm32/shenzhou/src/stm32_ili93xx.c      |   2 +-
 boards/arm/stm32/shenzhou/src/stm32_spi.c          |   2 +-
 boards/arm/stm32/shenzhou/src/stm32_ssd1289.c      |   2 +-
 boards/arm/stm32/shenzhou/src/stm32_usb.c          |   2 +-
 boards/arm/stm32/shenzhou/src/stm32_userleds.c     |   1 -
 boards/arm/stm32/stm3210e-eval/src/stm32_adc.c     |   3 +-
 boards/arm/stm32/stm3210e-eval/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/stm3210e-eval/src/stm32_can.c     |   3 +-
 .../stm32/stm3210e-eval/src/stm32_deselectlcd.c    |   2 +-
 .../stm32/stm3210e-eval/src/stm32_deselectnor.c    |   2 +-
 .../stm32/stm3210e-eval/src/stm32_deselectsram.c   |   2 +-
 .../arm/stm32/stm3210e-eval/src/stm32_extcontext.c |   2 +-
 boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c  |   3 +-
 boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c     |   2 +-
 boards/arm/stm32/stm3210e-eval/src/stm32_leds.c    |   1 -
 .../arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c  |   2 +-
 .../arm/stm32/stm3210e-eval/src/stm32_selectlcd.c  |   3 +-
 .../arm/stm32/stm3210e-eval/src/stm32_selectnor.c  |   3 +-
 .../arm/stm32/stm3210e-eval/src/stm32_selectsram.c |   3 +-
 boards/arm/stm32/stm3210e-eval/src/stm32_spi.c     |   2 +-
 boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c  |   2 +-
 boards/arm/stm32/stm3220g-eval/src/stm32_adc.c     |   3 +-
 .../arm/stm32/stm3220g-eval/src/stm32_autoleds.c   |   1 -
 boards/arm/stm32/stm3220g-eval/src/stm32_boot.c    |   2 +-
 boards/arm/stm32/stm3220g-eval/src/stm32_can.c     |   3 +-
 .../stm32/stm3220g-eval/src/stm32_deselectlcd.c    |   2 +-
 .../stm32/stm3220g-eval/src/stm32_deselectsram.c   |   2 +-
 boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c  |   3 +-
 boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c     |   2 +-
 boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c     |   2 +-
 .../arm/stm32/stm3220g-eval/src/stm32_selectlcd.c  |   3 +-
 .../arm/stm32/stm3220g-eval/src/stm32_selectsram.c |   3 +-
 boards/arm/stm32/stm3220g-eval/src/stm32_spi.c     |   2 +-
 boards/arm/stm32/stm3220g-eval/src/stm32_usb.c     |   2 +-
 .../arm/stm32/stm3220g-eval/src/stm32_userleds.c   |   1 -
 boards/arm/stm32/stm3240g-eval/src/stm32_adc.c     |   3 +-
 .../arm/stm32/stm3240g-eval/src/stm32_autoleds.c   |   1 -
 boards/arm/stm32/stm3240g-eval/src/stm32_can.c     |   3 +-
 .../stm32/stm3240g-eval/src/stm32_deselectlcd.c    |   2 +-
 .../stm32/stm3240g-eval/src/stm32_deselectsram.c   |   2 +-
 boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c  |   3 +-
 boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c     |   2 +-
 boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c  |   1 -
 boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c     |   2 +-
 .../arm/stm32/stm3240g-eval/src/stm32_selectlcd.c  |   3 +-
 .../arm/stm32/stm3240g-eval/src/stm32_selectsram.c |   3 +-
 boards/arm/stm32/stm3240g-eval/src/stm32_spi.c     |   2 +-
 boards/arm/stm32/stm3240g-eval/src/stm32_usb.c     |   2 +-
 .../arm/stm32/stm3240g-eval/src/stm32_userleds.c   |   1 -
 boards/arm/stm32/stm32_tiny/src/stm32_boot.c       |   2 +-
 boards/arm/stm32/stm32_tiny/src/stm32_leds.c       |   1 -
 boards/arm/stm32/stm32_tiny/src/stm32_pwm.c        |   2 +-
 boards/arm/stm32/stm32_tiny/src/stm32_spi.c        |   2 +-
 boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c     |   2 +-
 .../stm32/stm32f103-minimum/src/stm32_autoleds.c   |   1 -
 .../arm/stm32/stm32f103-minimum/src/stm32_boot.c   |   2 +-
 .../stm32/stm32f103-minimum/src/stm32_ds18b20.c    |   2 +-
 .../arm/stm32/stm32f103-minimum/src/stm32_hyt271.c |   2 +-
 .../stm32/stm32f103-minimum/src/stm32_lcd_st7567.c |   2 -
 boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c |   2 +-
 .../arm/stm32/stm32f103-minimum/src/stm32_rgbled.c |   2 +-
 boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c |   2 +-
 .../arm/stm32/stm32f103-minimum/src/stm32_usbdev.c |   2 +-
 boards/arm/stm32/stm32f3discovery/src/stm32_boot.c |   2 +-
 boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c  |   2 +-
 boards/arm/stm32/stm32f3discovery/src/stm32_spi.c  |   2 +-
 boards/arm/stm32/stm32f3discovery/src/stm32_usb.c  |   2 +-
 .../stm32/stm32f411-minimum/src/stm32_autoleds.c   |   1 -
 .../arm/stm32/stm32f411-minimum/src/stm32_boot.c   |   2 +-
 boards/arm/stm32/stm32f411-minimum/src/stm32_usb.c |   2 +-
 boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c |   2 +-
 boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c  |   2 +-
 .../stm32/stm32f429i-disco/src/stm32_autoleds.c    |   1 -
 boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c |   2 +-
 .../arm/stm32/stm32f429i-disco/src/stm32_extmem.c  |   3 +-
 boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c  |   2 +-
 .../arm/stm32/stm32f429i-disco/src/stm32_ostest.c  |   1 -
 boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c  |   2 +-
 boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c  |   2 +-
 boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c  |   2 +-
 .../stm32/stm32f429i-disco/src/stm32_userleds.c    |   1 -
 .../stm32/stm32f4discovery/src/stm32_autoleds.c    |   1 -
 boards/arm/stm32/stm32f4discovery/src/stm32_boot.c |   2 +-
 boards/arm/stm32/stm32f4discovery/src/stm32_can.c  |   3 +-
 .../stm32/stm32f4discovery/src/stm32_enc28j60.c    |   1 -
 .../arm/stm32/stm32f4discovery/src/stm32_extmem.c  |   3 +-
 .../arm/stm32/stm32f4discovery/src/stm32_gs2200m.c |   2 +-
 .../arm/stm32/stm32f4discovery/src/stm32_mmcsd.c   |   2 +-
 .../arm/stm32/stm32f4discovery/src/stm32_ostest.c  |   1 -
 .../stm32/stm32f4discovery/src/stm32_perfcount.c   |   2 +-
 .../stm32/stm32f4discovery/src/stm32_pmbuttons.c   |   2 +-
 boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c  |   2 +-
 .../arm/stm32/stm32f4discovery/src/stm32_rgbled.c  |   2 +-
 boards/arm/stm32/stm32f4discovery/src/stm32_spi.c  |   2 +-
 .../arm/stm32/stm32f4discovery/src/stm32_ssd1289.c |   2 +-
 .../arm/stm32/stm32f4discovery/src/stm32_st7567.c  |   2 -
 boards/arm/stm32/stm32f4discovery/src/stm32_usb.c  |   2 +-
 .../stm32/stm32f4discovery/src/stm32_userleds.c    |   2 -
 boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c  |   2 +-
 boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c   |   2 +-
 boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c   |   2 +-
 boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c   |   2 +-
 boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c |   2 +-
 boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c |   1 -
 .../stm32/viewtool-stm32f107/src/stm32_ads7843e.c  |   2 +-
 .../arm/stm32/viewtool-stm32f107/src/stm32_boot.c  |   2 +-
 .../arm/stm32/viewtool-stm32f107/src/stm32_can.c   |   3 +-
 .../arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c |   2 +-
 .../stm32/viewtool-stm32f107/src/stm32_max3421e.c  |   2 +-
 .../arm/stm32/viewtool-stm32f107/src/stm32_spi.c   |   2 +-
 .../stm32/viewtool-stm32f107/src/stm32_ssd1289.c   |   2 +-
 .../arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c |   2 +-
 .../stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c |   1 -
 .../arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c |   2 +-
 .../stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c |   1 -
 .../stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c |   1 -
 .../arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c |   2 +-
 .../arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c  |   2 +-
 .../stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c |   1 -
 .../stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c |   2 +-
 .../arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c  |   2 +-
 .../stm32f051-discovery/src/stm32_boot.c           |   2 +-
 .../stm32f072-discovery/src/stm32_boot.c           |   2 +-
 boards/arm/stm32f7/nucleo-144/src/stm32_boot.c     |   2 +-
 boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c      |   2 +-
 boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c |   2 +-
 boards/arm/stm32f7/nucleo-144/src/stm32_spi.c      |   2 +-
 boards/arm/stm32f7/nucleo-144/src/stm32_usb.c      |   2 +-
 boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c   |   2 +-
 boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c    |   2 +-
 boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c    |   2 +-
 .../arm/stm32f7/stm32f746g-disco/src/stm32_boot.c  |   2 +-
 .../stm32f7/stm32f746g-disco/src/stm32_extmem.c    |   3 +-
 .../arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c   |   2 +-
 .../stm32f7/stm32f746g-disco/src/stm32_ostest.c    |   1 -
 .../arm/stm32f7/stm32f746g-disco/src/stm32_spi.c   |   2 +-
 .../arm/stm32f7/stm32f769i-disco/src/stm32_boot.c  |   2 +-
 .../stm32f7/stm32f769i-disco/src/stm32_extmem.c    |   3 +-
 .../stm32f7/stm32f769i-disco/src/stm32_ostest.c    |   1 -
 .../arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c   |   2 +-
 .../arm/stm32f7/stm32f769i-disco/src/stm32_spi.c   |   2 +-
 boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c  |   2 +-
 .../arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c |   2 +-
 boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c   |   2 +-
 boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c   |   2 +-
 boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c   |   2 +-
 boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c |   2 +-
 .../arm/stm32h7/nucleo-h743zi2/src/stm32_ostest.c  |   1 -
 boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c  |   2 +-
 .../arm/stm32h7/stm32h747i-disco/src/stm32_boot.c  |   2 +-
 .../arm/stm32h7/stm32h747i-disco/src/stm32_spi.c   |   2 +-
 .../arm/stm32h7/stm32h747i-disco/src/stm32_usb.c   |   2 +-
 boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c |   2 +-
 boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c   |   3 +-
 .../arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c |   1 -
 boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c  |   2 +-
 boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c   |   2 +-
 .../arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c |   2 +-
 boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c   |   1 -
 .../arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c |   1 -
 .../arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c |   1 -
 boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c  |   2 +-
 boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c   |   1 -
 .../arm/stm32l4/nucleo-l452re/src/stm32_userleds.c |   1 -
 boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c   |   3 +-
 .../arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c |   1 -
 boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c  |   2 +-
 boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c   |   2 +-
 .../arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c |   2 +-
 boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c   |   1 -
 .../arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c |   1 -
 boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c  |   2 +-
 boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c   |   2 +-
 boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c   |   2 +-
 boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c  |   2 +-
 .../stm32l4/stm32l476-mdk/src/stm32_clockconfig.c  |   2 +-
 boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c   |   1 -
 .../stm32l4/stm32l476vg-disco/src/stm32_autoleds.c |   1 -
 .../arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c |   2 +-
 .../stm32l476vg-disco/src/stm32_clockconfig.c      |   2 +-
 .../arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c  |   1 -
 .../arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c  |   2 +-
 .../stm32l4/stm32l476vg-disco/src/stm32_userleds.c |   1 -
 .../stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c |   1 -
 .../arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c |   2 +-
 .../stm32l4r9ai-disco/src/stm32_clockconfig.c      |   2 +-
 .../arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c  |   1 -
 .../arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c  |   2 +-
 .../stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c |   1 -
 .../arm/stm32l5/nucleo-l552ze/src/stm32_autoleds.c |   1 -
 boards/arm/stm32l5/nucleo-l552ze/src/stm32_boot.c  |   2 +-
 .../arm/stm32l5/stm32l562e-dk/src/stm32_autoleds.c |   1 -
 boards/arm/stm32l5/stm32l562e-dk/src/stm32_boot.c  |   2 +-
 boards/arm/stm32u5/b-u585i-iot02a/src/stm32_boot.c |   2 +-
 boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c  |   2 +-
 .../arm/str71x/olimex-strp711/src/str71_buttons.c  |   1 -
 .../arm/str71x/olimex-strp711/src/str71_enc28j60.c |   1 -
 boards/arm/str71x/olimex-strp711/src/str71_leds.c  |   1 -
 boards/arm/str71x/olimex-strp711/src/str71_spi.c   |   2 -
 boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c        |   1 -
 boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c    |   2 +-
 boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c         |   2 +-
 boards/arm/tiva/eagle100/src/lm_boot.c             |   2 +-
 boards/arm/tiva/eagle100/src/lm_ethernet.c         |   2 +-
 boards/arm/tiva/eagle100/src/lm_leds.c             |   1 -
 boards/arm/tiva/eagle100/src/lm_ssi.c              |   2 +-
 boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c         |   1 -
 boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c     |   2 +-
 boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c         |   1 -
 boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c          |   2 +-
 boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c  |   2 +-
 boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c   |   2 +-
 .../arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c   |   2 +-
 boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c |   2 +-
 boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c         |   1 -
 boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c     |   2 +-
 boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c         |   1 -
 boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c          |   2 +-
 boards/arm/tiva/lm3s6965-ek/src/lm_boot.c          |   1 -
 boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c      |   2 +-
 boards/arm/tiva/lm3s6965-ek/src/lm_leds.c          |   1 -
 boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c           |   2 +-
 boards/arm/tiva/lm3s8962-ek/src/lm_boot.c          |   1 -
 boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c      |   2 +-
 boards/arm/tiva/lm3s8962-ek/src/lm_leds.c          |   1 -
 boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c           |   2 +-
 .../arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c |   1 -
 boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c  |   1 -
 boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c   |   2 +-
 .../tiva/tm4c123g-launchpad/src/tm4c_autoleds.c    |   1 -
 boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c |   1 -
 boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c  |   2 +-
 boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c |   1 -
 .../tiva/tm4c1294-launchpad/src/tm4c_ethernet.c    |   2 +-
 .../tms570/launchxl-tms57004/src/tms570_buttons.c  |   2 +-
 .../tms570ls31x-usb-kit/src/tms570_buttons.c       |   2 +-
 .../tms570/tms570ls31x-usb-kit/src/tms570_spi.c    |   2 +-
 boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c    |   1 -
 boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c    |   1 -
 boards/avr/at32uc3/avr32dev1/src/avr32_boot.c      |   2 -
 .../avr/at90usb/micropendous3/src/at90usb_boot.c   |   2 -
 boards/avr/at90usb/teensy-2.0/src/at90usb_boot.c   |   2 -
 boards/avr/at90usb/teensy-2.0/src/at90usb_leds.c   |   2 -
 boards/avr/at90usb/teensy-2.0/src/at90usb_spi.c    |   2 +-
 boards/avr/atmega/amber/src/atmega_boot.c          |   2 -
 boards/avr/atmega/arduino-mega2560/src/avr_boot.c  |   2 -
 boards/avr/atmega/arduino-mega2560/src/avr_leds.c  |   2 -
 boards/avr/atmega/moteino-mega/src/avr_boot.c      |   2 -
 boards/avr/atmega/moteino-mega/src/avr_leds.c      |   2 -
 boards/mips/pic32mx/mirtoo/src/pic32_boot.c        |   2 -
 boards/mips/pic32mx/mirtoo/src/pic32_spi2.c        |   2 +-
 .../pic32mx/pic32mx-starterkit/src/pic32mx_boot.c  |   2 -
 .../pic32mx/pic32mx-starterkit/src/pic32mx_leds.c  |   2 -
 .../pic32mx/pic32mx-starterkit/src/pic32mx_spi.c   |   2 +-
 boards/mips/pic32mx/pic32mx7mmb/src/pic32_boot.c   |   2 -
 .../mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c |   2 +-
 boards/mips/pic32mx/pic32mx7mmb/src/pic32_spi.c    |   2 +-
 .../pic32mx/pic32mx7mmb/src/pic32_touchscreen.c    |   2 -
 .../pic32mx/sure-pic32mx/src/pic32mx_autoleds.c    |   2 -
 .../mips/pic32mx/sure-pic32mx/src/pic32mx_boot.c   |   2 -
 .../pic32mx/sure-pic32mx/src/pic32mx_buttons.c     |   3 +-
 .../pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c     |   2 +-
 boards/mips/pic32mx/sure-pic32mx/src/pic32mx_spi.c |   2 +-
 boards/mips/pic32mx/ubw32/src/pic32_boot.c         |   2 -
 boards/mips/pic32mx/ubw32/src/pic32_buttons.c      |   3 +-
 boards/mips/pic32mx/ubw32/src/pic32_leds.c         |   2 -
 .../pic32mz/chipkit-wifire/src/pic32mz_autoleds.c  |   2 -
 .../mips/pic32mz/chipkit-wifire/src/pic32mz_spi.c  |   2 +-
 .../pic32mz/chipkit-wifire/src/pic32mz_userleds.c  |   2 -
 .../flipnclick-pic32mz/src/pic32mz_autoleds.c      |   2 -
 .../pic32mz/flipnclick-pic32mz/src/pic32mz_spi.c   |   2 +-
 .../flipnclick-pic32mz/src/pic32mz_userleds.c      |   2 -
 .../pic32mz-starterkit/src/pic32mz_autoleds.c      |   2 -
 .../pic32mz/pic32mz-starterkit/src/pic32mz_spi.c   |   3 +-
 .../pic32mz-starterkit/src/pic32mz_userleds.c      |   2 -
 boards/or1k/mor1kx/or1k/src/or1k_autoled.c         |   1 -
 boards/renesas/m16c/skp16c26/src/m16c_buttons.c    |   1 -
 boards/renesas/m16c/skp16c26/src/m16c_lcd.c        |   1 -
 boards/renesas/m16c/skp16c26/src/m16c_leds.c       |   1 -
 boards/renesas/sh1/us7032evb1/src/sh1_leds.c       |   1 -
 boards/risc-v/bl602/bl602evb/src/bl602_gpio.c      |   2 +-
 boards/sparc/bm3803/xx3803/src/bm3803_boot.c       |   2 -
 boards/sparc/bm3823/xx3823/src/bm3823_boot.c       |   2 -
 boards/sparc/bm3823/xx3823/src/bm3823_leds.c       |   2 -
 boards/x86/qemu/qemu-i486/src/qemu_boot.c          |   2 -
 boards/x86_64/intel64/qemu-intel64/src/qemu_boot.c |   2 -
 boards/x86_64/intel64/qemu-intel64/src/qemu_net.c  |   1 -
 boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c  |   1 -
 boards/z80/z80/z80sim/src/z80_irq.c                |   1 -
 boards/z80/z80/z80sim/src/z80_serial.c             |   1 -
 drivers/lcd/skeleton.c                             |   2 -
 2050 files changed, 1302 insertions(+), 3847 deletions(-)

diff --git a/arch/arm/src/a1x/a1x_boot.c b/arch/arm/src/a1x/a1x_boot.c
index bd42d48..d6effb2 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 dc34aca..11d5f01 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 b8de180..4c4c3d2 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 ccfcd69..0cfd9ea 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 6a6723c..2ac2c00 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 5b8f560..4d70093 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 e917b57..4322317 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 859b12e..906968b 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 023ff5c..b4b0888 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 b96601f..ff47c90 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 0492500..ea05319 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 5a04f00..6aed915 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 7111c7d..cbe9af5 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 1489252..1d8f8b4 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 e0dfa27..d434388 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 23714ba..02b87e4 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 47e0d55..577bf67 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 618683f..698fcb7 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 c96584e..b7cdb24 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 ba71eae..2d51d9d 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 b091666..03d58ec 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 eff64ec..be42f9b 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 031bab6..ac3ed17 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 7c51c14..153e4cb 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 5d13d17..e4b9c98 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 6fce4d0..ce1967c 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 505a932..de8522c 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 15bfa0f..6684d0b 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 afa764a..9f96839 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 1abdffc..2fe0b02 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 31376bf..41d7614 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 b5049c7..fd683e0 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 c5ea3dd..fd63b4b 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 21dc09e..b4a0b5b 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 34938c7..acb12e5 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 8fc476f..148fa74 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 5cf5f92..bc1bb0e 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 819a024..9d90580 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 9aa8c78..efa7303 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 4fd63c9..8f0c6ca 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 9f1684c..aeea069 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 761f320..7317c9f 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 81b07fc..3be6ea1 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 f4153ea..86fb901 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 abea2e6..1aeda39 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 8b89dfd..bcd0ab0 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 8e95a5d..7380ce0 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 2349aea..f029f55 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 28c6049..2d35131 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 0e4a717..e1fec93 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 d4ba3fc..54f3374 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 25e8174..fc27a7b 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 e371224..d98e68c 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 99e25c7..968a190 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 0710744..5ced78d 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 d1b827e..7af6842 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 eadc04e..0480533 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 9a759cc..310ecc2 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 274c2ae..b09744f 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 ff32921..a296819 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 659b748..c5c0b8f 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 f125078..f95f775 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 1cf12ad..de799b3 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 de3bfa8..c7af8c3 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 32f3513..f55557b 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 558278e..5ebf367 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 39d4b97..5029b12 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 aae2bec..ce4d232 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 c7814a8..4b2b549 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 bbbba30..5cc8780 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 c730d1e..f5af2ab 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 99f1912..81a6959 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 7049777..fe3b90f 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 325a99d..2c4d2f6 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 a1f4d5d..4c459e9 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 9d00e9f..7eb7409 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 b5cb182..8926dda 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 d9854ae..59913fe 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 39adb9f..84fba7f 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 2d86b68..183d00e 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 0f18be1..ddc85e2 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 567ecd0..51dacc1 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 4751984..c2800cc 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 89e8e4b..9ffde56 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 8f82112..de91292 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 6e5dcdc..3feb412 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 31df990..4ef77e3 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 038f6e7..2423c51 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 b5377fd..6800c91 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 ea94ea4..6e22ba6 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 231e040..b3006ab 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 1ac550d..28fffbd 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 aeea016..0000000
--- 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 89394db..e3da777 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 c9373ec..6e3950f 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 0cf8cb1..00b587a 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 025aa58..3a1c467 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 cf34c5c..f8fef81 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 6066daa..cbd2ba6 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 b228063..7d837aa 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 bdbf309..9b46149 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 d819d26..06ac317 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 b58f94d..be483fb 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 e10326f..8117856 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 ac47b8e..62888ef 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 98472cb..e3a124d 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 34ffceb..1a1230a 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 541d01d..dcc6171 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 a53233f..30337be 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 bbdea2c..6c0bf94 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 2fd8ca1..f748574 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 6cf008e..08662f5 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 349f1616..b7f379b 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 395b540..29da577 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 1428555..efbe8f8 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 1dac5b1..efac07f 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 c206a38..105b629 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 6c71403..7f4f9c7 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 bb2b95b..093fe09 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 95f06da..e4bb357 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 2c71c4a..1a9e2a4 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 6f5549a..4abcee5 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 9a8c56b..3574089 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 48ca51a..03d74c8e 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 12f4e3a..52cf197 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 e792abf..c41076b 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 6914f60..7b6ed58 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 cce7c31..1ec3b7b 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 1bc8284..21b9cb3 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 110a92e..802b1b7 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 af58453..2794f96 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 672c98e..aee6915 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 e586dce..493dcb3 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 1f04734..ca5e74e 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 54cc65b..c6315b0 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 66cee63..f259804 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 0d59c57..6e17ea0 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 c2f4983..0b4f967 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 bbcedd4..c78f35a 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 014db12..3113b2a 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 04ec9a6..d58a3d5 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 d0b39ae..a7ef423 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 5174f5f..0745770 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 82e25ac..a7dfaff 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 9565970..5f26d34 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 9c0c3fc..f11e553 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 9172d91..a906b31 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 b99bb9b..4638359 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 d522f7a..3f08814 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 43b936f..8ea6d25 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 5f10709..bd38e5c 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 447317f..f61e823 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 380de02..e042ac3 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 632c4f2..8b47d2b 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 53aaab3..5169d96 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 543943a..ebf9495 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 2c9a528..10ef7e5 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 240b8c2..1fb26ca 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 1cb4d39..114e8c7 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 7b574ee..5447448 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 83678f0..e8ffd8a 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 27c9b6b..af6de5d 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 5442a74..89ad73b 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 06ec136..1ad335d 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 2ff7e9b..14d47ef 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 b4708e2..76d2812 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 8c24542..46dbcb7 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 cf659e9..c308c6c 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 6bb2678..a53020f 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 b4ad8eb..f8a21f2 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 cb25c72..ae6661d 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 8697297..4584781 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 a99e93c..931c3a6 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 2387a28..b83eb70 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 a288c6a..81511e0 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 fee5f5c..c74dcd3 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 d9fbfe7..1904b2d 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 7b39f4b..ee0a51a 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 f25d9d7..74b355b 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 916bb6b..b6c2bcd 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 43d0447..3fc40f0 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 2274aee..aa1c895 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 a0b3fa1..a99ffb4 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 d345b6b..9af6ecb 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 74cff9e..7e5e374 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 4dea7c9..9b8d2ed 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 27ffcce..0ebbd80 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 cd294f3..85dbfb0 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 0e0d166..678d796 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 204d649..b0e85f3 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 be93d55..3cb4f74 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 a8f2802..fba3cda 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 5fa9b0c..3383820 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 9f4100d..07f9b41 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 6a66430..b429eb5 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 4dece9d..a6d7fbe 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 a1d2f3b..e925a01 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 b0aa5d6..5f895c7 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 b84831b..0cec7f6 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 05f6356..194622e 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 26dd9a6..aa0a10b 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 ff83ee1..2e68d01 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 201457d..0274c30 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 decdf10..ab27d70 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 d44da84..b63ae0b 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 64913cb..89b72ca 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 782c191..a36f84f 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 85ab32e..1b1c0ab 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 1dc9484..14b66fc 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 fccfe84..1f07d41 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 2cbc9df..c5209d9 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 6f38413..ebd5910 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 fbc662e..55e0de6 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 610ad43..7f0c432 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 bcd1d2e..8940318 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 c8c3eff..22beebe 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 521acca..33def0d 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 3fa9a17..3fe2808 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 dbec475..b6316ce 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 0712e62..dd8771c 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 2b9fc12..fc3db98 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 f6f6a59..f462f69 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 67bcc21..d5537be 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 eade31c..2a81ed4 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 7447211..63352b5 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 ab754d1..950eced 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 b785a9c..730fbde 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 695a67d..d642e87 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 e1d819d..1f3a971 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 79454db..0360233 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 7342dcf..7636261 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 5612fbe..19ca039 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 6cb4361..af0cb20 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 4ecb5c9..c4455bd 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 4119372..c5e144b 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 c0104aa..004faf7 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 658d422..a90177a 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 35af49a..9f2b22f 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 5160862..b619750 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 d06ac47..6228293 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 8e0db93..1204a4c 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 400b05f..2548e85 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 e5ca8d2..404e08d 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 ebb25d6..d630e32 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 e0545cb..f3a3791 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 0d2578c..87b6dff 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 e9114db..e3058f7 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 b116c0a..146d2de 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 0974269..07afe80 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 8fa57d4..62dbc08 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 59b7494..4d7befb 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 7b1a350..64f6086 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 bd83e8e..962e48b 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 8e062f4..7e677b1 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 a38e6f1..cc1609e 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 7b7af6d..209c2c9 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 6cca50b..2fc2259 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 94925a8..269e010 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 dc18748..e972fc2 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 5337667..ba5c018 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 baa849f..00d8aa0 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 9c562fe..a158b6b 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 93b66a4..0ad393a 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 15a0076..4294a18 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 6669a49..710136b 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 1280d03..e58c4ca 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 f6b0b5c..8dafb95 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 8abf280..7a24fe7 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 f7c73bb..9d84b45 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 a163c9d..5e57ba6 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 aa7c13b..61127bd 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 9c41e82..bc5eccc 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 cfc8db0..80a0127 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 1ed240c..5d8f1cb 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 af2b6ba..9613ba4 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 a7cf85c..20edcdd 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 ab7b88e..9421be4 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 8c59009..d067b40 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 217abee..5c4c9c4 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 5a6a0c3..556d8be 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 6c11128..f4fee9e 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 1400e36..8a96aab 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 0a4d1c5..0a4b7d0 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 f8f9154..cbbbcdd 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 9b2e2a1..9b17865 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 93b5a5b..c0d669c 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 d8a67db..255fdcf 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 9a6a384..a31b297 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 952f48a..6496016 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 6c71aa5..f85720f 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 d234b54..2683cf5 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 befb181..15e5516 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 3cec641..690b7b1 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 b99e3e6..03f2430 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 eebf360..427c267 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 a634089..6b3e8b8 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 404f471..a072bb3 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 d2e6ffb..41d55e9 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 9b511fc..5ab8380 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 4071384..e21b25c 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 f769448..af1def8 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 454ed3c..788c78e 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 1bd151f..a32a093 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 6ebcf48..ac52925 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 793bf29..ace43bf 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 d87ed77..00ba8ce 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 6029cb9..12e86ac 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 8d9d351..581b814 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 426b582..a16697e 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 3742e1e..c7cd0ad 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 aed53fa..ad6e27c 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 a065f4e..3ed79a2 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 53024f0a0..0845109 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 5973e4b..b91863d 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 daadcd7..ba49967 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 0b28df1..1c75f22 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 e08770f..a0da10d 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 cb01b94..b6db132 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 2941762..37dca3f 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 1928eb3..7983ae6 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 fde4e45..f665735 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 6e209df..37a3b66 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 1cb1f06..6ac0546 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 f6b6567..0f25c3a 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 0c1bf51..72e79af 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 e86f527..fa66303 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 9e45211..8b74b87 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 78d59b1..1d2a29e 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 6a93b2d..41158df 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 6717053..41fe253 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 1c350f1..ed65798 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 c819b32..c13bb0a 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 c824e1d..77de66a 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 f65ce0d..0b2e08c 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 5aa3810..99d4659 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 b9f6355..fd92b5e 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 0cba010..187f3b8 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 bf9284b..bf3036c 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 be0ae38..45f6b33 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 dbc7a59..514dc37 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 61b2db1..20b7403 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 1642eac..5212595 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 a6e069d..40b9287 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 6c0edfa..a21e393 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 01458b7..77cbee5 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 a139956..7120714 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 4990137..7afeddc 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 07bfc76..dd7241d 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 28b08b4..3fff0aa 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 a269d8c..906d84d 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 9418060..8e787f8 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 2b34061..a398c04 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 ff4f88d..55dcd52 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 09111a0..b1d0b27 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 a932695..22144f8 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 2593e45..d8ecc85 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 81c28fa..104158c 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 53ef95c..a26b863 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 0d28651..0d1fd95 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 48e0b90..f41c0b6 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 8f4d110..43d47a5 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 61fe492..2b4374a 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 5fe778d..51beb36 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 0f325d2..e880ac8 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 afbef8e..25bae0b 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 ef8b8f4..df1c862 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 a3079ba..cfcd1c1 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 2143fb3..a604dc6 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 ece1b4c..5a5bc2e 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 7c4a917..591001e 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 5393c86..b181205 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 3ae81ac..6711677 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 5f84fe7..d792b05 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 2e33848..9722ac1 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 5faaf9c..eeb44d3 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 54591f9..b6b3c33 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 af42946..b23bcba 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 7682ac5..05f7bc6 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 591c6fa..7280f63 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 687680a..4f0dffa 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 861609f..c8845f3 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 f7bbed8..c59e336 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 ca8f325..02c6091 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 ee51898..50e7a96 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 1030686..be9bb2a 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 f907765..d0787db 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 daa1ce1..62e9c8e 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 b1a2ce6..8f9a738 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 e264096..21cdc05 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 f646f93..ad1e6d2 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 ee0dd04..907e48b 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 59385e8..0907d4d 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 6021e15..2f01d6a 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 c366647..dc88c86 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 b4c75ec..cdf5152 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 6077a92..3caf281 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 f68a344..26d8ca4 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 080cd13..1f61887 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 e488999..1e0447c 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 cf98323..5ec1cb5 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 db588b6..1468da8 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 0dc8fec..149d3a5 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 9597ea4..47a990d 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 9053fe5..df226a2 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 3056d82..3d2f57d 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 5c4e908..edb088d 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 6d4eea4..93680b2 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 6210d81..264f342 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 67c9c9b..09d5523 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 817d9d4..e59df7a 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 4b43a91..b0b53af 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 821f8d3..f4ba8be 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 dbc2edd..f8a8968 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 4584092..885c866 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 dbbb3f3..88f57c1 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 6765753..478868a 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 2489e59..acdfd6e 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 63575b2..cde8e28 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 f343b4a..6c335ea 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 a2002eb..7771875 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 9a311af..0e9b479 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 9db7286..6a0e498 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 509dc51..dbbdaf9 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 f1c33cf..8ba286a 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 c23fc5c..8cefb2d 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 d90a277..4a17485 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 de5f43a..7c76975 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 c51f8c6..93186b9 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 dd9bad1..903ae61 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 01a907e..49305d4 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 512b014..88a0092 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 0caa26a..3e596f9 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 17c9424..c18fbdb 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 c7c0dab..cc98fcf 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 73c3803..50a2211 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 cf431b0..63af40a 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 0e4af50..ae1ce4d 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 4cab7ea..eddcec0 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 f914f1c..c43b925 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 c7c9f0d..31607a7 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 8529c08..9775846 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 27aa2dd..25b40c5 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 22c52a5..488b356 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 59d7d8a..eda5e49 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 e888165..55d98e4 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 aecc807..016739a 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 31dfdcd..1f28659 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 28ec002..b05f005 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 b91c6bc..4bb75fd 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 95dfddd..3f6407e 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 6e414f2..bf9ef26 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 0d6a524..5ebc6d6 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 f6d0e29..6611cb6 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 ea5a739..8553696 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 1950d68..ee9ca5a 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 8d60758..45a99af 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 f7f11b6..21ecdd0 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 8571435..cf53b71 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 1c633ae..9c5e762 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 a29043b..cef6b45 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 16faeb8..d12ced6 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 4596a24..d343e69 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 e418a49..fb19758 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 54ae84f..948137e 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 6d56edf..e01b30d 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 9f093df..aa600d3 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 5713c13..dc3680f 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 39d3156..b6eff26 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 97f81f1..321c32b 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 cc3c461..661e245 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 acf236f..8023f9a 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 e5bf82c..625532b 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 48d0cd9..4c6dcb2 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 18360ce..1e63a5e 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 0428e06..fadd51b 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 46019c9..0f4d908 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 5a819a9..d275d58 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 3d1f0ff..245f38b 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 08f1f34..69871af 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 af6f5b5..6cb5e7e 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 d68ae2e..f3e0abe 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 6dd5ee3..e90fbc5 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 d2c5677..338e07e 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 89eaa24..6581a10 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 08e9bd6..b3052c2 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 9428e3b..fc5e4f7 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 7937c5b..2c989b5 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 29012c0..e3d88d8 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 48fe9b0..9c548c4 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 37fd5b8..461a790 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 81e578b..f618434 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 0ab2021..564d498 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 12f6e2d..14d509a 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 02601c6..978a3b5 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 2369cd4..060d3d5 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 277e2ac..78bf290 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 e0b96ad..b819870 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 512d745..d1d5bf4 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 c0c8f17..e97aed9 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 999be86..63c1f3f 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 880ee19..cc6e742 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 d429557..3c30bce 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 a114da0..2088081 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 3075d25..75411f2 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 870355a..ebe48e4 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 6d0fed6..aef6d2e 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 a00f77d..a73712e 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 18a839d..5c7cf8c 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 fc69372..c3b0130 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 c5c0d15..375b759 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 604414e..46e3b7e 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 acd7a1e..04a9e51 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 6347a24..2b0b918 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 b638ad6..d62f23a 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 0a5175b..1924bd5 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 3d7fd24..48f0466 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 7b18ffc..ef90f11 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 e84ac99..6d32c91 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 c4e9f7f..000704b 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 415bef3..73e6c23 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 63724a6..cefa314 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 c364b4c..34e241f 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 1aebed0..7ca0e72 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 24d3768..69a48db 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 e7285c1..1fb11ab 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 81d2336..02dd65b 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 5a0a5c0..0a169c5 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 e16129a..5b7c256 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 3702ee8..9607033 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 89645b7..978e6f8 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 1f3fb7c..a55456e 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 f1ad929..abe9c60 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 e7ed5f7..e1fbe48 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 0fbb37c..66e0669 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 750983b..bc1d88d 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 883e897..cf80511 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 bfdd3f4..269bbd9 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 11801a2..fa601e3 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 a702cf4..139a94b 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 86f97e1..d08624a 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 9d0a4a4..d32f145 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 cea20dc..8cc0f95 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 3f27430..f4a3091 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 fccc567..3ec9fc5 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 d3a622f..a0d7900 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 06c7440..837f946 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 c77be96..9b48baf 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 c280eab..71d6147 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 9486b0c..c264328 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 2ad5332..dd45818 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 4d85bce..20b30d3 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 79e5368..55b77c8 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 3f765c9..9bdbc182 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 7dd1fa8..7c35b28 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 4012db6..8960841 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 21bf51a..6897c7d 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 ec9007d..d01e785 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 426c496..0954378 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 d1135c8..98908ed 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 ad9dd51..9035571 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 a1f31ec..cd71171 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 d754185..c305e01 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 af4ee23..67c69c8 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 a023637..b5910eb 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 210661d..6fec17e 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 931d780..37606f9 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 852cae8..4684dd0 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 a7b7ff5..f253fe1 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 dc6ccee..25f55a9 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 3f9002b..9caf822 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 a1d3d12..976544f 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 20a9980..1db83d4 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 a510273..3a1b444 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 1067b57..7b1b814 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 cf54821..e87bb64 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 687c49d..bfe6ac7 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 4a525d3..ceec6bf 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 6a5fade..565a203 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 bfc0860..c3d18ef 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 0de021e..5453209 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 f5d541d..749ee2c 100644
--- a/arch/arm/src/sama5/sam_serial.c
+++ b/arch/arm/src/sama5/sam_serial.c
... 20437 lines suppressed ...