diff --git a/src/mainboard/emulation/qemu-power8/bootblock.c b/src/mainboard/emulation/qemu-power8/bootblock.c
index ec30c879f1..d59ab37351 100644
--- a/src/mainboard/emulation/qemu-power8/bootblock.c
+++ b/src/mainboard/emulation/qemu-power8/bootblock.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <bootblock_common.h>
 #include <console/console.h>
 #include <program_loading.h>
 
diff --git a/src/mainboard/google/cheza/mainboard.c b/src/mainboard/google/cheza/mainboard.c
index 7a19d32e9c..804906a37a 100644
--- a/src/mainboard/google/cheza/mainboard.c
+++ b/src/mainboard/google/cheza/mainboard.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/device.h>
-#include <bootblock_common.h>
 #include <gpio.h>
 #include <soc/usb.h>
 
diff --git a/src/mainboard/google/mistral/mainboard.c b/src/mainboard/google/mistral/mainboard.c
index d50758c9e3..e36a1c70a7 100644
--- a/src/mainboard/google/mistral/mainboard.c
+++ b/src/mainboard/google/mistral/mainboard.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/device.h>
-#include <bootblock_common.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <soc/usb.h>
 
diff --git a/src/mainboard/google/trogdor/mainboard.c b/src/mainboard/google/trogdor/mainboard.c
index 63fac19984..0dd26243a8 100644
--- a/src/mainboard/google/trogdor/mainboard.c
+++ b/src/mainboard/google/trogdor/mainboard.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <bootblock_common.h>
 #include <device/device.h>
 #include <device/mmio.h>
 #include <gpio.h>
diff --git a/src/soc/intel/apollolake/fspcar.c b/src/soc/intel/apollolake/fspcar.c
index a284116bac..40bacd7ad2 100644
--- a/src/soc/intel/apollolake/fspcar.c
+++ b/src/soc/intel/apollolake/fspcar.c
@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <bootblock_common.h>
+
 #include <FsptUpd.h>
 
 const FSPT_UPD temp_ram_init_params = {
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c
index 96218f4ba4..6294b8adf3 100644
--- a/src/soc/intel/broadwell/romstage/romstage.c
+++ b/src/soc/intel/broadwell/romstage/romstage.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <arch/cbfs.h>
 #include <arch/romstage.h>
-#include <bootblock_common.h>
 #include <bootmode.h>
 #include <cbmem.h>
 #include <console/console.h>