diff --git a/boards/arm/96b_avenger96/pinmux.c b/boards/arm/96b_avenger96/pinmux.c
index 7ca4f96350b..6a8a350712f 100644
--- a/boards/arm/96b_avenger96/pinmux.c
+++ b/boards/arm/96b_avenger96/pinmux.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 
 #include <pinmux/stm32/pinmux_stm32.h>
 
diff --git a/boards/arm/mps2_an521/pinmux.c b/boards/arm/mps2_an521/pinmux.c
index b5dec5fb33c..3e39f03f511 100644
--- a/boards/arm/mps2_an521/pinmux.c
+++ b/boards/arm/mps2_an521/pinmux.c
@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <pinmux.h>
 #include <soc.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 #include <gpio/gpio_cmsdk_ahb.h>
 
 #include "pinmux/pinmux.h"
diff --git a/boards/arm/nucleo_g071rb/pinmux.c b/boards/arm/nucleo_g071rb/pinmux.c
index db93920cd52..f04db787364 100644
--- a/boards/arm/nucleo_g071rb/pinmux.c
+++ b/boards/arm/nucleo_g071rb/pinmux.c
@@ -9,7 +9,7 @@
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
-#include <sys_io.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 3c2ce856ea2..649bb209213 100644
--- a/boards/arm/stm32f030_demo/pinmux.c
+++ b/boards/arm/stm32f030_demo/pinmux.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 #include "pinmux/pinmux.h"
 
 #include "pinmux/stm32/pinmux_stm32.h"
diff --git a/boards/arm/stm32h747i_disco/pinmux.c b/boards/arm/stm32h747i_disco/pinmux.c
index fab734645a1..d37c51091a2 100644
--- a/boards/arm/stm32h747i_disco/pinmux.c
+++ b/boards/arm/stm32h747i_disco/pinmux.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <init.h>
 #include <drivers/pinmux.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 
 #include <pinmux/stm32/pinmux_stm32.h>
 
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
index e45cc1f4f8d..30cf3c0eec9 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(ieee802154_cc13xx_cc26xx);
 #include <net/net_pkt.h>
 #include <random/rand32.h>
 #include <string.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 
 #include <driverlib/aon_rtc.h>
 #include <driverlib/osc.h>
diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c
index 2ee326d0fbd..1db3017a1de 100644
--- a/drivers/serial/uart_xlnx_ps.c
+++ b/drivers/serial/uart_xlnx_ps.c
@@ -30,7 +30,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <uart.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 
 #define XUARTPS_CR_OFFSET	0x0000U  /**< Control Register [8:0] */
 #define XUARTPS_MR_OFFSET	0x0004U  /**< Mode Register [9:0] */
diff --git a/drivers/spi/spi_oc_simple.c b/drivers/spi/spi_oc_simple.c
index 8dfc7b9e170..4bf890a10f8 100644
--- a/drivers/spi/spi_oc_simple.c
+++ b/drivers/spi/spi_oc_simple.c
@@ -8,7 +8,7 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(spi_oc_simple);
 
-#include <sys_io.h>
+#include <sys/sys_io.h>
 #include <spi.h>
 
 #include "spi_context.h"
diff --git a/soc/arm/microchip_mec/mec1501/device_power.c b/soc/arm/microchip_mec/mec1501/device_power.c
index aa2c5a13f0b..08c73e13b6b 100644
--- a/soc/arm/microchip_mec/mec1501/device_power.c
+++ b/soc/arm/microchip_mec/mec1501/device_power.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 #include <sys/__assert.h>
 #include <power.h>
 #include <soc.h>
diff --git a/soc/arm/microchip_mec/mec1501/power.c b/soc/arm/microchip_mec/mec1501/power.c
index 049b1de9713..cc8e0704fe2 100644
--- a/soc/arm/microchip_mec/mec1501/power.c
+++ b/soc/arm/microchip_mec/mec1501/power.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr.h>
-#include <sys_io.h>
+#include <sys/sys_io.h>
 #include <sys/__assert.h>
 #include <power.h>
 #include <soc.h>