From ead574ed020063f1e6efe5289669ab67e2a76780 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Sun, 11 Nov 2018 20:52:30 +0100
Subject: src: Get rid of duplicated includes

Change-Id: I252a1cd77bf647477edb7dddadb7e527de872439
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29582
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
---
 src/mainboard/advansus/a785e-i/romstage.c             | 1 -
 src/mainboard/amd/bimini_fam10/romstage.c             | 1 -
 src/mainboard/amd/db-ft3b-lc/romstage.c               | 1 -
 src/mainboard/amd/lamar/mptable.c                     | 1 -
 src/mainboard/amd/lamar/romstage.c                    | 1 -
 src/mainboard/amd/mahogany_fam10/romstage.c           | 1 -
 src/mainboard/amd/olivehillplus/romstage.c            | 1 -
 src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c | 1 -
 src/mainboard/amd/serengeti_cheetah_fam10/romstage.c  | 1 -
 src/mainboard/amd/tilapia_fam10/romstage.c            | 1 -
 src/mainboard/apple/macbook21/mainboard.c             | 1 -
 src/mainboard/asus/kcma-d8/romstage.c                 | 1 -
 src/mainboard/asus/kfsn4-dre/get_bus_conf.c           | 1 -
 src/mainboard/asus/kfsn4-dre/romstage.c               | 1 -
 src/mainboard/asus/kgpe-d16/romstage.c                | 1 -
 src/mainboard/asus/m4a78-em/romstage.c                | 1 -
 src/mainboard/asus/m4a785-m/romstage.c                | 1 -
 src/mainboard/asus/m5a88-v/romstage.c                 | 1 -
 src/mainboard/avalue/eax-785e/romstage.c              | 1 -
 src/mainboard/bap/ode_e21XX/romstage.c                | 1 -
 src/mainboard/cavium/cn8100_sff_evb/mainboard.c       | 1 -
 src/mainboard/gigabyte/ma785gm/romstage.c             | 1 -
 src/mainboard/gigabyte/ma785gmt/romstage.c            | 1 -
 src/mainboard/gigabyte/ma78gm/romstage.c              | 1 -
 src/mainboard/google/jecht/smihandler.c               | 2 --
 src/mainboard/hp/dl165_g6_fam10/romstage.c            | 1 -
 src/mainboard/iei/kino-780am2-fam10/romstage.c        | 1 -
 src/mainboard/jetway/pa78vm5/romstage.c               | 1 -
 src/mainboard/lenovo/x60/dock.c                       | 1 -
 src/mainboard/msi/ms9652_fam10/romstage.c             | 1 -
 src/mainboard/opencellular/elgon/mainboard.c          | 2 --
 src/mainboard/packardbell/ms2290/mainboard.c          | 1 -
 src/mainboard/pcengines/apu2/romstage.c               | 1 -
 src/mainboard/supermicro/h8dmr_fam10/romstage.c       | 1 -
 src/mainboard/supermicro/h8qme_fam10/romstage.c       | 1 -
 src/mainboard/supermicro/h8scm_fam10/romstage.c       | 1 -
 src/mainboard/tyan/s2912_fam10/romstage.c             | 1 -
 src/mainboard/via/epia-m850/romstage.c                | 1 -
 38 files changed, 40 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c
index 1454ece502..f557772f57 100644
--- a/src/mainboard/advansus/a785e-i/romstage.c
+++ b/src/mainboard/advansus/a785e-i/romstage.c
@@ -29,7 +29,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <cpu/x86/lapic.h>
 #include <arch/cpu.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 84513b8166..64cafa7bce 100644
--- a/src/mainboard/amd/bimini_fam10/romstage.c
+++ b/src/mainboard/amd/bimini_fam10/romstage.c
@@ -31,7 +31,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <cpu/amd/msr.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/romstage.c b/src/mainboard/amd/db-ft3b-lc/romstage.c
index 4da974796b..4aceeea3ea 100644
--- a/src/mainboard/amd/db-ft3b-lc/romstage.c
+++ b/src/mainboard/amd/db-ft3b-lc/romstage.c
@@ -29,7 +29,6 @@
 #include <northbridge/amd/pi/agesawrapper.h>
 #include <northbridge/amd/pi/agesawrapper_call.h>
 #include <cpu/x86/bist.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 
 void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
diff --git a/src/mainboard/amd/lamar/mptable.c b/src/mainboard/amd/lamar/mptable.c
index 6937de8847..2b6c48571c 100644
--- a/src/mainboard/amd/lamar/mptable.c
+++ b/src/mainboard/amd/lamar/mptable.c
@@ -22,7 +22,6 @@
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
-#include <arch/ioapic.h>
 #include <southbridge/amd/pi/hudson/amd_pci_int_defs.h>
 #include <northbridge/amd/pi/00630F01/pci_devs.h>
 
