diff --git a/boards/arm/96b_avenger96/pinmux.c b/boards/arm/96b_avenger96/pinmux.c
index 6a8a350712f..4d1f352c362 100644
--- a/boards/arm/96b_avenger96/pinmux.c
+++ b/boards/arm/96b_avenger96/pinmux.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <sys/sys_io.h>
 
 #include <pinmux/stm32/pinmux_stm32.h>
diff --git a/boards/arm/96b_wistrio/pinmux.c b/boards/arm/96b_wistrio/pinmux.c
index 25c44c330a8..c0248b377e0 100644
--- a/boards/arm/96b_wistrio/pinmux.c
+++ b/boards/arm/96b_wistrio/pinmux.c
@@ -8,7 +8,7 @@
 #include <drivers/gpio.h>
 #include <init.h>
 #include <kernel.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <sys/sys_io.h>
 
 #include <pinmux/stm32/pinmux_stm32.h>
diff --git a/boards/arm/cc3235sf_launchxl/pinmux.c b/boards/arm/cc3235sf_launchxl/pinmux.c
index 0b4926fee92..b2d6d16b9a5 100644
--- a/boards/arm/cc3235sf_launchxl/pinmux.c
+++ b/boards/arm/cc3235sf_launchxl/pinmux.c
@@ -32,7 +32,7 @@
 
 #include <init.h>
 
-#include "pinmux.h"
+#include <drivers/pinmux.h>
 
 #include <inc/hw_types.h>
 #include <inc/hw_memmap.h>
diff --git a/boards/arm/frdm_k22f/pinmux.c b/boards/arm/frdm_k22f/pinmux.c
index fde0f6c6742..33869f1c596 100644
--- a/boards/arm/frdm_k22f/pinmux.c
+++ b/boards/arm/frdm_k22f/pinmux.c
@@ -5,7 +5,7 @@
  */
 
 #include <init.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <fsl_port.h>
 
 static int frdm_k22f_pinmux_init(struct device *dev)
diff --git a/boards/arm/frdm_k82f/pinmux.c b/boards/arm/frdm_k82f/pinmux.c
index e99ca5255ae..e983facd237 100644
--- a/boards/arm/frdm_k82f/pinmux.c
+++ b/boards/arm/frdm_k82f/pinmux.c
@@ -5,7 +5,7 @@
  */
 
 #include <init.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <fsl_port.h>
 
 static int frdm_k82f_pinmux_init(struct device *dev)
diff --git a/boards/arm/mps2_an521/pinmux.c b/boards/arm/mps2_an521/pinmux.c
index 3e39f03f511..fe31c2c41ab 100644
--- a/boards/arm/mps2_an521/pinmux.c
+++ b/boards/arm/mps2_an521/pinmux.c
@@ -7,7 +7,7 @@
 #include <device.h>
 #include <init.h>
 #include <kernel.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <soc.h>
 #include <sys/sys_io.h>
 #include <gpio/gpio_cmsdk_ahb.h>
diff --git a/boards/arm/nucleo_g071rb/pinmux.c b/boards/arm/nucleo_g071rb/pinmux.c
index f04db787364..b1cd55f0b81 100644
--- a/boards/arm/nucleo_g071rb/pinmux.c
+++ b/boards/arm/nucleo_g071rb/pinmux.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <sys/sys_io.h>
 
 #include <pinmux/stm32/pinmux_stm32.h>
diff --git a/boards/arm/stm32f030_demo/pinmux.c b/boards/arm/stm32f030_demo/pinmux.c
index 649bb209213..891bf6b57de 100644
--- a/boards/arm/stm32f030_demo/pinmux.c
+++ b/boards/arm/stm32f030_demo/pinmux.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <sys/sys_io.h>
 #include "pinmux/pinmux.h"
 
diff --git a/boards/arm/twr_kv58f220m/pinmux.c b/boards/arm/twr_kv58f220m/pinmux.c
index 3f63112b36a..17fb699a3a0 100644
--- a/boards/arm/twr_kv58f220m/pinmux.c
+++ b/boards/arm/twr_kv58f220m/pinmux.c
@@ -5,7 +5,7 @@
  */
 
 #include <init.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <fsl_port.h>
 
 static int twr_kv58f220m_pinmux_init(struct device *dev)