Remove some unneeded #includes from most mainboard.c files.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> 
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2485 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c
index df09391..7e02e98 100644
--- a/src/mainboard/amd/quartet/mainboard.c
+++ b/src/mainboard/amd/quartet/mainboard.c
@@ -1,11 +1,7 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
-
 struct chip_operations mainboard_amd_quartet_ops = {
 	CHIP_NAME("AMD Quartet mainboard")
 };
+
diff --git a/src/mainboard/amd/serenade/mainboard.c b/src/mainboard/amd/serenade/mainboard.c
index 00e44be..3834d02 100644
--- a/src/mainboard/amd/serenade/mainboard.c
+++ b/src/mainboard/amd/serenade/mainboard.c
@@ -1,10 +1,7 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_amd_serenade_ops = {
 	CHIP_NAME("AMD Serenade mainboard")
 };
+
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index 317bea3..5e1add2 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("AMD Serengeti Cheetah mainboard")
 };
 #endif
+
diff --git a/src/mainboard/amd/serengeti_leopard/mainboard.c b/src/mainboard/amd/serengeti_leopard/mainboard.c
index 27ec27d..a0ac927 100644
--- a/src/mainboard/amd/serengeti_leopard/mainboard.c
+++ b/src/mainboard/amd/serengeti_leopard/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("AMD Serengeti Leopard mainboard")
 };
 #endif
+
diff --git a/src/mainboard/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c
index 058a1af..32be498 100644
--- a/src/mainboard/amd/solo/mainboard.c
+++ b/src/mainboard/amd/solo/mainboard.c
@@ -1,11 +1,7 @@
-
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_amd_solo_ops = {
 	CHIP_NAME("AMD Solo7 mainboard")
 };
+
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index e59d6b4..12fc7f1 100644
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -1,15 +1,6 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <part/hard_reset.h>
-#include <device/smbus.h>
-#include <delay.h>
 #include "chip.h"
 
-
 struct chip_operations mainboard_arima_hdama_ops = {
 	CHIP_NAME("Arima HDAMA mainboard")
 };
