diff --git a/arch/arm/src/xmc4/chip.h b/arch/arm/src/xmc4/chip.h
index d8094698a4..93c2f4a506 100644
--- a/arch/arm/src/xmc4/chip.h
+++ b/arch/arm/src/xmc4/chip.h
@@ -48,7 +48,7 @@
 
 #include <arch/irq.h>
 #include <arch/xmc4/chip.h>
-#include "chip/xmc4_memorymap.h"
+#include "hardware/xmc4_memorymap.h"
 
 /* If the common ARMv7-M vector handling logic is used, then it expects the
  * following definition in this file that provides the number of supported external
diff --git a/arch/arm/src/xmc4/chip/xmc4_ethernet.h b/arch/arm/src/xmc4/hardware/xmc4_ethernet.h
similarity index 99%
rename from arch/arm/src/xmc4/chip/xmc4_ethernet.h
rename to arch/arm/src/xmc4/hardware/xmc4_ethernet.h
index 22c163b661..3326646347 100644
--- a/arch/arm/src/xmc4/chip/xmc4_ethernet.h
+++ b/arch/arm/src/xmc4/hardware/xmc4_ethernet.h
@@ -1,5 +1,5 @@
 /********************************************************************************************************************
- * arch/arm/src/xmc4/chip/xmc4_ethernet.h
+ * arch/arm/src/xmc4/hardware/xmc4_ethernet.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,8 +49,8 @@
  *
  ********************************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_ETHERNET_H
-#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_ETHERNET_H
+#define __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_ETHERNET_H
 
 /********************************************************************************************************************
  * Included Files
@@ -58,7 +58,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/xmc4_memorymap.h"
+#include "hardware/xmc4_memorymap.h"
 
 /********************************************************************************************************************
  * Pre-processor Definitions
@@ -647,4 +647,4 @@
 /* HW Feature Register */
 #define ETH_HW_FEATURE_
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_ETHERNET_H */
diff --git a/arch/arm/src/xmc4/chip/xmc4_flash.h b/arch/arm/src/xmc4/hardware/xmc4_flash.h
similarity index 98%
rename from arch/arm/src/xmc4/chip/xmc4_flash.h
rename to arch/arm/src/xmc4/hardware/xmc4_flash.h
index 0432e465b0..93bd81a619 100644
--- a/arch/arm/src/xmc4/chip/xmc4_flash.h
+++ b/arch/arm/src/xmc4/hardware/xmc4_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/xmc4/chip/xmc4_flash.h
+ * arch/arm/src/xmc4/hardware/xmc4_flash.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,8 +49,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_FLASH_H
-#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_FLASH_H
+#ifndef __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_FLASH_H
+#define __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_FLASH_H
 
 /************************************************************************************
  * Included Files
@@ -58,7 +58,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/xmc4_memorymap.h"
+#include "hardware/xmc4_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -202,4 +202,4 @@
 #define FLASH_PROCON2_S12_S13ROM    (1 << 11) /* Bit 11: Sectors 12 and 13 Locked Forever by User 2 */
 #define FLASH_PROCON2_S14_S15ROM    (1 << 12) /* Bit 12: Sectors 14 and 15 Locked Forever by User 2 */
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_FLASH_H */
+#endif /* __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_FLASH_H */
diff --git a/arch/arm/src/xmc4/chip/xmc4_memorymap.h b/arch/arm/src/xmc4/hardware/xmc4_memorymap.h
similarity index 98%
rename from arch/arm/src/xmc4/chip/xmc4_memorymap.h
rename to arch/arm/src/xmc4/hardware/xmc4_memorymap.h
index a326460cc7..8be351d52e 100644
--- a/arch/arm/src/xmc4/chip/xmc4_memorymap.h
+++ b/arch/arm/src/xmc4/hardware/xmc4_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/xmc4/chip/xmc4_memorymap.h
+ * arch/arm/src/xmc4/hardware/xmc4_memorymap.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,8 +49,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_MEMORYMAP_H
-#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_MEMORYMAP_H
+#define __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -240,4 +240,4 @@
 
 #define XMC4_PPB_BASE               0xe000e000
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_MEMORYMAP_H */
diff --git a/arch/arm/src/xmc4/chip/xmc4_pinmux.h b/arch/arm/src/xmc4/hardware/xmc4_pinmux.h
similarity index 99%
rename from arch/arm/src/xmc4/chip/xmc4_pinmux.h
rename to arch/arm/src/xmc4/hardware/xmc4_pinmux.h
index daece1f509..457db319e6 100644
--- a/arch/arm/src/xmc4/chip/xmc4_pinmux.h
+++ b/arch/arm/src/xmc4/hardware/xmc4_pinmux.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/xmc4/chip/xmc4_pinmux.h
+ * arch/arm/src/xmc4/hardware/xmc4_pinmux.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PINMUX_H
-#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PINMUX_H
+#ifndef __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_PINMUX_H
+#define __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_PINMUX_H
 
 /************************************************************************************
  * Included Files
@@ -801,4 +801,4 @@
 #define GPIO_WWDT_SERVICEOUT_1   (GPIO_OUTPUT_ALT1 | GPIO_PORT0 | GPIO_PIN7)
 #define GPIO_WWDT_SERVICEOUT_2   (GPIO_OUTPUT_ALT1 | GPIO_PORT1 | GPIO_PIN4)
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PINMXU_H */
+#endif /* __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_PINMXU_H */
diff --git a/arch/arm/src/xmc4/chip/xmc4_ports.h b/arch/arm/src/xmc4/hardware/xmc4_ports.h
similarity index 99%
rename from arch/arm/src/xmc4/chip/xmc4_ports.h
rename to arch/arm/src/xmc4/hardware/xmc4_ports.h
index a769ddf73c..b5f2a60c9f 100644
--- a/arch/arm/src/xmc4/chip/xmc4_ports.h
+++ b/arch/arm/src/xmc4/hardware/xmc4_ports.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/xmc4/chip/xmc4_ports.h
+ * arch/arm/src/xmc4/hardware/xmc4_ports.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,8 +49,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PORTS_H
-#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PORTS_H
+#ifndef __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_PORTS_H
+#define __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_PORTS_H
 
 /************************************************************************************
  * Included Files
@@ -58,7 +58,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/xmc4_memorymap.h"
+#include "hardware/xmc4_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -507,4 +507,4 @@
 #define PORT_HWSEL_HW15_MASK        (3 << PORT_HWSEL_HW15_SHIFT)
 #  define PORT_HWSEL_HW15(n)        ((uint32_t)(n) << PORT_HWSEL_HW15_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_PORTS_H */
