diff --git a/src/mainboard/lenovo/t420s/smihandler.c b/src/mainboard/lenovo/t420s/smihandler.c
index c34cb5b313..578aee8bfa 100644
--- a/src/mainboard/lenovo/t420s/smihandler.c
+++ b/src/mainboard/lenovo/t420s/smihandler.c
@@ -20,13 +20,8 @@
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
-#include <delay.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-#include <southbridge/intel/bd82x6x/me.h>
 #include <southbridge/intel/common/pmutil.h>
-#include <northbridge/intel/sandybridge/sandybridge.h>
-#include <cpu/intel/model_206ax/model_206ax.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
@@ -111,7 +106,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 
 	if (slp_typ == 3) {
 		u8 ec_wake = ec_read(0x32);
-		/* If EC wake events are enabled, enable wake on EC WAKE GPE.  */
+		/* If EC wake events are enabled, enable wake on EC WAKE GPE. */
 		if (ec_wake & 0x14) {
 			/* Redirect EC WAKE GPE to SCI.  */
 			gpi_route_interrupt(GPE_EC_WAKE, GPI_IS_SCI);
diff --git a/src/mainboard/lenovo/t430/smihandler.c b/src/mainboard/lenovo/t430/smihandler.c
index 120d9a09bf..286f07a3ae 100644
--- a/src/mainboard/lenovo/t430/smihandler.c
+++ b/src/mainboard/lenovo/t430/smihandler.c
@@ -20,7 +20,6 @@
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
-#include <delay.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/pmutil.h>
 
@@ -77,7 +76,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 		h8_usb_always_on();
 
 		u8 ec_wake = ec_read(0x32);
-		/* If EC wake events are enabled, enable wake on EC WAKE GPE.  */
+		/* If EC wake events are enabled, enable wake on EC WAKE GPE. */
 		if (ec_wake & 0x14) {
 			/* Redirect EC WAKE GPE to SCI.  */
 			gpi_route_interrupt(GPE_EC_WAKE, GPI_IS_SCI);
diff --git a/src/mainboard/lenovo/t430s/smihandler.c b/src/mainboard/lenovo/t430s/smihandler.c
index 1313eac2a5..79679dcf42 100644
--- a/src/mainboard/lenovo/t430s/smihandler.c
+++ b/src/mainboard/lenovo/t430s/smihandler.c
@@ -20,12 +20,8 @@
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-#include <southbridge/intel/bd82x6x/me.h>
 #include <southbridge/intel/common/pmutil.h>
-#include <northbridge/intel/sandybridge/sandybridge.h>
-#include <cpu/intel/model_206ax/model_206ax.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
diff --git a/src/mainboard/lenovo/t520/smihandler.c b/src/mainboard/lenovo/t520/smihandler.c
index 4e61a98be7..2c50e2339c 100644
--- a/src/mainboard/lenovo/t520/smihandler.c
+++ b/src/mainboard/lenovo/t520/smihandler.c
@@ -20,13 +20,8 @@
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
-#include <delay.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-#include <southbridge/intel/bd82x6x/me.h>
 #include <southbridge/intel/common/pmutil.h>
-#include <northbridge/intel/sandybridge/sandybridge.h>
-#include <cpu/intel/model_206ax/model_206ax.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
@@ -111,7 +106,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 
 	if (slp_typ == 3) {
 		u8 ec_wake = ec_read(0x32);
-		/* If EC wake events are enabled, enable wake on EC WAKE GPE.  */
+		/* If EC wake events are enabled, enable wake on EC WAKE GPE. */
 		if (ec_wake & 0x14) {
 			/* Redirect EC WAKE GPE to SCI.  */
 			gpi_route_interrupt(GPE_EC_WAKE, GPI_IS_SCI);
diff --git a/src/mainboard/lenovo/t530/smihandler.c b/src/mainboard/lenovo/t530/smihandler.c
index 0491392bcc..c967e4084e 100644
--- a/src/mainboard/lenovo/t530/smihandler.c
+++ b/src/mainboard/lenovo/t530/smihandler.c
@@ -20,13 +20,8 @@
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
-#include <delay.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-#include <southbridge/intel/bd82x6x/me.h>
 #include <southbridge/intel/common/pmutil.h>
-#include <northbridge/intel/sandybridge/sandybridge.h>
-#include <cpu/intel/model_206ax/model_206ax.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
@@ -111,7 +106,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 
 	if (slp_typ == 3) {
 		u8 ec_wake = ec_read(0x32);
-		/* If EC wake events are enabled, enable wake on EC WAKE GPE.  */
+		/* If EC wake events are enabled, enable wake on EC WAKE GPE. */
 		if (ec_wake & 0x14) {
 			/* Redirect EC WAKE GPE to SCI.  */
 			gpi_route_interrupt(GPE_EC_WAKE, GPI_IS_SCI);
diff --git a/src/mainboard/lenovo/x220/smihandler.c b/src/mainboard/lenovo/x220/smihandler.c
index 0491392bcc..c967e4084e 100644
--- a/src/mainboard/lenovo/x220/smihandler.c
+++ b/src/mainboard/lenovo/x220/smihandler.c
@@ -20,13 +20,8 @@
 #include <cpu/x86/smm.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
-#include <delay.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-#include <southbridge/intel/bd82x6x/pch.h>
-#include <southbridge/intel/bd82x6x/me.h>
 #include <southbridge/intel/common/pmutil.h>
-#include <northbridge/intel/sandybridge/sandybridge.h>
-#include <cpu/intel/model_206ax/model_206ax.h>
+#include <southbridge/intel/bd82x6x/pch.h>
 
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
@@ -111,7 +106,7 @@ void mainboard_smi_sleep(u8 slp_typ)
 
 	if (slp_typ == 3) {
 		u8 ec_wake = ec_read(0x32);
-		/* If EC wake events are enabled, enable wake on EC WAKE GPE.  */
+		/* If EC wake events are enabled, enable wake on EC WAKE GPE. */
 		if (ec_wake & 0x14) {
 			/* Redirect EC WAKE GPE to SCI.  */
 			gpi_route_interrupt(GPE_EC_WAKE, GPI_IS_SCI);