diff --git a/src/mainboard/asus/p2b/mainboard.c b/src/mainboard/asus/p2b/mainboard.c
index 98fe4d9..434c5fb 100644
--- a/src/mainboard/asus/p2b/mainboard.c
+++ b/src/mainboard/asus/p2b/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <arch/io.h>
 #include "chip.h"
 
 struct chip_operations mainboard_asus_p2b_ops = {
diff --git a/src/mainboard/bitworks/ims/mainboard.c b/src/mainboard/bitworks/ims/mainboard.c
index 53b092c..c97598e 100644
--- a/src/mainboard/bitworks/ims/mainboard.c
+++ b/src/mainboard/bitworks/ims/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <arch/io.h>
 #include "chip.h"
 
 struct chip_operations mainboard_bitworks_ims_ops = {
diff --git a/src/mainboard/broadcom/blast/mainboard.c b/src/mainboard/broadcom/blast/mainboard.c
index 256144d..574414c 100644
--- a/src/mainboard/broadcom/blast/mainboard.c
+++ b/src/mainboard/broadcom/blast/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Broadcom Blast mainboard")
 };
 #endif
+
diff --git a/src/mainboard/dell/s1850/mainboard.c b/src/mainboard/dell/s1850/mainboard.c
index d20ba0c..1c751aa 100644
--- a/src/mainboard/dell/s1850/mainboard.c
+++ b/src/mainboard/dell/s1850/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
 #include "chip.h"
 
 struct chip_operations mainboard_dell_s1850_ops = {
diff --git a/src/mainboard/densitron/dpx114/mainboard.c b/src/mainboard/densitron/dpx114/mainboard.c
index 7861f31..5f180dc 100644
--- a/src/mainboard/densitron/dpx114/mainboard.c
+++ b/src/mainboard/densitron/dpx114/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_densitron_dpx114_ops = {
diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c
index a9c03bc..78046a2 100644
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_digitallogic_adl855pc_ops = {
diff --git a/src/mainboard/eaglelion/5bcm/mainboard.c b/src/mainboard/eaglelion/5bcm/mainboard.c
index c0d76fc..0de9942 100644
--- a/src/mainboard/eaglelion/5bcm/mainboard.c
+++ b/src/mainboard/eaglelion/5bcm/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <arch/io.h>
 #include "chip.h"
 
 struct chip_operations mainboard_eaglelion_5bcm_ops = {
diff --git a/src/mainboard/emulation/qemu-i386/mainboard.c b/src/mainboard/emulation/qemu-i386/mainboard.c
index eb58184..b6e328e 100644
--- a/src/mainboard/emulation/qemu-i386/mainboard.c
+++ b/src/mainboard/emulation/qemu-i386/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_emulation_qemu_i386_ops = {
diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c
index 4b224b9..464155e 100644
--- a/src/mainboard/ibm/e325/mainboard.c
+++ b/src/mainboard/ibm/e325/mainboard.c
@@ -1,10 +1,7 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e325_ops = {
 	CHIP_NAME("IBM eServer 325 mainboard")
 };
+
diff --git a/src/mainboard/ibm/e326/mainboard.c b/src/mainboard/ibm/e326/mainboard.c
index 4102b5a..a6dd4a4 100644
--- a/src/mainboard/ibm/e326/mainboard.c
+++ b/src/mainboard/ibm/e326/mainboard.c
@@ -1,10 +1,7 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e326_ops = {
 	CHIP_NAME("IBM eServer 326 mainboard")
 };
+
diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index 3d47248..0b1eec5 100644
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -1,10 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <arch/io.h>
 #include "chip.h"
 
 struct chip_operations mainboard_intel_e7520_ops = {
diff --git a/src/mainboard/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c
index 158b018..fd7404b 100644
--- a/src/mainboard/intel/xe7501devkit/mainboard.c
+++ b/src/mainboard/intel/xe7501devkit/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Intel Xeon E7501 DevKit mainboard")
 };
 #endif
+
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index 8664c5c..c49af62 100644
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("IWILL DK8-HTX mainboard")
 };
 #endif
+
diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index 38c225d..4b7a1ec 100644
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_iwill_dk8s2_ops = {
diff --git a/src/mainboard/iwill/dk8x/mainboard.c b/src/mainboard/iwill/dk8x/mainboard.c
index 97cd0ed..0e8a361 100644
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_iwill_dk8x_ops = {
diff --git a/src/mainboard/lippert/frontrunner/mainboard.c b/src/mainboard/lippert/frontrunner/mainboard.c
index 4ee0f5a..30fd7b1 100644
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <arch/io.h>
 #include "chip.h"
 
 struct chip_operations mainboard_lippert_frontrunner_ops = {
diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c
index 8221b2f..7aba813 100644
--- a/src/mainboard/newisys/khepri/mainboard.c
+++ b/src/mainboard/newisys/khepri/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 struct chip_operations mainboard_newisys_khepri_ops = {
diff --git a/src/mainboard/sunw/ultra40/mainboard.c b/src/mainboard/sunw/ultra40/mainboard.c
index 6c8b8af..e4e1052 100644
--- a/src/mainboard/sunw/ultra40/mainboard.c
+++ b/src/mainboard/sunw/ultra40/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Sun Ultra 40 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/supermicro/x6dai_g/mainboard.c b/src/mainboard/supermicro/x6dai_g/mainboard.c
index 4c15048..e0a9b9d 100644
--- a/src/mainboard/supermicro/x6dai_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dai_g/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
 #include "chip.h"
 
 struct chip_operations supermicro_x6dai_g_ops = {
diff --git a/src/mainboard/supermicro/x6dhe_g/mainboard.c b/src/mainboard/supermicro/x6dhe_g/mainboard.c
index ab53efc..d559977 100644
--- a/src/mainboard/supermicro/x6dhe_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
 #include "chip.h"
 
 struct chip_operations supermicro_x6dhe_g_ops = {
diff --git a/src/mainboard/supermicro/x6dhe_g2/mainboard.c b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
index d111694..ba31256 100644
--- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
 #include "chip.h"
 
 struct chip_operations supermicro_x6dhe_g2_ops = {
diff --git a/src/mainboard/supermicro/x6dhr_ig/mainboard.c b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
index 63d883f..b344a94 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig_ops = {
diff --git a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
index a687ffe..dfe4d94 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig2_ops = {
diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c
index 666843f..a20db8c 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2735 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index 3f298e4..238c707 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2850 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index 3f8907a..dcbbe17 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2875 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 0bcad7a..61971729 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2880 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index f6dbf85..b17c4b1 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2881 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index 43c9d2e..3475d70 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2882 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 82d6724..aca02f0 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2885 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index b2d465e..455e65a 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2891 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 1954260..fc4c889 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2892 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 541b2ef..1476702 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S2895 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index c4aa4cf..dd7e3ed 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S4880 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 3b21360..83371ee 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -1,8 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
@@ -10,3 +6,4 @@
 	CHIP_NAME("Tyan S4882 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 5a52cf8..96a0988 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -1,9 +1,4 @@
-#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <arch/io.h>
 #include "chip.h"
 
 struct chip_operations mainboard_via_epia_ops = {