+#endif /* __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_PORTS_H */
diff --git a/arch/arm/src/xmc4/chip/xmc4_scu.h b/arch/arm/src/xmc4/hardware/xmc4_scu.h
similarity index 99%
rename from arch/arm/src/xmc4/chip/xmc4_scu.h
rename to arch/arm/src/xmc4/hardware/xmc4_scu.h
index afa4d0f8a7..d3cf939951 100644
--- a/arch/arm/src/xmc4/chip/xmc4_scu.h
+++ b/arch/arm/src/xmc4/hardware/xmc4_scu.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/xmc4/chip/xmc4_scu.h
+ * arch/arm/src/xmc4/hardware/xmc4_scu.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,15 +49,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_SCU_H
-#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_SCU_H
+#ifndef __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_SCU_H
+#define __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_SCU_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/xmc4_memorymap.h"
+#include "hardware/xmc4_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -1119,4 +1119,4 @@
 #  define SCU_CLKMXSTAT_SYSCLKMUX_OFI (1 << SCU_CLKMXSTAT_SYSCLKMUX_SHIFT)
 #  define SCU_CLKMXSTAT_SYSCLKMUX_PLL (2 << SCU_CLKMXSTAT_SYSCLKMUX_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_SCU_H */
+#endif /* __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_SCU_H */
diff --git a/arch/arm/src/xmc4/chip/xmc4_usic.h b/arch/arm/src/xmc4/hardware/xmc4_usic.h
similarity index 99%
rename from arch/arm/src/xmc4/chip/xmc4_usic.h
rename to arch/arm/src/xmc4/hardware/xmc4_usic.h
index af43e11f90..0e25807f52 100644
--- a/arch/arm/src/xmc4/chip/xmc4_usic.h
+++ b/arch/arm/src/xmc4/hardware/xmc4_usic.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/xmc4/chip/xmc4_usic.h
+ * arch/arm/src/xmc4/hardware/xmc4_usic.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,8 +49,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_XMC4_CHIP_XMC4_USIC_H
-#define __ARCH_ARM_SRC_XMC4_CHIP_XMC4_USIC_H
+#ifndef __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_USIC_H
+#define __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_USIC_H
 
 /************************************************************************************
  * Included Files
@@ -58,7 +58,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/xmc4_memorymap.h"
+#include "hardware/xmc4_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -1098,4 +1098,4 @@
 #define USIC_IN_TDATA_SHIFT         (0)      /* Bits 0-15: Transmit Data */
 #define USIC_IN_TDATA_MASK          (0xffff << USIC_IN_TDATA_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_XMC4_CHIP_XMC4_USIC_H */
