diff --git a/arch/arm/include/cxd56xx/battery_ioctl.h b/arch/arm/include/cxd56xx/battery_ioctl.h
index 77f206ccd7..bbd37a70ee 100644
--- a/arch/arm/include/cxd56xx/battery_ioctl.h
+++ b/arch/arm/include/cxd56xx/battery_ioctl.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_ARCH_CHIP_BATTERY_IOCTL_H
-#define __INCLUDE_ARCH_CHIP_BATTERY_IOCTL_H
+#ifndef __ARCH_ARM_INCLUDE_CXD56XX_BATTERY_IOCTL_H
+#define __ARCH_ARM_INCLUDE_CXD56XX_BATTERY_IOCTL_H
 
 #include <nuttx/fs/ioctl.h>
 
@@ -112,4 +112,4 @@ struct bat_monitor_log_s
   int size;
 };
 
-#endif /* __INCLUDE_ARCH_CHIP_BATTERY_IOCTL_H */
+#endif /* __ARCH_ARM_INCLUDE_CXD56XX_BATTERY_IOCTL_H */
diff --git a/arch/arm/include/cxd56xx/irq.h b/arch/arm/include/cxd56xx/irq.h
index 7b20667d80..f3aa541d28 100644
--- a/arch/arm/include/cxd56xx/irq.h
+++ b/arch/arm/include/cxd56xx/irq.h
@@ -218,21 +218,6 @@
 #define NR_VECTORS              CXD56_IRQ_NIRQS
 #define NR_IRQS                 CXD56_IRQ_NIRQS
 
-/* Cortex-M0 External interrupts (vectors >= 16) */
-
-#if 0
-#  define CXD56M0_IRQ_NIRQS     (CXD56_IRQ_EXTINT + CXD56M0_IRQ_NEXTINT)
-#endif
-
-/* Total number of IRQ numbers (This will need to be revisited if/when the
- * Cortex-M0 is supported)
- */
-
-#if 0
-#  define NR_VECTORS            CXD56M0_IRQ_NIRQS
-#  define NR_IRQS               CXD56M0_IRQ_NIRQS
-#endif
-
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/arch/arm/include/cxd56xx/scu.h b/arch/arm/include/cxd56xx/scu.h
index b1a3409218..450044bd87 100644
--- a/arch/arm/include/cxd56xx/scu.h
+++ b/arch/arm/include/cxd56xx/scu.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_INCLUDE_CXD56XX_CXD56_SCU_H
-#define __ARCH_ARM_INCLUDE_CXD56XX_CXD56_SCU_H
+#ifndef __ARCH_ARM_INCLUDE_CXD56XX_SCU_H
+#define __ARCH_ARM_INCLUDE_CXD56XX_SCU_H
 
 /****************************************************************************
  * include files
@@ -557,4 +557,4 @@ void scu_initialize(void);
 
 void scu_uninitialize(void);
 
-#endif  /* __ARCH_ARM_INCLUDE_CXD56XX_CXD56_SCU_H */
+#endif  /* __ARCH_ARM_INCLUDE_CXD56XX_SCU_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_charger.h b/arch/arm/src/cxd56xx/cxd56_charger.h
index 3d8e23a825..8c5f7a7b5a 100644
--- a/arch/arm/src/cxd56xx/cxd56_charger.h
+++ b/arch/arm/src/cxd56xx/cxd56_charger.h
@@ -33,12 +33,12 @@
  *
  ****************************************************************************/
 
-#ifndef __SRC_CXD56_CHARGER_H
-#define __SRC_CXD56_CHARGER_H
+#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_CHARGER_H
+#define __ARCH_ARM_SRC_CXD56XX_CXD56_CHARGER_H
 
 /* initialize function */
 
 int cxd56_charger_initialize(FAR const char *devpath);
 int cxd56_charger_uninitialize(FAR const char *devpath);
 
-#endif /* __SRC_CXD56_CHARGER_H */
+#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_CHARGER_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_config.h b/arch/arm/src/cxd56xx/cxd56_config.h
index 1a47f401cb..c95017e80c 100644
--- a/arch/arm/src/cxd56xx/cxd56_config.h
+++ b/arch/arm/src/cxd56xx/cxd56_config.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56XX_CONFIG_H
-#define __ARCH_ARM_SRC_CXD56XX_CXD56XX_CONFIG_H
+#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_CONFIG_H
+#define __ARCH_ARM_SRC_CXD56XX_CXD56_CONFIG_H
 
 /****************************************************************************
  * Included Files
@@ -135,4 +135,4 @@
  * Public Functions
  ****************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56XX_CONFIG_H */
