diff --git a/src/northbridge/intel/gm45/bootblock.c b/src/northbridge/intel/gm45/bootblock.c
index e2cabdb166..a9a1e8eb2d 100644
--- a/src/northbridge/intel/gm45/bootblock.c
+++ b/src/northbridge/intel/gm45/bootblock.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/bootblock.h>
-#include <arch/pci_io_cfg.h>
 #include <assert.h>
+#include <device/pci_ops.h>
 #include <types.h>
 
 #include "gm45.h"
diff --git a/src/northbridge/intel/haswell/bootblock.c b/src/northbridge/intel/haswell/bootblock.c
index 0bb8ae2aad..1336582889 100644
--- a/src/northbridge/intel/haswell/bootblock.c
+++ b/src/northbridge/intel/haswell/bootblock.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/bootblock.h>
-#include <arch/pci_io_cfg.h>
 #include <assert.h>
+#include <device/pci_ops.h>
 #include <types.h>
 
 #include "haswell.h"
diff --git a/src/northbridge/intel/i945/bootblock.c b/src/northbridge/intel/i945/bootblock.c
index edb9a8d4d0..448d5e411a 100644
--- a/src/northbridge/intel/i945/bootblock.c
+++ b/src/northbridge/intel/i945/bootblock.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/bootblock.h>
-#include <arch/pci_io_cfg.h>
 #include <assert.h>
+#include <device/pci_ops.h>
 #include <types.h>
 
 #include "i945.h"
diff --git a/src/northbridge/intel/ironlake/bootblock.c b/src/northbridge/intel/ironlake/bootblock.c
index 02b63a64b3..6610a3e38c 100644
--- a/src/northbridge/intel/ironlake/bootblock.c
+++ b/src/northbridge/intel/ironlake/bootblock.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/bootblock.h>
-#include <arch/pci_io_cfg.h>
 #include <assert.h>
+#include <device/pci_ops.h>
 #include <types.h>
 
 #include "ironlake.h"
diff --git a/src/northbridge/intel/sandybridge/bootblock.c b/src/northbridge/intel/sandybridge/bootblock.c
index 92f9aeee49..1eba74438c 100644
--- a/src/northbridge/intel/sandybridge/bootblock.c
+++ b/src/northbridge/intel/sandybridge/bootblock.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/bootblock.h>
-#include <arch/pci_io_cfg.h>
 #include <assert.h>
+#include <device/pci_ops.h>
 #include <types.h>
 
 #include "sandybridge.h"
diff --git a/src/northbridge/intel/x4x/bootblock.c b/src/northbridge/intel/x4x/bootblock.c
index aedcdd9089..f15d181354 100644
--- a/src/northbridge/intel/x4x/bootblock.c
+++ b/src/northbridge/intel/x4x/bootblock.c
@@ -2,8 +2,8 @@
 
 #include <arch/bootblock.h>
 #include <arch/mmio.h>
-#include <arch/pci_io_cfg.h>
 #include <assert.h>
+#include <device/pci_ops.h>
 #include <types.h>
 
 #include "x4x.h"