diff --git a/src/mainboard/amd/lamar/romstage.c b/src/mainboard/amd/lamar/romstage.c
index 136e392335..7f811c5abf 100644
--- a/src/mainboard/amd/lamar/romstage.c
+++ b/src/mainboard/amd/lamar/romstage.c
@@ -29,7 +29,6 @@
 #include <northbridge/amd/pi/agesawrapper.h>
 #include <northbridge/amd/pi/agesawrapper_call.h>
 #include <cpu/x86/bist.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_defs.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 #include <superio/fintek/f81216h/f81216h.h>
diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index c052976943..b5217369fb 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -33,7 +33,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c
index 4ad0f6df81..3cd8b732cd 100644
--- a/src/mainboard/amd/olivehillplus/romstage.c
+++ b/src/mainboard/amd/olivehillplus/romstage.c
@@ -29,7 +29,6 @@
 #include <northbridge/amd/pi/agesawrapper.h>
 #include <northbridge/amd/pi/agesawrapper_call.h>
 #include <cpu/x86/bist.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 
 void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
index 374420d898..fee01092a0 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
@@ -13,7 +13,6 @@
 
 #include <device/device.h>
 #include <arch/acpi.h>
-#include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include "mainboard.h"
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index fd02782661..a33a68f568 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
 #include <spd.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <cpu/amd/car.h>
diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index 1205de1d03..5671ccee34 100644
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -31,7 +31,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index eb963eef19..49d342753f 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -21,7 +21,6 @@
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
-#include <arch/io.h>
 #include <arch/interrupt.h>
 #include <northbridge/intel/i945/i945.h>
 #include <arch/x86/include/arch/acpigen.h>
diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c
index 8f156bce23..d7cc9aef20 100644
--- a/src/mainboard/asus/kcma-d8/romstage.c
+++ b/src/mainboard/asus/kcma-d8/romstage.c
@@ -32,7 +32,6 @@
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83667hg-a/w83667hg-a.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index 4b23ca52f0..5c8c75e9ce 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
 #include <cpu/amd/amdfam10_sysconf.h>
