5 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/google/dedede/fw_config.c b/src/mainboard/google/dedede/fw_config.c
index 7e5d8fa2e2..d176283c2a 100644
--- a/src/mainboard/google/dedede/fw_config.c
+++ b/src/mainboard/google/dedede/fw_config.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/mmio.h>
 #include <bootstate.h>
+#include <device/mmio.h>
 #include <fw_config.h>
 #include <gpio.h>
 #include <intelblocks/gpio.h>
diff --git a/src/mainboard/google/dedede/variants/bugzzy/ramstage.c b/src/mainboard/google/dedede/variants/bugzzy/ramstage.c
index 7844b6e360..8fb448dd45 100644
--- a/src/mainboard/google/dedede/variants/bugzzy/ramstage.c
+++ b/src/mainboard/google/dedede/variants/bugzzy/ramstage.c
@@ -1,13 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <bootmode.h>
 #include <bootstate.h>
-#include <arch/mmio.h>
 #include <delay.h>
-#include <bootmode.h>
 #include <device/device.h>
+#include <device/mmio.h>
 #include <device/pci.h>
-#include <soc/pci_devs.h>
 #include <drivers/intel/gma/i915_reg.h>
+#include <soc/pci_devs.h>
 
 static void panel_power_on(uintptr_t igd_bar)
 {
diff --git a/src/mainboard/protectli/vault_bsw/mainboard.c b/src/mainboard/protectli/vault_bsw/mainboard.c
index 3c9c45c476..ec4f81635e 100644
--- a/src/mainboard/protectli/vault_bsw/mainboard.c
+++ b/src/mainboard/protectli/vault_bsw/mainboard.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <arch/mmio.h>
 #include <device/device.h>
+#include <device/mmio.h>
 #include <soc/iomap.h>
 
 #define BIOS_CONTROL_REG	0xFC
diff --git a/src/mainboard/scaleway/tagada/hsio.c b/src/mainboard/scaleway/tagada/hsio.c
index d305427f02..d6fb676ba0 100644
--- a/src/mainboard/scaleway/tagada/hsio.c
+++ b/src/mainboard/scaleway/tagada/hsio.c
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/mmio.h>
 #include <console/console.h>
-#include <hsio.h>
+#include <device/mmio.h>
+#include <fast_spi_def.h>
 #include <gpio_defs.h>
+#include <hsio.h>
 #include <soc/fiamux.h>
 #include <string.h>
-#include <fast_spi_def.h>
 
 #ifdef __RAMSTAGE__
 static void update_hsio_info_for_m2_slots(size_t num_of_entry, BL_HSIO_INFORMATION *config)
diff --git a/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c b/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c
index 7befa4a9db..506bcc6824 100644
--- a/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c
+++ b/src/mainboard/siemens/mc_ehl/romstage_fsp_params.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/mmio.h>
 #include <baseboard/variants.h>
 #include <console/console.h>
 #include <device/dram/common.h>
+#include <device/mmio.h>
 #include <hwilib.h>
 #include <soc/meminit.h>
 #include <soc/romstage.h>