diff --git a/src/mainboard/kontron/mal10/Makefile.inc b/src/mainboard/kontron/mal10/Makefile.inc
index 885786fc55..7fbab00337 100644
--- a/src/mainboard/kontron/mal10/Makefile.inc
+++ b/src/mainboard/kontron/mal10/Makefile.inc
@@ -3,7 +3,5 @@ ramstage-y += ramstage.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads
 
 subdirs-y += variants/$(VARIANT_DIR)
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
-
 subdirs-y += carriers/$(CARRIER_DIR)
-CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/carriers/$(CARRIER_DIR)/include
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
diff --git a/src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h b/src/mainboard/kontron/mal10/include/carrier/gpio.h
similarity index 91%
rename from src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h
rename to src/mainboard/kontron/mal10/include/carrier/gpio.h
index 9c9c8edc83..b8606f62a1 100644
--- a/src/mainboard/kontron/mal10/carriers/t10-tni/include/carrier/gpio.h
+++ b/src/mainboard/kontron/mal10/include/carrier/gpio.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef T10_TNI_CFG_GPIO_H
-#define T10_TNI_CFG_GPIO_H
+#ifndef CARRIER_GPIO_H
+#define CARRIER_GPIO_H
 
 #include <gpio.h>
 #include <stddef.h>
@@ -29,4 +29,4 @@
 
 void carrier_gpio_configure(void);
 
-#endif /* T10_TNI_CFG_GPIO_H */
+#endif /* CARRIER_GPIO_H */
diff --git a/src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h b/src/mainboard/kontron/mal10/include/variant/gpio.h
similarity index 60%
rename from src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h
rename to src/mainboard/kontron/mal10/include/variant/gpio.h
index d97e199fb8..99cf35a037 100644
--- a/src/mainboard/kontron/mal10/variants/mal10/include/variant/gpio.h
+++ b/src/mainboard/kontron/mal10/include/variant/gpio.h
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef MAL_10_CFG_GPIO_H
-#define MAL_10_CFG_GPIO_H
+#ifndef VARIANT_GPIO_H
+#define VARIANT_GPIO_H
 
 #include <gpio.h>
 #include <stddef.h>
 
 void variant_early_gpio_configure(void);
 
-#endif /* MAL_10_CFG_GPIO_H */
+#endif /* VARIANT_GPIO_H */