-#include <stdlib.h>
 
 /*
  * Global variables for MB layouts and these will be shared by irqtable,
diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c
index 54a76e21fa..1c685f28f2 100644
--- a/src/mainboard/asus/kfsn4-dre/romstage.c
+++ b/src/mainboard/asus/kfsn4-dre/romstage.c
@@ -39,7 +39,6 @@
 #include <southbridge/amd/common/reset.h>
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627thg/w83627thg.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index 9913462fa0..eb970ca183 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -32,7 +32,6 @@
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83667hg-a/w83667hg-a.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index b6c4bdc803..5d61b52903 100644
--- a/src/mainboard/asus/m4a78-em/romstage.c
+++ b/src/mainboard/asus/m4a78-em/romstage.c
@@ -32,7 +32,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index b9ac888d7a..80b77e6662 100644
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -33,7 +33,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c
index 8f900ee8ca..b9268dae1a 100644
--- a/src/mainboard/asus/m5a88-v/romstage.c
+++ b/src/mainboard/asus/m5a88-v/romstage.c
@@ -32,7 +32,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c
index 22e3c5d1f0..fd810f8c34 100644
--- a/src/mainboard/avalue/eax-785e/romstage.c
+++ b/src/mainboard/avalue/eax-785e/romstage.c
@@ -30,7 +30,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
diff --git a/src/mainboard/bap/ode_e21XX/romstage.c b/src/mainboard/bap/ode_e21XX/romstage.c
index 576a3eefbb..eefda26b3e 100644
--- a/src/mainboard/bap/ode_e21XX/romstage.c
+++ b/src/mainboard/bap/ode_e21XX/romstage.c
@@ -29,7 +29,6 @@
 #include <northbridge/amd/pi/agesawrapper.h>
 #include <northbridge/amd/pi/agesawrapper_call.h>
 #include <cpu/x86/bist.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 #include <superio/fintek/common/fintek.h>
 #include <superio/fintek/f81866d/f81866d.h>
diff --git a/src/mainboard/cavium/cn8100_sff_evb/mainboard.c b/src/mainboard/cavium/cn8100_sff_evb/mainboard.c
index ce896f2f75..fd0d9285ed 100644
--- a/src/mainboard/cavium/cn8100_sff_evb/mainboard.c
+++ b/src/mainboard/cavium/cn8100_sff_evb/mainboard.c
@@ -25,7 +25,6 @@
 #include <soc/uart.h>
 #include <console/console.h>
 #include <soc/clock.h>
-#include <soc/gpio.h>
 #include <soc/timer.h>
 #include <soc/cpu.h>
 #include <soc/sdram.h>
diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index f556a1af19..1adaad8261 100644
--- a/src/mainboard/gigabyte/ma785gm/romstage.c
+++ b/src/mainboard/gigabyte/ma785gm/romstage.c
@@ -29,7 +29,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index abf862881c..41640d9972 100644
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -29,7 +29,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index f004911faa..f2abbd0aba 100644
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -32,7 +32,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/google/jecht/smihandler.c b/src/mainboard/google/jecht/smihandler.c
index 8243354299..b9a84bf018 100644
--- a/src/mainboard/google/jecht/smihandler.c
+++ b/src/mainboard/google/jecht/smihandler.c
@@ -25,8 +25,6 @@
 #include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/nvs.h>
-#include <soc/pm.h>
-#include <soc/smm.h>
 #include "onboard.h"
 
 int mainboard_io_trap_handler(int smif)
diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index ada0d2fd2a..7a9d37fa3c 100644
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -39,7 +39,6 @@
 #include <lib.h>
 #include <spd.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <superio/serverengines/pilot/pilot.h>
 #include <superio/nsc/pc87417/pc87417.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index 4a6d011aa6..52cbe4bd31 100644
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/fintek/common/fintek.h>
diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index b1ac722d3d..9f6c1601ad 100644
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -33,7 +33,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/fintek/common/fintek.h>
diff --git a/src/mainboard/lenovo/x60/dock.c b/src/mainboard/lenovo/x60/dock.c
index f55428e66d..b94d818077 100644
--- a/src/mainboard/lenovo/x60/dock.c
+++ b/src/mainboard/lenovo/x60/dock.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <arch/io.h>
 #include <delay.h>
-#include <arch/io.h>
 #include "dock.h"
 #include <southbridge/intel/i82801gx/i82801gx.h>
 #include <superio/nsc/pc87392/pc87392.h>
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index cd57c2c395..803ff3a766 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/amd/car.h>
 #include <cpu/amd/msr.h>
 #include <superio/winbond/common/winbond.h>
diff --git a/src/mainboard/opencellular/elgon/mainboard.c b/src/mainboard/opencellular/elgon/mainboard.c
index 45a715505c..d140bc1ec9 100644
--- a/src/mainboard/opencellular/elgon/mainboard.c
+++ b/src/mainboard/opencellular/elgon/mainboard.c
@@ -24,14 +24,12 @@
 #include <soc/uart.h>
 #include <console/console.h>
 #include <soc/clock.h>
-#include <soc/gpio.h>
 #include <soc/timer.h>
 #include <soc/cpu.h>
 #include <soc/sdram.h>
 #include <soc/spi.h>
 #include <spi_flash.h>
 #include <fmap.h>
-#include <libbdk-hal/bdk-config.h>
 
 static void mainboard_print_info(void)
 {
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index 2691b676f4..77a626dfdb 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
-#include <arch/io.h>
 #include <northbridge/intel/nehalem/nehalem.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <ec/acpi/ec.h>
diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c
index 3c5eed6bb5..55a89fb0c2 100644
--- a/src/mainboard/pcengines/apu2/romstage.c
+++ b/src/mainboard/pcengines/apu2/romstage.c
@@ -31,7 +31,6 @@
 #include <northbridge/amd/pi/agesawrapper.h>
 #include <northbridge/amd/pi/agesawrapper_call.h>
 #include <cpu/x86/bist.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 #include <superio/nuvoton/common/nuvoton.h>
 #include <superio/nuvoton/nct5104d/nct5104d.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index ec195bf640..9ad8652962 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627hf/w83627hf.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index c237712820..c6e01e6f64 100644
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627hf/w83627hf.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index 254672ddda..dc19870eb5 100644
--- a/src/mainboard/supermicro/h8scm_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <lib.h>
-#include <cpu/x86/lapic.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <cpu/amd/msr.h>
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index bb360b74c7..aa3b010a52 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/amd/car.h>
 #include <cpu/amd/msr.h>
 #include <superio/winbond/common/winbond.h>
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index e75a679f2e..db03103b0e 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -22,7 +22,6 @@
 #include <device/pci_ids.h>
 #include <arch/io.h>
 #include <device/pnp_def.h>
-#include <arch/io.h>
 #include <console/console.h>
 #include <lib.h>
 #include <cpu/x86/bist.h>
-- 
cgit v1.2.3