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

42 files changed, 23 insertions, 188 deletions

diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c
index df09391c5a..7e02e98dc1 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 00e44be4c9..3834d025bb 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 317bea3211..5e1add27bc 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 @@ struct chip_operations mainboard_amd_serengeti_cheetah_ops = {
 	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 27ec27d948..a0ac927448 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 @@ struct chip_operations mainboard_amd_serengeti_leopard_ops = {
 	CHIP_NAME("AMD Serengeti Leopard mainboard")
 };
 #endif
+
diff --git a/src/mainboard/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c
index 058a1aff01..32be49839e 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 e59d6b4882..12fc7f135a 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 98fe4d92a1..434c5fb160 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 53b092c26b..c97598eb82 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 256144da45..574414c8c6 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 @@ struct chip_operations mainboard_broadcom_blast_ops = {
 	CHIP_NAME("Broadcom Blast mainboard")
 };
 #endif
+
diff --git a/src/mainboard/dell/s1850/mainboard.c b/src/mainboard/dell/s1850/mainboard.c
index d20ba0c328..1c751aa401 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 7861f31f30..5f180dc82e 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 a9c03bcbc5..78046a217a 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 c0d76fc1b2..0de9942b17 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 eb5818466e..b6e328ea53 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 4b224b9308..464155e3e5 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 4102b5a853..a6dd4a4083 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 3d47248646..0b1eec585a 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 158b0183e2..fd7404b5c4 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 @@ struct chip_operations mainboard_intel_xe7501devkit_ops = {
 	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 8664c5c08c..c49af62767 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 @@ struct chip_operations mainboard_iwill_dk8_htx_ops = {
 	CHIP_NAME("IWILL DK8-HTX mainboard")
 };
 #endif
+
diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index 38c225de7b..4b7a1ecdcc 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 97cd0edae2..0e8a361539 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 4ee0f5aba1..30fd7b130a 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 8221b2f57f..7aba8132ad 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 6c8b8af773..e4e1052a49 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 @@ struct chip_operations mainboard_sunw_ultra40_ops = {
 	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 4c15048482..e0a9b9d6ef 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 ab53efca70..d559977c9b 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 d1116943f3..ba3125615c 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 63d883f8b6..b344a94cb4 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 a687ffe231..dfe4d9435b 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 666843f908..a20db8c6d2 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 @@ struct chip_operations mainboard_tyan_s2735_ops = {
 	CHIP_NAME("Tyan S2735 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index 3f298e4f69..238c707fd5 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 @@ struct chip_operations mainboard_tyan_s2850_ops = {
 	CHIP_NAME("Tyan S2850 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index 3f8907a20c..dcbbe172ce 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 @@ struct chip_operations mainboard_tyan_s2875_ops = {
 	CHIP_NAME("Tyan S2875 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 0bcad7a5df..6197172934 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 @@ struct chip_operations mainboard_tyan_s2880_ops = {
 	CHIP_NAME("Tyan S2880 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index f6dbf85292..b17c4b12cd 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 @@ struct chip_operations mainboard_tyan_s2881_ops = {
 	CHIP_NAME("Tyan S2881 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index 43c9d2eb1b..3475d709b0 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 @@ struct chip_operations mainboard_tyan_s2882_ops = {
 	CHIP_NAME("Tyan S2882 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 82d6724e8b..aca02f0d3b 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 @@ struct chip_operations mainboard_tyan_s2885_ops = {
 	CHIP_NAME("Tyan S2885 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index b2d465e8f4..455e65a7f9 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 @@ struct chip_operations mainboard_tyan_s2891_ops = {
 	CHIP_NAME("Tyan S2891 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 1954260e4b..fc4c88953a 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 @@ struct chip_operations mainboard_tyan_s2892_ops = {
 	CHIP_NAME("Tyan S2892 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 541b2ef90d..1476702527 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 @@ struct chip_operations mainboard_tyan_s2895_ops = {
 	CHIP_NAME("Tyan S2895 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index c4aa4cf46a..dd7e3ede4c 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 @@ struct chip_operations mainboard_tyan_s4880_ops = {
 	CHIP_NAME("Tyan S4880 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 3b21360576..83371ee659 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 @@ struct chip_operations mainboard_tyan_s4882_ops = {
 	CHIP_NAME("Tyan S4882 mainboard")
 };
 #endif
+
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 5a52cf898c..96a0988edb 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 = {