diff --git a/arch/arm/src/cxd56xx/chip.h b/arch/arm/src/cxd56xx/chip.h
index 622319818e..0ccfe5ffda 100644
--- a/arch/arm/src/cxd56xx/chip.h
+++ b/arch/arm/src/cxd56xx/chip.h
@@ -48,7 +48,7 @@
 
 #define  ARMV7M_PERIPHERAL_INTERRUPTS 128
 
-#include "chip/cxd5602_memorymap.h"
+#include "hardware/cxd5602_memorymap.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/cxd56xx/cxd56_uart.h b/arch/arm/src/cxd56xx/cxd56_uart.h
index a03c664fab..d3d2e079f4 100644
--- a/arch/arm/src/cxd56xx/cxd56_uart.h
+++ b/arch/arm/src/cxd56xx/cxd56_uart.h
@@ -44,7 +44,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/cxd56_uart.h"
+#include "hardware/cxd56_uart.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/cxd56xx/chip/cxd5602_memorymap.h b/arch/arm/src/cxd56xx/hardware/cxd5602_memorymap.h
similarity index 96%
rename from arch/arm/src/cxd56xx/chip/cxd5602_memorymap.h
rename to arch/arm/src/cxd56xx/hardware/cxd5602_memorymap.h
index e2d2f3b56d..0e89491b12 100644
--- a/arch/arm/src/cxd56xx/chip/cxd5602_memorymap.h
+++ b/arch/arm/src/cxd56xx/hardware/cxd5602_memorymap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/cxd56xx/chip/cxd5602_memorymap.h
+ * arch/arm/src/cxd56xx/hardware/cxd5602_memorymap.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_CXD56XX_CHIP_CXD5602_MEMORYMAP_H
-#define __ARCH_ARM_SRC_CXD56XX_CHIP_CXD5602_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD5602_MEMORYMAP_H
+#define __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD5602_MEMORYMAP_H
 
 /****************************************************************************
  * Included Files
@@ -120,4 +120,5 @@
 #define CXD56_EMMC_BASE           (CXD56_ADSP_BASE  + 0x02201000)
 #define CXD56_SDIO_BASE           (CXD56_ADSP_BASE  + 0x02202000)
 
-#endif
+#endif /* __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD5602_MEMORYMAP_H */
+
diff --git a/arch/arm/src/cxd56xx/chip/cxd56_uart.h b/arch/arm/src/cxd56xx/hardware/cxd56_uart.h
similarity index 96%
rename from arch/arm/src/cxd56xx/chip/cxd56_uart.h
rename to arch/arm/src/cxd56xx/hardware/cxd56_uart.h
index 907a77bff4..bbda48329d 100644
--- a/arch/arm/src/cxd56xx/chip/cxd56_uart.h
+++ b/arch/arm/src/cxd56xx/hardware/cxd56_uart.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/cxd56xx/chip/cxd56_uart.h
+ * arch/arm/src/cxd56xx/hardware/cxd56_uart.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_CXD56XX_CHIP_CXD56_UART_H
-#define __ARCH_ARM_SRC_CXD56XX_CHIP_CXD56_UART_H
+#ifndef __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD56_UART_H
+#define __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD56_UART_H
 
 /****************************************************************************
  * Included Files
@@ -131,4 +131,5 @@
  * Public Functions
  ****************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_CXD56XX_CHIP_CXD56_UART_H */
+#endif /* __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD56_UART_H */
+