diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/ramstage.c b/src/mainboard/starlabs/byte_adl/variants/mk_ii/ramstage.c
index e70ba50498..3e9cfb13c4 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/ramstage.c
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/ramstage.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <soc/ramstage.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/common/Makefile.mk b/src/mainboard/starlabs/common/Makefile.mk
index 3329eb0554..ba007bfa25 100644
--- a/src/mainboard/starlabs/common/Makefile.mk
+++ b/src/mainboard/starlabs/common/Makefile.mk
@@ -2,3 +2,5 @@
 
 subdirs-$(CONFIG_VENDOR_STARLABS) += smbios
 subdirs-$(CONFIG_VENDOR_STARLABS) += pin_mux
+
+CPPFLAGS_common += -I$(src)/mainboard/starlabs/common/include
diff --git a/src/mainboard/starlabs/common/pin_mux/pin_mux.h b/src/mainboard/starlabs/common/include/common/pin_mux.h
similarity index 59%
rename from src/mainboard/starlabs/common/pin_mux/pin_mux.h
rename to src/mainboard/starlabs/common/include/common/pin_mux.h
index 38c77f4032..7ecf11c80f 100644
--- a/src/mainboard/starlabs/common/pin_mux/pin_mux.h
+++ b/src/mainboard/starlabs/common/include/common/pin_mux.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef PIN_MUX
-#define PIN_MUX
+#ifndef _STARLABS_CMN_PIN_MUX_H_
+#define _STARLABS_CMN_PIN_MUX_H_
 
 void configure_pin_mux(FSP_S_CONFIG *supd);
 
diff --git a/src/mainboard/starlabs/common/pin_mux/Makefile.mk b/src/mainboard/starlabs/common/pin_mux/Makefile.mk
index 2249df0b3c..73374dac50 100644
--- a/src/mainboard/starlabs/common/pin_mux/Makefile.mk
+++ b/src/mainboard/starlabs/common/pin_mux/Makefile.mk
@@ -3,5 +3,3 @@
 ramstage-$(CONFIG_SOC_INTEL_TIGERLAKE) += tigerlake.c
 ramstage-$(CONFIG_SOC_INTEL_ALDERLAKE) += alderlake.c
 ramstage-$(CONFIG_SOC_INTEL_METEORLAKE) += meteorlake.c
-
-CPPFLAGS_common += -I$(src)/mainboard/starlabs/common/pin_mux
diff --git a/src/mainboard/starlabs/common/pin_mux/alderlake.c b/src/mainboard/starlabs/common/pin_mux/alderlake.c
index 1869b631e0..a0fac4d650 100644
--- a/src/mainboard/starlabs/common/pin_mux/alderlake.c
+++ b/src/mainboard/starlabs/common/pin_mux/alderlake.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <fsp/api.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void configure_pin_mux(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/common/pin_mux/meteorlake.c b/src/mainboard/starlabs/common/pin_mux/meteorlake.c
index 37d1f4aa1a..094f002fa4 100644
--- a/src/mainboard/starlabs/common/pin_mux/meteorlake.c
+++ b/src/mainboard/starlabs/common/pin_mux/meteorlake.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <fsp/api.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void configure_pin_mux(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/common/pin_mux/tigerlake.c b/src/mainboard/starlabs/common/pin_mux/tigerlake.c
index 34c1a05b90..1553ae55b4 100644
--- a/src/mainboard/starlabs/common/pin_mux/tigerlake.c
+++ b/src/mainboard/starlabs/common/pin_mux/tigerlake.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <fsp/api.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void configure_pin_mux(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/starbook/variants/adl/ramstage.c b/src/mainboard/starlabs/starbook/variants/adl/ramstage.c
index e6828e23ca..1dbad4fc98 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/ramstage.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/ramstage.c
@@ -2,7 +2,7 @@
 
 #include <option.h>
 #include <soc/ramstage.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/ramstage.c b/src/mainboard/starlabs/starbook/variants/adl_n/ramstage.c
index e70ba50498..3e9cfb13c4 100644
--- a/src/mainboard/starlabs/starbook/variants/adl_n/ramstage.c
+++ b/src/mainboard/starlabs/starbook/variants/adl_n/ramstage.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <soc/ramstage.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/starbook/variants/mtl/ramstage.c b/src/mainboard/starlabs/starbook/variants/mtl/ramstage.c
index 423716531a..bfac74f5ee 100644
--- a/src/mainboard/starlabs/starbook/variants/mtl/ramstage.c
+++ b/src/mainboard/starlabs/starbook/variants/mtl/ramstage.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <soc/ramstage.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/ramstage.c b/src/mainboard/starlabs/starbook/variants/rpl/ramstage.c
index e30afaa5ca..6ffe593f7f 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/ramstage.c
+++ b/src/mainboard/starlabs/starbook/variants/rpl/ramstage.c
@@ -2,7 +2,7 @@
 
 #include <option.h>
 #include <soc/ramstage.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/starbook/variants/tgl/ramstage.c b/src/mainboard/starlabs/starbook/variants/tgl/ramstage.c
index e70ba50498..3e9cfb13c4 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/ramstage.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/ramstage.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <soc/ramstage.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c b/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c
index e30afaa5ca..6ffe593f7f 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/ramstage.c
@@ -2,7 +2,7 @@
 
 #include <option.h>
 #include <soc/ramstage.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/ramstage.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/ramstage.c
index 211384c1ef..370f5c8769 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/ramstage.c
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/ramstage.c
@@ -3,7 +3,7 @@
 #include <drivers/intel/gma/opregion.h>
 #include <soc/ramstage.h>
 #include <option.h>
-#include "pin_mux.h"
+#include <common/pin_mux.h>
 
 void mainboard_silicon_init_params(FSP_S_CONFIG *supd)
 {