diff --git a/src/mainboard/kontron/bsl6/Makefile.inc b/src/mainboard/kontron/bsl6/Makefile.inc
index 1e12ee479b..49c9a6c570 100644
--- a/src/mainboard/kontron/bsl6/Makefile.inc
+++ b/src/mainboard/kontron/bsl6/Makefile.inc
@@ -1,5 +1,7 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
+
 bootblock-y += bootblock.c
 
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
diff --git a/src/mainboard/kontron/bsl6/gpio.h b/src/mainboard/kontron/bsl6/include/mainboard/gpio.h
similarity index 100%
rename from src/mainboard/kontron/bsl6/gpio.h
rename to src/mainboard/kontron/bsl6/include/mainboard/gpio.h
diff --git a/src/mainboard/kontron/bsl6/variant.h b/src/mainboard/kontron/bsl6/include/variant.h
similarity index 100%
rename from src/mainboard/kontron/bsl6/variant.h
rename to src/mainboard/kontron/bsl6/include/variant.h
diff --git a/src/mainboard/kontron/bsl6/ramstage.c b/src/mainboard/kontron/bsl6/ramstage.c
index 2664a4ff82..b26c62fc85 100644
--- a/src/mainboard/kontron/bsl6/ramstage.c
+++ b/src/mainboard/kontron/bsl6/ramstage.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <soc/ramstage.h>
-#include "gpio.h"
+#include <mainboard/gpio.h>
 
 void mainboard_silicon_init_params(FSP_SIL_UPD *params)
 {
diff --git a/src/mainboard/kontron/bsl6/romstage.c b/src/mainboard/kontron/bsl6/romstage.c
index 9d9169c0d2..0cb7b06375 100644
--- a/src/mainboard/kontron/bsl6/romstage.c
+++ b/src/mainboard/kontron/bsl6/romstage.c
@@ -8,8 +8,7 @@
 #include <soc/romstage.h>
 #include <fsp/soc_binding.h>
 #include <pc80/mc146818rtc.h>
-
-#include "variant.h"
+#include <variant.h>
 
 /* Rcomp resistor */
 static const u16 rcomp_resistors[3] = { 121, 75, 100 };
diff --git a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c
index 9c14d84ea7..f1409e0b42 100644
--- a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c
+++ b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c
@@ -5,8 +5,7 @@
 #include <console/console.h>
 #include <pc80/mc146818rtc.h>
 #include <fsp/soc_binding.h>
-
-#include "../../variant.h"
+#include <variant.h>
 
 void variant_memory_init_params(FSPM_UPD *const mupd)
 {
diff --git a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c
index 8b32bf5bf6..c9122c1c24 100644
--- a/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c
+++ b/src/mainboard/kontron/bsl6/variants/bsl6/romstage.c
@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <fsp/soc_binding.h>
-
-#include "../../variant.h"
+#include <variant.h>
 
 void variant_memory_init_params(FSPM_UPD *const mupd)
 {