diff --git a/src/mainboard/hp/snb_ivb_desktops/mainboard.c b/src/mainboard/hp/snb_ivb_desktops/mainboard.c
index 75dc3302a5..22f0e2692b 100644
--- a/src/mainboard/hp/snb_ivb_desktops/mainboard.c
+++ b/src/mainboard/hp/snb_ivb_desktops/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <device/device.h>
 #include <drivers/intel/gma/int15.h>
-#include <southbridge/intel/bd82x6x/pch.h>
 #include <smbios.h>
 
 #if CONFIG(GENERATE_SMBIOS_TABLES)
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_sff/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_sff/early_init.c
index 8d10c6317c..aace18dfa8 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_sff/early_init.c
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_sff/early_init.c
@@ -3,7 +3,6 @@
 #include <bootblock_common.h>
 #include <superio/nuvoton/npcd378/npcd378.h>
 #include <superio/nuvoton/common/nuvoton.h>
-#include <southbridge/intel/bd82x6x/pch.h>
 
 #define SERIAL_DEV PNP_DEV(0x2e, NPCD378_SP2)
 
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_usdt/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_usdt/early_init.c
index d2d9762dab..40b3f3e427 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_usdt/early_init.c
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8200_elite_usdt/early_init.c
@@ -3,7 +3,6 @@
 #include <bootblock_common.h>
 #include <superio/nuvoton/npcd378/npcd378.h>
 #include <superio/nuvoton/common/nuvoton.h>
-#include <southbridge/intel/bd82x6x/pch.h>
 
 #define SERIAL_DEV PNP_DEV(0x2e, NPCD378_SP2)
 
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/early_init.c
index 8d10c6317c..aace18dfa8 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/early_init.c
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_8300_elite_sff/early_init.c
@@ -3,7 +3,6 @@
 #include <bootblock_common.h>
 #include <superio/nuvoton/npcd378/npcd378.h>
 #include <superio/nuvoton/common/nuvoton.h>
-#include <southbridge/intel/bd82x6x/pch.h>
 
 #define SERIAL_DEV PNP_DEV(0x2e, NPCD378_SP2)
 
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/early_init.c b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/early_init.c
index 889da054bf..c7c207a4ad 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/early_init.c
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/compaq_elite_8300_usdt/early_init.c
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <superio/nuvoton/npcd378/npcd378.h>
-#include <superio/nuvoton/common/nuvoton.h>
 #include <device/pci_ops.h>
 
 void bootblock_mainboard_early_init(void)