diff --git a/src/mainboard/asus/p5gc-mx/cstates.c b/src/mainboard/asus/p5gc-mx/cstates.c
index 0370a6979d..ab75f495db 100644
--- a/src/mainboard/asus/p5gc-mx/cstates.c
+++ b/src/mainboard/asus/p5gc-mx/cstates.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/asus/p5qc/cstates.c b/src/mainboard/asus/p5qc/cstates.c
index aa7214dcb3..ab75f495db 100644
--- a/src/mainboard/asus/p5qc/cstates.c
+++ b/src/mainboard/asus/p5qc/cstates.c
@@ -12,8 +12,6 @@
  */
 
 #include <arch/acpigen.h>
-#include <device/device.h>
-#include <southbridge/intel/i82801jx/i82801jx.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
 {
diff --git a/src/mainboard/foxconn/d41s/cstates.c b/src/mainboard/foxconn/d41s/cstates.c
index 45b575207f..bee17799df 100644
--- a/src/mainboard/foxconn/d41s/cstates.c
+++ b/src/mainboard/foxconn/d41s/cstates.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/foxconn/g41s-k/cstates.c b/src/mainboard/foxconn/g41s-k/cstates.c
index 062add2175..3ac18c24c5 100644
--- a/src/mainboard/foxconn/g41s-k/cstates.c
+++ b/src/mainboard/foxconn/g41s-k/cstates.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/acpigen.h>
-#include <southbridge/intel/i82801gx/i82801gx.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
 {
diff --git a/src/mainboard/getac/p470/cstates.c b/src/mainboard/getac/p470/cstates.c
index 55e6ab83eb..81d66a1ca1 100644
--- a/src/mainboard/getac/p470/cstates.c
+++ b/src/mainboard/getac/p470/cstates.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 #include <southbridge/intel/i82801gx/i82801gx.h>
 
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c b/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c
index 0370a6979d..ab75f495db 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cstates.c b/src/mainboard/gigabyte/ga-g41m-es2l/cstates.c
index 4d9f4ab456..fa542eb083 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cstates.c
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cstates.c
@@ -14,8 +14,6 @@
  */
 
 #include <arch/acpigen.h>
-#include <device/device.h>
-#include <southbridge/intel/i82801gx/i82801gx.h>
 
 static acpi_cstate_t cst_entries[] = {};
 
diff --git a/src/mainboard/ibase/mb899/cstates.c b/src/mainboard/ibase/mb899/cstates.c
index 0370a6979d..ab75f495db 100644
--- a/src/mainboard/ibase/mb899/cstates.c
+++ b/src/mainboard/ibase/mb899/cstates.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/intel/d510mo/cstates.c b/src/mainboard/intel/d510mo/cstates.c
index 45b575207f..bee17799df 100644
--- a/src/mainboard/intel/d510mo/cstates.c
+++ b/src/mainboard/intel/d510mo/cstates.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/intel/d945gclf/cstates.c b/src/mainboard/intel/d945gclf/cstates.c
index 0370a6979d..ab75f495db 100644
--- a/src/mainboard/intel/d945gclf/cstates.c
+++ b/src/mainboard/intel/d945gclf/cstates.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/intel/dg43gt/cstates.c b/src/mainboard/intel/dg43gt/cstates.c
index aa7214dcb3..ab75f495db 100644
--- a/src/mainboard/intel/dg43gt/cstates.c
+++ b/src/mainboard/intel/dg43gt/cstates.c
@@ -12,8 +12,6 @@
  */
 
 #include <arch/acpigen.h>
-#include <device/device.h>
-#include <southbridge/intel/i82801jx/i82801jx.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
 {
diff --git a/src/mainboard/kontron/986lcd-m/cstates.c b/src/mainboard/kontron/986lcd-m/cstates.c
index 0370a6979d..ab75f495db 100644
--- a/src/mainboard/kontron/986lcd-m/cstates.c
+++ b/src/mainboard/kontron/986lcd-m/cstates.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/lenovo/t400/cstates.c b/src/mainboard/lenovo/t400/cstates.c
index e51accbe1a..34bceafac7 100644
--- a/src/mainboard/lenovo/t400/cstates.c
+++ b/src/mainboard/lenovo/t400/cstates.c
@@ -14,8 +14,6 @@
  */
 
 #include <arch/acpigen.h>
-#include <device/device.h> /* fix for i82801ix.h */
-#include <southbridge/intel/i82801ix/i82801ix.h>
 
 static acpi_cstate_t cst_entries[] = {
 	{
diff --git a/src/mainboard/lenovo/x200/cstates.c b/src/mainboard/lenovo/x200/cstates.c
index e51accbe1a..34bceafac7 100644
--- a/src/mainboard/lenovo/x200/cstates.c
+++ b/src/mainboard/lenovo/x200/cstates.c
@@ -14,8 +14,6 @@
  */
 
 #include <arch/acpigen.h>
-#include <device/device.h> /* fix for i82801ix.h */
-#include <southbridge/intel/i82801ix/i82801ix.h>
 
 static acpi_cstate_t cst_entries[] = {
 	{
diff --git a/src/mainboard/roda/rk886ex/cstates.c b/src/mainboard/roda/rk886ex/cstates.c
index 0370a6979d..ab75f495db 100644
--- a/src/mainboard/roda/rk886ex/cstates.c
+++ b/src/mainboard/roda/rk886ex/cstates.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <device/device.h>
 #include <arch/acpigen.h>
 
 int get_cst_entries(acpi_cstate_t **entries)
diff --git a/src/mainboard/roda/rk9/cstates.c b/src/mainboard/roda/rk9/cstates.c
index 0a5f98a4c2..fea92769b5 100644
--- a/src/mainboard/roda/rk9/cstates.c
+++ b/src/mainboard/roda/rk9/cstates.c
@@ -14,8 +14,6 @@
  */
 
 #include <arch/acpigen.h>
-#include <device/device.h> /* fix for i82801ix.h */
-#include <southbridge/intel/i82801ix/i82801ix.h>
 
 static acpi_cstate_t cst_entries[] = {
 	{