diff --git a/src/mainboard/google/brya/bootblock.c b/src/mainboard/google/brya/bootblock.c
index 6576469c9c..ac0dc32da8 100644
--- a/src/mainboard/google/brya/bootblock.c
+++ b/src/mainboard/google/brya/bootblock.c
@@ -3,10 +3,10 @@
 #include <baseboard/variants.h>
 #include <bootblock_common.h>
 #include <console/console.h>
-#include <intelblocks/mp_init.h>
 #include <fmap.h>
 #include <commonlib/region.h>
 #include <console/console.h>
+#include <cpu/intel/cpu_ids.h>
 #include <intelblocks/pmclib.h>
 #include <cf9_reset.h>
 
diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c
index 1387716298..a29b9f37ca 100644
--- a/src/mainboard/google/poppy/variants/nami/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c
@@ -6,10 +6,10 @@
 #include <cbfs.h>
 #include <chip.h>
 #include <console/console.h>
+#include <cpu/intel/cpu_ids.h>
 #include <device/device.h>
 #include <drivers/intel/gma/opregion.h>
 #include <ec/google/chromeec/ec.h>
-#include <intelblocks/mp_init.h>
 #include <intelblocks/power_limit.h>
 #include <smbios.h>
 #include <soc/ramstage.h>
diff --git a/src/mainboard/intel/adlrvp/bootblock.c b/src/mainboard/intel/adlrvp/bootblock.c
index 76fee80006..60dee1ab05 100644
--- a/src/mainboard/intel/adlrvp/bootblock.c
+++ b/src/mainboard/intel/adlrvp/bootblock.c
@@ -6,8 +6,8 @@
 #include <cf9_reset.h>
 #include <commonlib/region.h>
 #include <console/console.h>
+#include <cpu/intel/cpu_ids.h>
 #include <fmap.h>
-#include <intelblocks/mp_init.h>
 #include <intelblocks/pmclib.h>
 
 #define SI_DESC_REGION		"SI_DESC"