+#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_CONFIG_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.h b/arch/arm/src/cxd56xx/cxd56_emmc.h
index 891660a536..078ad961dc 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.h
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.h
@@ -58,5 +58,4 @@ void cxd56_emmcuninitialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-
-#endif
+#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_EMMC_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_farapi.h b/arch/arm/src/cxd56xx/cxd56_farapi.h
index 76cc9a127c..eb4df75e5b 100644
--- a/arch/arm/src/cxd56xx/cxd56_farapi.h
+++ b/arch/arm/src/cxd56xx/cxd56_farapi.h
@@ -43,7 +43,7 @@ extern "C"
 {
 #else
 #define EXTERN extern
-#endif
+#endif /* ARCH_ARM_SRC_CXD56XX_CXD56_FARAPI_H */
 
 void cxd56_farapiinitialize(void);
 
diff --git a/arch/arm/src/cxd56xx/cxd56_farapistub.h b/arch/arm/src/cxd56xx/cxd56_farapistub.h
index a8af513e2d..8a9fd33dd9 100644
--- a/arch/arm/src/cxd56xx/cxd56_farapistub.h
+++ b/arch/arm/src/cxd56xx/cxd56_farapistub.h
@@ -38,4 +38,4 @@
 
 #define FARAPISTUB_VERSION 17639
 
-#endif
+#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_FARAPISTUB_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_gauge.h b/arch/arm/src/cxd56xx/cxd56_gauge.h
index 1ad28cb3fe..94e5e32903 100644
--- a/arch/arm/src/cxd56xx/cxd56_gauge.h
+++ b/arch/arm/src/cxd56xx/cxd56_gauge.h
@@ -33,12 +33,12 @@
  *
  ****************************************************************************/
 
-#ifndef __SRC_CXD56_GAUGE_H
-#define __SRC_CXD56_GAUGE_H
+#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_GAUGE_H
+#define __ARCH_ARM_SRC_CXD56XX_CXD56_GAUGE_H
 
 /* initialize function */
 
 int cxd56_gauge_initialize(FAR const char *devpath);
 int cxd56_gauge_uninitialize(FAR const char *devpath);
 
-#endif /* __SRC_CXD56_GAUGE_H */
+#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_GAUGE_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_gpio.h b/arch/arm/src/cxd56xx/cxd56_gpio.h
index e11524fc8a..d9cd5db837 100644
--- a/arch/arm/src/cxd56xx/cxd56_gpio.h
+++ b/arch/arm/src/cxd56xx/cxd56_gpio.h
@@ -153,6 +153,6 @@ int cxd56_gpio_status(uint32_t pin, cxd56_gpio_status_t *stat);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* __ASSEMBLY__ */
 
+#endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_GPIO_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_gpioint.h b/arch/arm/src/cxd56xx/cxd56_gpioint.h
index fee27d4cbe..c307088b04 100644
--- a/arch/arm/src/cxd56xx/cxd56_gpioint.h
+++ b/arch/arm/src/cxd56xx/cxd56_gpioint.h
@@ -46,8 +46,6 @@
 #include <nuttx/config.h>
 #include "chip.h"
 
-#ifdef CONFIG_CXD56_GPIO_IRQ
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -230,8 +228,6 @@ int cxd56_gpioint_status(uint32_t pin, cxd56_gpioint_status_t *stat);
 #if defined(__cplusplus)
 }
 #endif
+
 #endif /* __ASSEMBLY__ */
-
-#endif /* CONFIG_CXD56_GPIO_IRQ */
-
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_GPIOINT_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.h b/arch/arm/src/cxd56xx/cxd56_i2c.h
index 256e00279c..d6696e738e 100644
--- a/arch/arm/src/cxd56xx/cxd56_i2c.h
+++ b/arch/arm/src/cxd56xx/cxd56_i2c.h
@@ -97,6 +97,6 @@ int cxd56_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* __ASSEMBLY__ */
 
+#endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_I2C_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_icc.h b/arch/arm/src/cxd56xx/cxd56_icc.h
index a5d9f667f9..230e330074 100644
--- a/arch/arm/src/cxd56xx/cxd56_icc.h
+++ b/arch/arm/src/cxd56xx/cxd56_icc.h
@@ -96,6 +96,6 @@ void cxd56_iccinitialize(void);
 #ifdef __cplusplus
 }
 #endif
-#endif
 
