diff --git a/arch/arm/src/xmc4/chip/xmc4_flash.h b/arch/arm/src/xmc4/chip/xmc4_flash.h
index 37afed16a2e..0432e465b0a 100644
--- a/arch/arm/src/xmc4/chip/xmc4_flash.h
+++ b/arch/arm/src/xmc4/chip/xmc4_flash.h
@@ -58,6 +58,8 @@
 
 #include <nuttx/config.h>
 
+#include "chip/xmc4_memorymap.h"
+
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
diff --git a/arch/arm/src/xmc4/chip/xmc4_usic.h b/arch/arm/src/xmc4/chip/xmc4_usic.h
index 1b3c4d2bdca..8b91e88583a 100644
--- a/arch/arm/src/xmc4/chip/xmc4_usic.h
+++ b/arch/arm/src/xmc4/chip/xmc4_usic.h
@@ -58,6 +58,8 @@
 
 #include <nuttx/config.h>
 
+#include "chip/xmc4_memorymap.h"
+
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
diff --git a/arch/arm/src/xmc4/xmc4_gpio.h b/arch/arm/src/xmc4/xmc4_gpio.h
index c1bf09b87bd..49b80ba1968 100644
--- a/arch/arm/src/xmc4/xmc4_gpio.h
+++ b/arch/arm/src/xmc4/xmc4_gpio.h
@@ -142,9 +142,9 @@
 
 /* See chip/xmc4_ports.h for the PDR definitions */
 
-#  define GPIO_PINCTRL_SOFTWARE    (HWSEL_SW         << GPIO_PINCTRL_SHIFT)
-#  define GPIO_PINCTRL_HW0         (HWSEL_HW0        << GPIO_PINCTRL_SHIFT)
-#  define GPIO_PINCTRL_HW1         (HWSEL_HW1        << GPIO_PINCTRL_SHIFT)
+#  define GPIO_PINCTRL_SOFTWARE    (HWSEL_SW               << GPIO_PINCTRL_SHIFT)
+#  define GPIO_PINCTRL_HW0         (HWSEL_HW0              << GPIO_PINCTRL_SHIFT)
+#  define GPIO_PINCTRL_HW1         (HWSEL_HW1              << GPIO_PINCTRL_SHIFT)
 
 /* If the pin is an GPIO output, then this identifies the initial output value:
  *