+#endif /* __ARCH_ARM_SRC_XMC4_HARDWARE_XMC4_USIC_H */
diff --git a/arch/arm/src/xmc4/xmc4_clockconfig.c b/arch/arm/src/xmc4/xmc4_clockconfig.c
index e05998a9ff..9aa78bd752 100644
--- a/arch/arm/src/xmc4/xmc4_clockconfig.c
+++ b/arch/arm/src/xmc4/xmc4_clockconfig.c
@@ -56,9 +56,9 @@
 #include <nuttx/config.h>
 
 #include "up_arch.h"
-#include "chip/xmc4_scu.h"
+#include "hardware/xmc4_scu.h"
 #include "xmc4_clockconfig.h"
-#include "chip/xmc4_ports.h"
+#include "hardware/xmc4_ports.h"
 
 #include <arch/board/board.h>
 
diff --git a/arch/arm/src/xmc4/xmc4_clockutils.c b/arch/arm/src/xmc4/xmc4_clockutils.c
index 2a391ca386..9e4b3f775a 100644
--- a/arch/arm/src/xmc4/xmc4_clockutils.c
+++ b/arch/arm/src/xmc4/xmc4_clockutils.c
@@ -56,7 +56,7 @@
 #include <nuttx/config.h>
 
 #include "up_arch.h"
-#include "chip/xmc4_scu.h"
+#include "hardware/xmc4_scu.h"
 #include "xmc4_clockconfig.h"
 
 #include <arch/board/board.h>