+#endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_ICC_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_pinconfig.h b/arch/arm/src/cxd56xx/cxd56_pinconfig.h
index 9480b97031..74d67796d7 100644
--- a/arch/arm/src/cxd56xx/cxd56_pinconfig.h
+++ b/arch/arm/src/cxd56xx/cxd56_pinconfig.h
@@ -221,6 +221,6 @@ int cxd56_pin_status(uint32_t pin, cxd56_pin_status_t *stat);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* __ASSEMBLY__ */
 
+#endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_PINCONFIG_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_pmic.h b/arch/arm/src/cxd56xx/cxd56_pmic.h
index c4a57ab024..52d0964913 100644
--- a/arch/arm/src/cxd56xx/cxd56_pmic.h
+++ b/arch/arm/src/cxd56xx/cxd56_pmic.h
@@ -46,8 +46,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#ifdef CONFIG_CXD56_PMIC
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -755,7 +753,6 @@ int cxd56_pmic_monitor_get(FAR struct pmic_mon_log_s *ptr);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* __ASSEMBLY__ */
 
-#endif /* CONFIG_CXD56_PMIC */
+#endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_PMIC_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr.h b/arch/arm/src/cxd56xx/cxd56_powermgr.h
index d62ccca549..2c2184a39c 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr.h
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr.h
@@ -345,6 +345,6 @@ int cxd56_pm_hotsleep(int idletime);
 #ifdef __cplusplus
 }
 #endif
-#endif
 
+#endif /* __ASSEMBLY */
 #endif /* __ARCH_ARM_SRC_CXD56XX_POWERMGR_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.h b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.h
index 9a55b5cb38..ee58ffa266 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.h
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/cxd56xx/cxd56_timerisr.h
+ * arch/arm/src/cxd56xx/cxd56_powermgr_procfs.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
diff --git a/arch/arm/src/cxd56xx/cxd56_pwm.h b/arch/arm/src/cxd56xx/cxd56_pwm.h
index 26f32f6b90..e04ec48e49 100644
--- a/arch/arm/src/cxd56xx/cxd56_pwm.h
+++ b/arch/arm/src/cxd56xx/cxd56_pwm.h
@@ -98,6 +98,6 @@ FAR struct pwm_lowerhalf_s *cxd56_pwminitialize(uint32_t channel);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* __ASSEMBLY__ */
 
+#endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_PWM_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.h b/arch/arm/src/cxd56xx/cxd56_rtc.h
index a086440bee..222c122e45 100644
--- a/arch/arm/src/cxd56xx/cxd56_rtc.h
+++ b/arch/arm/src/cxd56xx/cxd56_rtc.h
@@ -187,5 +187,6 @@ FAR struct rtc_lowerhalf_s *cxd56_rtc_lowerhalf(void);
 #if defined(__cplusplus)
 }
 #endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_RTC_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_sfc.h b/arch/arm/src/cxd56xx/cxd56_sfc.h
index 1a4ceb05f1..e4001bdd90 100644
--- a/arch/arm/src/cxd56xx/cxd56_sfc.h
+++ b/arch/arm/src/cxd56xx/cxd56_sfc.h
@@ -63,4 +63,4 @@ FAR struct mtd_dev_s *cxd56_sfc_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 
-#endif
+#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_SFC_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_timer.h b/arch/arm/src/cxd56xx/cxd56_timer.h
index b7c666367d..3befd21be6 100644
--- a/arch/arm/src/cxd56xx/cxd56_timer.h
+++ b/arch/arm/src/cxd56xx/cxd56_timer.h
@@ -42,8 +42,6 @@
 
 #include <nuttx/config.h>
 
-#ifdef CONFIG_TIMER
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -95,5 +93,4 @@ void cxd56_timer_initialize(FAR const char *devpath, int timer);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* CONFIG_TIMER */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_TIMER_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.h b/arch/arm/src/cxd56xx/cxd56_udmac.h
index fea1b5674d..8e89f97dc3 100644
--- a/arch/arm/src/cxd56xx/cxd56_udmac.h
+++ b/arch/arm/src/cxd56xx/cxd56_udmac.h
@@ -269,5 +269,4 @@ void cxd56_udmainitialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_UDMAC_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_wdt.h b/arch/arm/src/cxd56xx/cxd56_wdt.h
index 0cea0e7f56..47ed5cc36f 100644
--- a/arch/arm/src/cxd56xx/cxd56_wdt.h
+++ b/arch/arm/src/cxd56xx/cxd56_wdt.h
@@ -45,8 +45,6 @@
 #include "chip.h"
 #include "hardware/cxd56_wdt.h"
 
-#ifdef CONFIG_CXD56_WDT
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -90,5 +88,4 @@ int cxd56_wdt_initialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* CONFIG_CXD56_WDT */
 #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_WDT_H */