diff --git a/arch/arm/src/xmc4/xmc4_dma.h b/arch/arm/src/xmc4/xmc4_dma.h
index 8f2edba432..8584512814 100644
--- a/arch/arm/src/xmc4/xmc4_dma.h
+++ b/arch/arm/src/xmc4/xmc4_dma.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 
-#include "chip/xmc4_dma.h"
+#include "hardware/xmc4_dma.h"
 
 /****************************************************************************
  * Pre-processor Declarations
diff --git a/arch/arm/src/xmc4/xmc4_gpio.c b/arch/arm/src/xmc4/xmc4_gpio.c
index 70bc625756..415d4da317 100644
--- a/arch/arm/src/xmc4/xmc4_gpio.c
+++ b/arch/arm/src/xmc4/xmc4_gpio.c
@@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/xmc4_ports.h"
+#include "hardware/xmc4_ports.h"
 #include "xmc4_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/xmc4/xmc4_gpio.h b/arch/arm/src/xmc4/xmc4_gpio.h
index ef6ad3b46d..1c97c60c38 100644
--- a/arch/arm/src/xmc4/xmc4_gpio.h
+++ b/arch/arm/src/xmc4/xmc4_gpio.h
@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "chip/xmc4_ports.h"
+#include "hardware/xmc4_ports.h"
 
 /****************************************************************************
  * Preprocessor Definitions
diff --git a/arch/arm/src/xmc4/xmc4_i2c.h b/arch/arm/src/xmc4/xmc4_i2c.h
index 74f8acb168..c78bacda4a 100644
--- a/arch/arm/src/xmc4/xmc4_i2c.h
+++ b/arch/arm/src/xmc4/xmc4_i2c.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/i2c/i2c_master.h>
-#include "chip/xmc4_i2c.h"
+#include "hardware/xmc4_i2c.h"
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/arch/arm/src/xmc4/xmc4_lowputc.c b/arch/arm/src/xmc4/xmc4_lowputc.c
index 5c67364463..e51cba1def 100644
--- a/arch/arm/src/xmc4/xmc4_lowputc.c
+++ b/arch/arm/src/xmc4/xmc4_lowputc.c
@@ -50,9 +50,9 @@
 #include <debug.h>
 
 #include "xmc4_config.h"
-#include "chip/xmc4_usic.h"
-#include "chip/xmc4_ports.h"
-#include "chip/xmc4_pinmux.h"
+#include "hardware/xmc4_usic.h"
+#include "hardware/xmc4_ports.h"
+#include "hardware/xmc4_pinmux.h"
 #include "xmc4_usic.h"
 #include "xmc4_gpio.h"
 #include "xmc4_lowputc.h"
diff --git a/arch/arm/src/xmc4/xmc4_serial.c b/arch/arm/src/xmc4/xmc4_serial.c
index 36a23e91d7..c74d661f1f 100644
--- a/arch/arm/src/xmc4/xmc4_serial.c
+++ b/arch/arm/src/xmc4/xmc4_serial.c
@@ -59,7 +59,7 @@
 
 #include "chip.h"
 #include "xmc4_config.h"
-#include "chip/xmc4_usic.h"
+#include "hardware/xmc4_usic.h"
 #include "xmc4_lowputc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/xmc4/xmc4_spi.c b/arch/arm/src/xmc4/xmc4_spi.c
index 1c9a0ab791..1e84a52517 100644
--- a/arch/arm/src/xmc4/xmc4_spi.c
+++ b/arch/arm/src/xmc4/xmc4_spi.c
@@ -66,9 +66,9 @@
 #include "xmc4_gpio.h"
 #include "xmc4_spi.h"
 #include "xmc4_usic.h"
-#include "chip/xmc4_spi.h"
-#include "chip/xmc4_usic.h"
-#include "chip/xmc4_pinmux.h"
+#include "hardware/xmc4_spi.h"
+#include "hardware/xmc4_usic.h"
+#include "hardware/xmc4_pinmux.h"
 
 #if defined(CONFIG_XMC4_SPI0) || defined(CONFIG_XMC4_SPI1) || \
     defined(CONFIG_XMC4_SPI2) || defined(CONFIG_XMC4_SPI3) || \
diff --git a/arch/arm/src/xmc4/xmc4_spi.h b/arch/arm/src/xmc4/xmc4_spi.h
index 03a4efcc50..eae9d47ad3 100644
--- a/arch/arm/src/xmc4/xmc4_spi.h
+++ b/arch/arm/src/xmc4/xmc4_spi.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/xmc4_usic.h"
+#include "hardware/xmc4_usic.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/xmc4/xmc4_start.c b/arch/arm/src/xmc4/xmc4_start.c
index 87c4727a34..8c1a028e84 100644
--- a/arch/arm/src/xmc4/xmc4_start.c
+++ b/arch/arm/src/xmc4/xmc4_start.c
@@ -49,7 +49,7 @@
 #include "nvic.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "chip/xmc4_flash.h"
+#include "hardware/xmc4_flash.h"
 
 #include "xmc4_clockconfig.h"
 #include "xmc4_lowputc.h"
diff --git a/arch/arm/src/xmc4/xmc4_usic.c b/arch/arm/src/xmc4/xmc4_usic.c
index 925c9c0f41..5327066587 100644
--- a/arch/arm/src/xmc4/xmc4_usic.c
+++ b/arch/arm/src/xmc4/xmc4_usic.c
@@ -61,8 +61,8 @@
 #include <arch/xmc4/chip.h>
 
 #include "up_arch.h"
-#include "chip/xmc4_usic.h"
-#include "chip/xmc4_scu.h"
+#include "hardware/xmc4_usic.h"
+#include "hardware/xmc4_scu.h"
 #include "xmc4_clockconfig.h"
 #include "xmc4_usic.h"