summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2019-03-18 22:49:36 +0100
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-20 20:27:51 +0000
commita1e22b8192d5fc85995a41d0961c25293ba4391f (patch)
tree7b7dbc885d3ac99fe029cf0961eda1052e753dc1 /src/mainboard
parent0eb4db185cfef44ddfdbd91d4fe69a48c127fa84 (diff)
src: Use 'include <string.h>' when appropriate
Drop 'include <string.h>' when it is not used and add it when it is missing. Also extra lines removed, or added just before local includes. Change-Id: Iccac4dbaa2dd4144fc347af36ecfc9747da3de20 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31966 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Werner Zeh <werner.zeh@siemens.com> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/advansus/a785e-i/acpi_tables.c1
-rw-r--r--src/mainboard/advansus/a785e-i/get_bus_conf.c1
-rw-r--r--src/mainboard/advansus/a785e-i/mptable.c1
-rw-r--r--src/mainboard/advansus/a785e-i/romstage.c1
-rw-r--r--src/mainboard/amd/bettong/acpi_tables.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/mptable.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/acpi_tables.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/mptable.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/romstage.c1
-rw-r--r--src/mainboard/amd/gardenia/BiosCallOuts.c1
-rw-r--r--src/mainboard/amd/inagua/acpi_tables.c1
-rw-r--r--src/mainboard/amd/lamar/acpi_tables.c1
-rw-r--r--src/mainboard/amd/lamar/mptable.c1
-rw-r--r--src/mainboard/amd/lamar/romstage.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/mptable.c2
-rw-r--r--src/mainboard/amd/mahogany_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/olivehill/acpi_tables.c1
-rw-r--r--src/mainboard/amd/olivehill/romstage.c1
-rw-r--r--src/mainboard/amd/olivehillplus/acpi_tables.c1
-rw-r--r--src/mainboard/amd/olivehillplus/romstage.c1
-rw-r--r--src/mainboard/amd/parmer/acpi_tables.c1
-rw-r--r--src/mainboard/amd/persimmon/acpi_tables.c1
-rw-r--r--src/mainboard/amd/persimmon/mptable.c1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/mptable.c1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/south_station/acpi_tables.c1
-rw-r--r--src/mainboard/amd/thatcher/acpi_tables.c1
-rw-r--r--src/mainboard/amd/thatcher/romstage.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/mptable.c2
-rw-r--r--src/mainboard/amd/tilapia_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/torpedo/acpi_tables.c1
-rw-r--r--src/mainboard/amd/union_station/OemCustomize.c2
-rw-r--r--src/mainboard/amd/union_station/acpi_tables.c1
-rw-r--r--src/mainboard/aopen/dxplplusu/acpi_tables.c1
-rw-r--r--src/mainboard/apple/macbook21/mptable.c1
-rw-r--r--src/mainboard/apple/macbook21/romstage.c1
-rw-r--r--src/mainboard/asrock/e350m1/acpi_tables.c1
-rw-r--r--src/mainboard/asrock/imb-a180/acpi_tables.c1
-rw-r--r--src/mainboard/asrock/imb-a180/romstage.c1
-rw-r--r--src/mainboard/asus/am1i-a/acpi_tables.c1
-rw-r--r--src/mainboard/asus/am1i-a/mptable.c1
-rw-r--r--src/mainboard/asus/f2a85-m/acpi_tables.c1
-rw-r--r--src/mainboard/asus/f2a85-m/romstage.c1
-rw-r--r--src/mainboard/asus/kcma-d8/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kcma-d8/get_bus_conf.c2
-rw-r--r--src/mainboard/asus/kcma-d8/mptable.c1
-rw-r--r--src/mainboard/asus/kcma-d8/romstage.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/mptable.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/romstage.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/get_bus_conf.c3
-rw-r--r--src/mainboard/asus/kgpe-d16/mptable.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/romstage.c1
-rw-r--r--src/mainboard/asus/m4a78-em/acpi_tables.c1
-rw-r--r--src/mainboard/asus/m4a78-em/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/m4a78-em/mptable.c1
-rw-r--r--src/mainboard/asus/m4a78-em/romstage.c1
-rw-r--r--src/mainboard/asus/m4a785-m/acpi_tables.c1
-rw-r--r--src/mainboard/asus/m4a785-m/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/m4a785-m/mptable.c3
-rw-r--r--src/mainboard/asus/m4a785-m/romstage.c1
-rw-r--r--src/mainboard/asus/m5a88-v/acpi_tables.c1
-rw-r--r--src/mainboard/asus/m5a88-v/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/m5a88-v/mptable.c1
-rw-r--r--src/mainboard/asus/m5a88-v/romstage.c1
-rw-r--r--src/mainboard/asus/p2b-d/mptable.c1
-rw-r--r--src/mainboard/asus/p2b-ds/mptable.c1
-rw-r--r--src/mainboard/asus/p5gc-mx/romstage.c1
-rw-r--r--src/mainboard/avalue/eax-785e/acpi_tables.c1
-rw-r--r--src/mainboard/avalue/eax-785e/get_bus_conf.c1
-rw-r--r--src/mainboard/avalue/eax-785e/mptable.c1
-rw-r--r--src/mainboard/avalue/eax-785e/romstage.c1
-rw-r--r--src/mainboard/bap/ode_e20XX/acpi_tables.c1
-rw-r--r--src/mainboard/bap/ode_e20XX/mptable.c1
-rw-r--r--src/mainboard/bap/ode_e21XX/acpi_tables.c1
-rw-r--r--src/mainboard/bap/ode_e21XX/romstage.c1
-rw-r--r--src/mainboard/biostar/a68n_5200/acpi_tables.c1
-rw-r--r--src/mainboard/biostar/a68n_5200/romstage.c1
-rw-r--r--src/mainboard/biostar/am1ml/acpi_tables.c1
-rw-r--r--src/mainboard/biostar/am1ml/mptable.c1
-rw-r--r--src/mainboard/cavium/cn8100_sff_evb/romstage.c1
-rw-r--r--src/mainboard/elmex/pcm205400/acpi_tables.c1
-rw-r--r--src/mainboard/elmex/pcm205400/mptable.c1
-rw-r--r--src/mainboard/emulation/qemu-armv7/mainboard.c1
-rw-r--r--src/mainboard/esd/atom15/acpi_tables.c1
-rw-r--r--src/mainboard/getac/p470/mptable.c1
-rw-r--r--src/mainboard/getac/p470/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/acpi_tables.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/get_bus_conf.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/mptable.c3
-rw-r--r--src/mainboard/gigabyte/ma785gm/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/acpi_tables.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/get_bus_conf.c3
-rw-r--r--src/mainboard/gigabyte/ma785gmt/mptable.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/acpi_tables.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/get_bus_conf.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/mptable.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/romstage.c1
-rw-r--r--src/mainboard/gizmosphere/gizmo/acpi_tables.c1
-rw-r--r--src/mainboard/gizmosphere/gizmo2/acpi_tables.c1
-rw-r--r--src/mainboard/gizmosphere/gizmo2/mptable.c1
-rw-r--r--src/mainboard/google/auron/chromeos.c1
-rw-r--r--src/mainboard/google/auron/variants/auron_paine/pei_data.c1
-rw-r--r--src/mainboard/google/auron/variants/auron_yuna/pei_data.c1
-rw-r--r--src/mainboard/google/auron/variants/buddy/pei_data.c1
-rw-r--r--src/mainboard/google/auron/variants/buddy/variant.c1
-rw-r--r--src/mainboard/google/auron/variants/gandof/pei_data.c1
-rw-r--r--src/mainboard/google/auron/variants/lulu/pei_data.c1
-rw-r--r--src/mainboard/google/beltino/acpi_tables.c1
-rw-r--r--src/mainboard/google/beltino/chromeos.c1
-rw-r--r--src/mainboard/google/beltino/lan.c1
-rw-r--r--src/mainboard/google/beltino/mainboard.c1
-rw-r--r--src/mainboard/google/beltino/romstage.c1
-rw-r--r--src/mainboard/google/butterfly/mainboard.c1
-rw-r--r--src/mainboard/google/butterfly/romstage.c1
-rw-r--r--src/mainboard/google/cyan/chromeos.c1
-rw-r--r--src/mainboard/google/dragonegg/romstage_fsp_params.c1
-rw-r--r--src/mainboard/google/gale/chromeos.c1
-rw-r--r--src/mainboard/google/glados/chromeos.c2
-rw-r--r--src/mainboard/google/jecht/acpi_tables.c1
-rw-r--r--src/mainboard/google/jecht/chromeos.c1
-rw-r--r--src/mainboard/google/jecht/lan.c1
-rw-r--r--src/mainboard/google/jecht/variants/guado/pei_data.c1
-rw-r--r--src/mainboard/google/jecht/variants/jecht/pei_data.c1
-rw-r--r--src/mainboard/google/jecht/variants/rikku/pei_data.c1
-rw-r--r--src/mainboard/google/jecht/variants/tidus/pei_data.c1
-rw-r--r--src/mainboard/google/link/mainboard.c1
-rw-r--r--src/mainboard/google/nyan/chromeos.c1
-rw-r--r--src/mainboard/google/nyan_big/chromeos.c1
-rw-r--r--src/mainboard/google/nyan_blaze/chromeos.c1
-rw-r--r--src/mainboard/google/oak/chromeos.c1
-rw-r--r--src/mainboard/google/octopus/romstage.c2
-rw-r--r--src/mainboard/google/octopus/variants/phaser/variant.c1
-rw-r--r--src/mainboard/google/parrot/acpi_tables.c1
-rw-r--r--src/mainboard/google/parrot/mainboard.c1
-rw-r--r--src/mainboard/google/parrot/romstage.c1
-rw-r--r--src/mainboard/google/rambi/acpi_tables.c1
-rw-r--r--src/mainboard/google/rambi/chromeos.c1
-rw-r--r--src/mainboard/google/rambi/mainboard.c1
-rw-r--r--src/mainboard/google/rambi/romstage.c1
-rw-r--r--src/mainboard/google/rambi/variants/ninja/lan.c1
-rw-r--r--src/mainboard/google/rambi/variants/sumo/lan.c1
-rw-r--r--src/mainboard/google/slippy/acpi_tables.c3
-rw-r--r--src/mainboard/google/slippy/chromeos.c1
-rw-r--r--src/mainboard/google/slippy/mainboard.c1
-rw-r--r--src/mainboard/google/smaug/chromeos.c1
-rw-r--r--src/mainboard/google/storm/chromeos.c1
-rw-r--r--src/mainboard/google/stout/acpi_tables.c1
-rw-r--r--src/mainboard/google/stout/mainboard.c1
-rw-r--r--src/mainboard/google/stout/romstage.c1
-rw-r--r--src/mainboard/google/veyron/chromeos.c1
-rw-r--r--src/mainboard/google/veyron/sdram_configs.c1
-rw-r--r--src/mainboard/google/veyron_mickey/chromeos.c1
-rw-r--r--src/mainboard/google/veyron_mickey/sdram_configs.c1
-rw-r--r--src/mainboard/google/veyron_rialto/chromeos.c1
-rw-r--r--src/mainboard/google/veyron_rialto/sdram_configs.c1
-rw-r--r--src/mainboard/hp/abm/acpi_tables.c1
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/mptable.c1
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/romstage.c1
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c2
-rw-r--r--src/mainboard/ibase/mb899/mptable.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/acpi_tables.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c2
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/mptable.c3
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/romstage.c1
-rw-r--r--src/mainboard/intel/baskingridge/acpi_tables.c3
-rw-r--r--src/mainboard/intel/baskingridge/mainboard.c1
-rw-r--r--src/mainboard/intel/bayleybay_fsp/acpi_tables.c1
-rw-r--r--src/mainboard/intel/bayleybay_fsp/mainboard.c1
-rw-r--r--src/mainboard/intel/camelbackmountain_fsp/mainboard.c1
-rw-r--r--src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c1
-rw-r--r--src/mainboard/intel/d945gclf/mptable.c1
-rw-r--r--src/mainboard/intel/emeraldlake2/acpi_tables.c1
-rw-r--r--src/mainboard/intel/emeraldlake2/mainboard.c1
-rw-r--r--src/mainboard/intel/emeraldlake2/romstage.c1
-rw-r--r--src/mainboard/intel/harcuvar/acpi_tables.c1
-rw-r--r--src/mainboard/intel/harcuvar/fadt.c1
-rw-r--r--src/mainboard/intel/harcuvar/romstage.c1
-rw-r--r--src/mainboard/intel/harcuvar/spd/spd.c1
-rw-r--r--src/mainboard/intel/icelake_rvp/romstage_fsp_params.c1
-rw-r--r--src/mainboard/intel/kblrvp/chromeos.c1
-rw-r--r--src/mainboard/intel/kblrvp/mainboard.c1
-rw-r--r--src/mainboard/intel/kblrvp/romstage.c1
-rw-r--r--src/mainboard/intel/kunimitsu/chromeos.c1
-rw-r--r--src/mainboard/intel/kunimitsu/mainboard.c1
-rw-r--r--src/mainboard/intel/kunimitsu/pei_data.c1
-rw-r--r--src/mainboard/intel/kunimitsu/romstage_fsp20.c1
-rw-r--r--src/mainboard/intel/minnowmax/acpi_tables.c1
-rw-r--r--src/mainboard/intel/strago/acpi_tables.c1
-rw-r--r--src/mainboard/intel/strago/chromeos.c1
-rw-r--r--src/mainboard/intel/strago/romstage.c1
-rw-r--r--src/mainboard/intel/wtm2/acpi_tables.c1
-rw-r--r--src/mainboard/intel/wtm2/chromeos.c1
-rw-r--r--src/mainboard/intel/wtm2/mainboard.c1
-rw-r--r--src/mainboard/intel/wtm2/pei_data.c1
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c1
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/mptable.c4
-rw-r--r--src/mainboard/jetway/pa78vm5/acpi_tables.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/get_bus_conf.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/mptable.c3
-rw-r--r--src/mainboard/jetway/pa78vm5/romstage.c1
-rw-r--r--src/mainboard/kontron/986lcd-m/mptable.c1
-rw-r--r--src/mainboard/kontron/ktqm77/mainboard.c1
-rw-r--r--src/mainboard/kontron/ktqm77/romstage.c1
-rw-r--r--src/mainboard/lenovo/g505s/acpi_tables.c2
-rw-r--r--src/mainboard/lenovo/t430s/variants/t431s/romstage.c1
-rw-r--r--src/mainboard/lenovo/t60/mptable.c1
-rw-r--r--src/mainboard/lenovo/t60/romstage.c1
-rw-r--r--src/mainboard/lenovo/x201/romstage.c1
-rw-r--r--src/mainboard/lenovo/x220/romstage.c1
-rw-r--r--src/mainboard/lenovo/x230/romstage.c1
-rw-r--r--src/mainboard/lenovo/x60/mptable.c1
-rw-r--r--src/mainboard/lenovo/x60/romstage.c1
-rw-r--r--src/mainboard/lenovo/z61t/mptable.c1
-rw-r--r--src/mainboard/lenovo/z61t/romstage.c1
-rw-r--r--src/mainboard/lippert/frontrunner-af/acpi_tables.c1
-rw-r--r--src/mainboard/lippert/toucan-af/acpi_tables.c1
-rw-r--r--src/mainboard/msi/ms7721/acpi_tables.c2
-rw-r--r--src/mainboard/msi/ms9652_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/msi/ms9652_fam10/mptable.c1
-rw-r--r--src/mainboard/msi/ms9652_fam10/romstage.c1
-rw-r--r--src/mainboard/opencellular/elgon/romstage.c1
-rw-r--r--src/mainboard/packardbell/ms2290/romstage.c1
-rw-r--r--src/mainboard/pcengines/apu1/acpi_tables.c1
-rw-r--r--src/mainboard/pcengines/apu1/mptable.c1
-rw-r--r--src/mainboard/pcengines/apu2/acpi_tables.c1
-rw-r--r--src/mainboard/pcengines/apu2/romstage.c1
-rw-r--r--src/mainboard/purism/librem_skl/romstage.c1
-rw-r--r--src/mainboard/roda/rk886ex/mptable.c1
-rw-r--r--src/mainboard/roda/rk886ex/romstage.c1
-rw-r--r--src/mainboard/samsung/lumpy/acpi_tables.c1
-rw-r--r--src/mainboard/samsung/stumpy/acpi_tables.c1
-rw-r--r--src/mainboard/samsung/stumpy/romstage.c1
-rw-r--r--src/mainboard/sapphire/pureplatinumh61/romstage.c2
-rw-r--r--src/mainboard/scaleway/tagada/acpi_tables.c1
-rw-r--r--src/mainboard/scaleway/tagada/bmcinfo.c2
-rw-r--r--src/mainboard/scaleway/tagada/fadt.c1
-rw-r--r--src/mainboard/scaleway/tagada/romstage.c1
-rw-r--r--src/mainboard/siemens/mc_tcu3/acpi_tables.c1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/mptable.c1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/romstage.c1
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/mptable.c1
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/romstage.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/mptable.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/romstage.c1
-rw-r--r--src/mainboard/tyan/s2912_fam10/mptable.c1
-rw-r--r--src/mainboard/tyan/s2912_fam10/romstage.c1
-rw-r--r--src/mainboard/via/epia-m850/romstage.c1
262 files changed, 4 insertions, 289 deletions
diff --git a/src/mainboard/advansus/a785e-i/acpi_tables.c b/src/mainboard/advansus/a785e-i/acpi_tables.c
index b6faccfb1e..7f429996fd 100644
--- a/src/mainboard/advansus/a785e-i/acpi_tables.c
+++ b/src/mainboard/advansus/a785e-i/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c
index 837cb138f8..6b5ae68bc6 100644
--- a/src/mainboard/advansus/a785e-i/get_bus_conf.c
+++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/advansus/a785e-i/mptable.c b/src/mainboard/advansus/a785e-i/mptable.c
index 09eadc550f..cc66ce8266 100644
--- a/src/mainboard/advansus/a785e-i/mptable.c
+++ b/src/mainboard/advansus/a785e-i/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/io.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c
index db8d90a4ad..4a817cf844 100644
--- a/src/mainboard/advansus/a785e-i/romstage.c
+++ b/src/mainboard/advansus/a785e-i/romstage.c
@@ -16,7 +16,6 @@
#define SYSTEM_TYPE 1 /* SERVER=0, DESKTOP=1, MOBILE=2 */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index b0f297cbb4..8c6840476e 100644
--- a/src/mainboard/amd/bettong/acpi_tables.c
+++ b/src/mainboard/amd/bettong/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/bimini_fam10/acpi_tables.c b/src/mainboard/amd/bimini_fam10/acpi_tables.c
index d91188754b..e7659d145f 100644
--- a/src/mainboard/amd/bimini_fam10/acpi_tables.c
+++ b/src/mainboard/amd/bimini_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index df0a564b76..4021c51ff9 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/bimini_fam10/mptable.c b/src/mainboard/amd/bimini_fam10/mptable.c
index e2aec96945..84c4eda9f8 100644
--- a/src/mainboard/amd/bimini_fam10/mptable.c
+++ b/src/mainboard/amd/bimini_fam10/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/io.h>
-#include <string.h>
#include <stdint.h>
#include <southbridge/amd/sb800/sb800.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 1f77351aab..7b2f0513a4 100644
--- a/src/mainboard/amd/bimini_fam10/romstage.c
+++ b/src/mainboard/amd/bimini_fam10/romstage.c
@@ -16,7 +16,6 @@
#define SYSTEM_TYPE 1 /* SERVER = 0, DESKTOP = 1, MOBILE = 2 */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/mptable.c b/src/mainboard/amd/db-ft3b-lc/mptable.c
index aeb814a81b..3aad0e34f4 100644
--- a/src/mainboard/amd/db-ft3b-lc/mptable.c
+++ b/src/mainboard/amd/db-ft3b-lc/mptable.c
@@ -17,7 +17,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/romstage.c b/src/mainboard/amd/db-ft3b-lc/romstage.c
index 2b37f9b2a6..3e9b1c89ca 100644
--- a/src/mainboard/amd/db-ft3b-lc/romstage.c
+++ b/src/mainboard/amd/db-ft3b-lc/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c
index 522a63fef1..d4fb55aac0 100644
--- a/src/mainboard/amd/gardenia/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/BiosCallOuts.c
@@ -17,7 +17,6 @@
#include <amdblocks/BiosCallOuts.h>
#include <soc/southbridge.h>
#include <stdlib.h>
-#include <string.h>
void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env)
{
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c
index 1bbd390fed..8b0c2c9690 100644
--- a/src/mainboard/amd/lamar/acpi_tables.c
+++ b/src/mainboard/amd/lamar/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/lamar/mptable.c b/src/mainboard/amd/lamar/mptable.c
index 5b9170bf71..d89e02fbef 100644
--- a/src/mainboard/amd/lamar/mptable.c
+++ b/src/mainboard/amd/lamar/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/lamar/romstage.c b/src/mainboard/amd/lamar/romstage.c
index bf5c9deeda..3f7d33f11b 100644
--- a/src/mainboard/amd/lamar/romstage.c
+++ b/src/mainboard/amd/lamar/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index c907d68a59..6cdf89ac26 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index bffe1a24f2..090fd54331 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -16,11 +16,9 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-
extern u32 apicid_sb700;
diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index 9140eade9d..c73eb0d388 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/olivehill/romstage.c b/src/mainboard/amd/olivehill/romstage.c
index 7883a7f792..9a28f98b33 100644
--- a/src/mainboard/amd/olivehill/romstage.c
+++ b/src/mainboard/amd/olivehill/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/amd/olivehillplus/acpi_tables.c
+++ b/src/mainboard/amd/olivehillplus/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c
index 4bb35fb3c0..0181747c22 100644
--- a/src/mainboard/amd/olivehillplus/romstage.c
+++ b/src/mainboard/amd/olivehillplus/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index 3ff68e3e41..eba2d1da8b 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 8fda6662db..d9f550ea42 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
index 33a81c6327..e1f2409504 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
index 61aa9067fc..d65b82abf2 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#if CONFIG(LOGICAL_CPUS)
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index 427a3ef398..a525154eb3 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -16,7 +16,6 @@
#define SYSTEM_TYPE 0 /* SERVER */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index 3ff68e3e41..eba2d1da8b 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index cf8469b519..65ed138c8d 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/amd/tilapia_fam10/acpi_tables.c b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi_tables.c
+++ b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
index 6bdf94a39d..37a3774e46 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/tilapia_fam10/mptable.c b/src/mainboard/amd/tilapia_fam10/mptable.c
index bffe1a24f2..090fd54331 100644
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -16,11 +16,9 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-
extern u32 apicid_sb700;
diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index 0a49d2cd1f..a45d8f6510 100644
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -16,7 +16,6 @@
#define SYSTEM_TYPE 1 /* DESKTOP */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c
index a68592a130..7d7d86cc95 100644
--- a/src/mainboard/amd/torpedo/acpi_tables.c
+++ b/src/mainboard/amd/torpedo/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/union_station/OemCustomize.c b/src/mainboard/amd/union_station/OemCustomize.c
index 8a629011ba..866be54d37 100644
--- a/src/mainboard/amd/union_station/OemCustomize.c
+++ b/src/mainboard/amd/union_station/OemCustomize.c
@@ -15,8 +15,6 @@
#include <AGESA.h>
#include <PlatformMemoryConfiguration.h>
-
-#include <string.h>
#include <northbridge/amd/agesa/state_machine.h>
static const PCIe_PORT_DESCRIPTOR PortList[] = {
diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c
index 29814030ad..039e4ecc6a 100644
--- a/src/mainboard/aopen/dxplplusu/acpi_tables.c
+++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c
@@ -18,7 +18,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <device/pci.h>
#include <assert.h>
diff --git a/src/mainboard/apple/macbook21/mptable.c b/src/mainboard/apple/macbook21/mptable.c
index f508eaf34e..cbd30c726e 100644
--- a/src/mainboard/apple/macbook21/mptable.c
+++ b/src/mainboard/apple/macbook21/mptable.c
@@ -18,7 +18,6 @@
#include <device/pci.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/apple/macbook21/romstage.c b/src/mainboard/apple/macbook21/romstage.c
index 63042f60b0..479ab5956b 100644
--- a/src/mainboard/apple/macbook21/romstage.c
+++ b/src/mainboard/apple/macbook21/romstage.c
@@ -18,7 +18,6 @@
/* __PRE_RAM__ means: use "unsigned" for device, not a struct. */
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index bc9c1542bc..787c432041 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.c
@@ -16,7 +16,6 @@
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
unsigned long acpi_fill_madt(unsigned long current)
{
diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/asrock/imb-a180/romstage.c b/src/mainboard/asrock/imb-a180/romstage.c
index 1aa8aa18b9..ce5e0643a5 100644
--- a/src/mainboard/asrock/imb-a180/romstage.c
+++ b/src/mainboard/asrock/imb-a180/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/asus/am1i-a/acpi_tables.c b/src/mainboard/asus/am1i-a/acpi_tables.c
index 12a20ea520..411ebe7436 100644
--- a/src/mainboard/asus/am1i-a/acpi_tables.c
+++ b/src/mainboard/asus/am1i-a/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/asus/am1i-a/mptable.c b/src/mainboard/asus/am1i-a/mptable.c
index 448a89e5cd..d97e6ac7f0 100644
--- a/src/mainboard/asus/am1i-a/mptable.c
+++ b/src/mainboard/asus/am1i-a/mptable.c
@@ -17,7 +17,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index 7338eee5bb..eba2d1da8b 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.c
@@ -16,7 +16,6 @@
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
unsigned long acpi_fill_madt(unsigned long current)
{
diff --git a/src/mainboard/asus/f2a85-m/romstage.c b/src/mainboard/asus/f2a85-m/romstage.c
index dffb726dc6..2727904641 100644
--- a/src/mainboard/asus/f2a85-m/romstage.c
+++ b/src/mainboard/asus/f2a85-m/romstage.c
@@ -23,7 +23,6 @@
#include <southbridge/amd/agesa/hudson/hudson.h>
#include <southbridge/amd/agesa/hudson/smbus.h>
#include <stdint.h>
-#include <string.h>
#include <superio/ite/common/ite.h>
#include <superio/ite/it8728f/it8728f.h>
diff --git a/src/mainboard/asus/kcma-d8/acpi_tables.c b/src/mainboard/asus/kcma-d8/acpi_tables.c
index d705b213a2..53622bae0c 100644
--- a/src/mainboard/asus/kcma-d8/acpi_tables.c
+++ b/src/mainboard/asus/kcma-d8/acpi_tables.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index be7b3001ea..cc64dea2d3 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -15,11 +15,9 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
-
#include <cpu/amd/amdfam10_sysconf.h>
void get_bus_conf(void)
diff --git a/src/mainboard/asus/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index c9b83a0070..65be183ce9 100644
--- a/src/mainboard/asus/kcma-d8/mptable.c
+++ b/src/mainboard/asus/kcma-d8/mptable.c
@@ -17,7 +17,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c
index a74c6dd45c..5d43a54272 100644
--- a/src/mainboard/asus/kcma-d8/romstage.c
+++ b/src/mainboard/asus/kcma-d8/romstage.c
@@ -18,7 +18,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/asus/kfsn4-dre/acpi_tables.c b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
index 587e2ff852..615f8b33e9 100644
--- a/src/mainboard/asus/kfsn4-dre/acpi_tables.c
+++ b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
@@ -20,7 +20,6 @@
* Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering
*/
-#include <string.h>
#include <assert.h>
#include <arch/acpi.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index bb51ada9e0..dd7ebc962c 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -21,7 +21,6 @@
#include <console/console.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/kfsn4-dre/mptable.c b/src/mainboard/asus/kfsn4-dre/mptable.c
index ad3f742373..10a379844d 100644
--- a/src/mainboard/asus/kfsn4-dre/mptable.c
+++ b/src/mainboard/asus/kfsn4-dre/mptable.c
@@ -25,7 +25,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c
index 6ac33f2ccd..dbf704b288 100644
--- a/src/mainboard/asus/kfsn4-dre/romstage.c
+++ b/src/mainboard/asus/kfsn4-dre/romstage.c
@@ -18,7 +18,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/pnp_ops.h>
diff --git a/src/mainboard/asus/kgpe-d16/acpi_tables.c b/src/mainboard/asus/kgpe-d16/acpi_tables.c
index d705b213a2..53622bae0c 100644
--- a/src/mainboard/asus/kgpe-d16/acpi_tables.c
+++ b/src/mainboard/asus/kgpe-d16/acpi_tables.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
index 926472068f..81d0fc1b63 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -15,14 +15,11 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
-
#include <cpu/amd/amdfam10_sysconf.h>
-
void get_bus_conf(void)
{
get_default_pci1234(1);
diff --git a/src/mainboard/asus/kgpe-d16/mptable.c b/src/mainboard/asus/kgpe-d16/mptable.c
index ed01b548db..6d7174da38 100644
--- a/src/mainboard/asus/kgpe-d16/mptable.c
+++ b/src/mainboard/asus/kgpe-d16/mptable.c
@@ -17,7 +17,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index 7fe9b640ad..f7d30bda98 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -18,7 +18,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/mmio.h>
diff --git a/src/mainboard/asus/m4a78-em/acpi_tables.c b/src/mainboard/asus/m4a78-em/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/asus/m4a78-em/acpi_tables.c
+++ b/src/mainboard/asus/m4a78-em/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c
index bffe1a24f2..876e7ee578 100644
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index 0e0e5af761..c99179e48e 100644
--- a/src/mainboard/asus/m4a78-em/romstage.c
+++ b/src/mainboard/asus/m4a78-em/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/asus/m4a785-m/acpi_tables.c b/src/mainboard/asus/m4a785-m/acpi_tables.c
index ec04eff06b..1170ed7a49 100644
--- a/src/mainboard/asus/m4a785-m/acpi_tables.c
+++ b/src/mainboard/asus/m4a785-m/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <console/console.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c
index bffe1a24f2..b04a315bb1 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -16,14 +16,11 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-
extern u32 apicid_sb700;
-
static void *smp_write_config_table(void *v)
{
struct mp_config_table *mc;
diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 8b5a56f9a6..1d5921440d 100644
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/asus/m5a88-v/acpi_tables.c b/src/mainboard/asus/m5a88-v/acpi_tables.c
index b6faccfb1e..7f429996fd 100644
--- a/src/mainboard/asus/m5a88-v/acpi_tables.c
+++ b/src/mainboard/asus/m5a88-v/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index 837cb138f8..6b5ae68bc6 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/m5a88-v/mptable.c b/src/mainboard/asus/m5a88-v/mptable.c
index a5e79e3529..b4cd7e8589 100644
--- a/src/mainboard/asus/m5a88-v/mptable.c
+++ b/src/mainboard/asus/m5a88-v/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/io.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c
index 4ef603ecc2..9216ecb910 100644
--- a/src/mainboard/asus/m5a88-v/romstage.c
+++ b/src/mainboard/asus/m5a88-v/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/asus/p2b-d/mptable.c b/src/mainboard/asus/p2b-d/mptable.c
index dac4e8cb17..fde12814ab 100644
--- a/src/mainboard/asus/p2b-d/mptable.c
+++ b/src/mainboard/asus/p2b-d/mptable.c
@@ -17,7 +17,6 @@
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/asus/p2b-ds/mptable.c b/src/mainboard/asus/p2b-ds/mptable.c
index 8c84099168..4e085b1327 100644
--- a/src/mainboard/asus/p2b-ds/mptable.c
+++ b/src/mainboard/asus/p2b-ds/mptable.c
@@ -17,7 +17,6 @@
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/asus/p5gc-mx/romstage.c b/src/mainboard/asus/p5gc-mx/romstage.c
index 26898cc669..ffb3bf9ea7 100644
--- a/src/mainboard/asus/p5gc-mx/romstage.c
+++ b/src/mainboard/asus/p5gc-mx/romstage.c
@@ -18,7 +18,6 @@
// __PRE_RAM__ means: use "unsigned" for device, not a struct.
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pnp_ops.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/avalue/eax-785e/acpi_tables.c b/src/mainboard/avalue/eax-785e/acpi_tables.c
index b6faccfb1e..7f429996fd 100644
--- a/src/mainboard/avalue/eax-785e/acpi_tables.c
+++ b/src/mainboard/avalue/eax-785e/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/avalue/eax-785e/get_bus_conf.c b/src/mainboard/avalue/eax-785e/get_bus_conf.c
index 837cb138f8..6b5ae68bc6 100644
--- a/src/mainboard/avalue/eax-785e/get_bus_conf.c
+++ b/src/mainboard/avalue/eax-785e/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/avalue/eax-785e/mptable.c b/src/mainboard/avalue/eax-785e/mptable.c
index 4cc20fc47f..81763f99c7 100644
--- a/src/mainboard/avalue/eax-785e/mptable.c
+++ b/src/mainboard/avalue/eax-785e/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/io.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c
index 6b91381853..934791926c 100644
--- a/src/mainboard/avalue/eax-785e/romstage.c
+++ b/src/mainboard/avalue/eax-785e/romstage.c
@@ -16,7 +16,6 @@
#define SYSTEM_TYPE 1 /* SERVER=0, DESKTOP=1, MOBILE=2 */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/bap/ode_e20XX/mptable.c b/src/mainboard/bap/ode_e20XX/mptable.c
index d0704f370d..ea9f95947d 100644
--- a/src/mainboard/bap/ode_e20XX/mptable.c
+++ b/src/mainboard/bap/ode_e20XX/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/bap/ode_e21XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/bap/ode_e21XX/romstage.c b/src/mainboard/bap/ode_e21XX/romstage.c
index af8fd2a70b..10b7aabe83 100644
--- a/src/mainboard/bap/ode_e21XX/romstage.c
+++ b/src/mainboard/bap/ode_e21XX/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/biostar/a68n_5200/acpi_tables.c b/src/mainboard/biostar/a68n_5200/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/biostar/a68n_5200/acpi_tables.c
+++ b/src/mainboard/biostar/a68n_5200/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/biostar/a68n_5200/romstage.c b/src/mainboard/biostar/a68n_5200/romstage.c
index 31a0dd767f..ddcf4d0f78 100644
--- a/src/mainboard/biostar/a68n_5200/romstage.c
+++ b/src/mainboard/biostar/a68n_5200/romstage.c
@@ -16,7 +16,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index 12a20ea520..411ebe7436 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/biostar/am1ml/mptable.c b/src/mainboard/biostar/am1ml/mptable.c
index cb1274ed91..4d93361cba 100644
--- a/src/mainboard/biostar/am1ml/mptable.c
+++ b/src/mainboard/biostar/am1ml/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/cavium/cn8100_sff_evb/romstage.c b/src/mainboard/cavium/cn8100_sff_evb/romstage.c
index 7bb53e3de3..b60b9cdc84 100644
--- a/src/mainboard/cavium/cn8100_sff_evb/romstage.c
+++ b/src/mainboard/cavium/cn8100_sff_evb/romstage.c
@@ -20,7 +20,6 @@
#include <soc/mmu.h>
#include <stdlib.h>
#include <libbdk-hal/bdk-config.h>
-#include <string.h>
extern const struct bdk_devicetree_key_value devtree[];
diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/elmex/pcm205400/acpi_tables.c
+++ b/src/mainboard/elmex/pcm205400/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/elmex/pcm205400/mptable.c b/src/mainboard/elmex/pcm205400/mptable.c
index 8fda6662db..d9f550ea42 100644
--- a/src/mainboard/elmex/pcm205400/mptable.c
+++ b/src/mainboard/elmex/pcm205400/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
index 08b9bf2213..cc14dd8e7b 100644
--- a/src/mainboard/emulation/qemu-armv7/mainboard.c
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -17,7 +17,6 @@
#include <console/console.h>
#include <device/device.h>
#include <cbmem.h>
-#include <string.h>
#include <halt.h>
#include "mainboard.h"
#include <edid.h>
diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index edb66fc036..fe95a3106c 100644
--- a/src/mainboard/esd/atom15/acpi_tables.c
+++ b/src/mainboard/esd/atom15/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/getac/p470/mptable.c b/src/mainboard/getac/p470/mptable.c
index c00102d03b..86006e1363 100644
--- a/src/mainboard/getac/p470/mptable.c
+++ b/src/mainboard/getac/p470/mptable.c
@@ -18,7 +18,6 @@
#include <device/pci.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index 3bc4aa681a..423b4e869b 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pnp_ops.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index b3ee2a8e79..b2d4bb45aa 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
@@ -17,7 +17,6 @@
// __PRE_RAM__ means: use "unsigned" for device, not a struct.
#include <stdint.h>
-#include <string.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gigabyte/ma785gm/acpi_tables.c b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/gigabyte/ma785gm/mptable.c b/src/mainboard/gigabyte/ma785gm/mptable.c
index bffe1a24f2..b04a315bb1 100644
--- a/src/mainboard/gigabyte/ma785gm/mptable.c
+++ b/src/mainboard/gigabyte/ma785gm/mptable.c
@@ -16,14 +16,11 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-
extern u32 apicid_sb700;
-
static void *smp_write_config_table(void *v)
{
struct mp_config_table *mc;
diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index f197ba9105..4ca318a4d8 100644
--- a/src/mainboard/gigabyte/ma785gm/romstage.c
+++ b/src/mainboard/gigabyte/ma785gm/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
index 241e187283..5c53476a11 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
@@ -14,11 +14,9 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
-
#include <cpu/amd/amdfam10_sysconf.h>
/* Global variables for MB layouts and these will be shared by irqtable mptable
@@ -26,7 +24,6 @@
*/
u32 apicid_sb700;
-
void get_bus_conf(void)
{
u32 apicid_base;
diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index bffe1a24f2..876e7ee578 100644
--- a/src/mainboard/gigabyte/ma785gmt/mptable.c
+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index 1a0a0119be..746be76642 100644
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gigabyte/ma78gm/acpi_tables.c b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c
index bffe1a24f2..876e7ee578 100644
--- a/src/mainboard/gigabyte/ma78gm/mptable.c
+++ b/src/mainboard/gigabyte/ma78gm/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index aa80a27398..4d23bac7b8 100644
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index 39d9096bf5..2154cd842f 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/mptable.c b/src/mainboard/gizmosphere/gizmo2/mptable.c
index d0704f370d..ea9f95947d 100644
--- a/src/mainboard/gizmosphere/gizmo2/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo2/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c
index 3355136a29..c27ad9e164 100644
--- a/src/mainboard/google/auron/chromeos.c
+++ b/src/mainboard/google/auron/chromeos.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/google/auron/variants/auron_paine/pei_data.c b/src/mainboard/google/auron/variants/auron_paine/pei_data.c
index a5b2384d4c..96dbe660e0 100644
--- a/src/mainboard/google/auron/variants/auron_paine/pei_data.c
+++ b/src/mainboard/google/auron/variants/auron_paine/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/auron_yuna/pei_data.c b/src/mainboard/google/auron/variants/auron_yuna/pei_data.c
index a5b2384d4c..96dbe660e0 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/pei_data.c
+++ b/src/mainboard/google/auron/variants/auron_yuna/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/buddy/pei_data.c b/src/mainboard/google/auron/variants/buddy/pei_data.c
index 159d5f6d1e..f3463727eb 100644
--- a/src/mainboard/google/auron/variants/buddy/pei_data.c
+++ b/src/mainboard/google/auron/variants/buddy/pei_data.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/buddy/variant.c b/src/mainboard/google/auron/variants/buddy/variant.c
index 5afb26c5e6..9f8188fe43 100644
--- a/src/mainboard/google/auron/variants/buddy/variant.c
+++ b/src/mainboard/google/auron/variants/buddy/variant.c
@@ -14,7 +14,6 @@
#include <cbfs.h>
#include <fmap.h>
#include <types.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
diff --git a/src/mainboard/google/auron/variants/gandof/pei_data.c b/src/mainboard/google/auron/variants/gandof/pei_data.c
index ef2e3362c4..a86fb0e9b3 100644
--- a/src/mainboard/google/auron/variants/gandof/pei_data.c
+++ b/src/mainboard/google/auron/variants/gandof/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/lulu/pei_data.c b/src/mainboard/google/auron/variants/lulu/pei_data.c
index be7626c4d7..e5976bcebf 100644
--- a/src/mainboard/google/auron/variants/lulu/pei_data.c
+++ b/src/mainboard/google/auron/variants/lulu/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 7356030394..2b2acbad61 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <types.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 8e8764e048..c6b0db2821 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <device/pci_ops.h>
#include <bootmode.h>
#include <device/device.h>
diff --git a/src/mainboard/google/beltino/lan.c b/src/mainboard/google/beltino/lan.c
index 7286437d46..090f280a83 100644
--- a/src/mainboard/google/beltino/lan.c
+++ b/src/mainboard/google/beltino/lan.c
@@ -14,7 +14,6 @@
*/
#include <cbfs.h>
-#include <string.h>
#include <types.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index 9466418f04..e0fd105eb1 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <smbios.h>
-#include <string.h>
#include <types.h>
#include <arch/acpi.h>
#include <arch/io.h>
diff --git a/src/mainboard/google/beltino/romstage.c b/src/mainboard/google/beltino/romstage.c
index 614a22ec81..70a8c1928a 100644
--- a/src/mainboard/google/beltino/romstage.c
+++ b/src/mainboard/google/beltino/romstage.c
@@ -16,7 +16,6 @@
#include <stdint.h>
#include <stdlib.h>
-#include <string.h>
#include <cpu/intel/romstage.h>
#include <cpu/intel/haswell/haswell.h>
#include <northbridge/intel/haswell/haswell.h>
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 6b6927729b..9cc13c9473 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <cbfs.h>
#include <device/device.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index 6dfbfcb8a0..d34b1e4574 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 4b148f8380..44101e347c 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -17,7 +17,6 @@
#include <device/mmio.h>
#include <gpio.h>
#include <soc/gpio.h>
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
/* The WP status pin lives on MF_ISH_GPIO_4 */
diff --git a/src/mainboard/google/dragonegg/romstage_fsp_params.c b/src/mainboard/google/dragonegg/romstage_fsp_params.c
index fd797ae937..e866c620d9 100644
--- a/src/mainboard/google/dragonegg/romstage_fsp_params.c
+++ b/src/mainboard/google/dragonegg/romstage_fsp_params.c
@@ -17,7 +17,6 @@
#include <baseboard/variants.h>
#include <console/console.h>
#include <soc/romstage.h>
-#include <string.h>
void mainboard_memory_init_params(FSPM_UPD *mupd)
{
diff --git a/src/mainboard/google/gale/chromeos.c b/src/mainboard/google/gale/chromeos.c
index 939b061b6e..09fdc2fa60 100644
--- a/src/mainboard/google/gale/chromeos.c
+++ b/src/mainboard/google/gale/chromeos.c
@@ -21,7 +21,6 @@
#include <gpio.h>
#include <soc/cdp.h>
#include <soc/blsp.h>
-#include <string.h>
#include <timer.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index 490ec002ef..f826b55ea8 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -16,9 +16,7 @@
#include <gpio.h>
#include <soc/gpio.h>
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
-
#include <variant/gpio.h>
#if ENV_RAMSTAGE
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index c78a219f3c..879ff93d97 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index 6008ba70e3..05c8a3e298 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <device/pci_ops.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/jecht/lan.c b/src/mainboard/google/jecht/lan.c
index 8a8b223624..f733bca112 100644
--- a/src/mainboard/google/jecht/lan.c
+++ b/src/mainboard/google/jecht/lan.c
@@ -16,7 +16,6 @@
#include <cbfs.h>
#include <fmap.h>
#include <types.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
diff --git a/src/mainboard/google/jecht/variants/guado/pei_data.c b/src/mainboard/google/jecht/variants/guado/pei_data.c
index 1b5ea51532..87ca1dc0c6 100644
--- a/src/mainboard/google/jecht/variants/guado/pei_data.c
+++ b/src/mainboard/google/jecht/variants/guado/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/jecht/pei_data.c b/src/mainboard/google/jecht/variants/jecht/pei_data.c
index 1b5ea51532..87ca1dc0c6 100644
--- a/src/mainboard/google/jecht/variants/jecht/pei_data.c
+++ b/src/mainboard/google/jecht/variants/jecht/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/rikku/pei_data.c b/src/mainboard/google/jecht/variants/rikku/pei_data.c
index 4eeabbeec4..14f96767fd 100644
--- a/src/mainboard/google/jecht/variants/rikku/pei_data.c
+++ b/src/mainboard/google/jecht/variants/rikku/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/tidus/pei_data.c b/src/mainboard/google/jecht/variants/tidus/pei_data.c
index 7c03422553..b7974ea774 100644
--- a/src/mainboard/google/jecht/variants/tidus/pei_data.c
+++ b/src/mainboard/google/jecht/variants/tidus/pei_data.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 04b03bad0a..410866d0fe 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index 4fb8e78cab..be1b98d3ce 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -16,7 +16,6 @@
#include <boot/coreboot_tables.h>
#include <bootmode.h>
#include <gpio.h>
-#include <string.h>
void fill_lb_gpios(struct lb_gpios *gpios)
{
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index f466d914ad..945a0e743c 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -16,7 +16,6 @@
#include <boot/coreboot_tables.h>
#include <bootmode.h>
#include <gpio.h>
-#include <string.h>
void fill_lb_gpios(struct lb_gpios *gpios)
{
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index f466d914ad..945a0e743c 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -16,7 +16,6 @@
#include <boot/coreboot_tables.h>
#include <bootmode.h>
#include <gpio.h>
-#include <string.h>
void fill_lb_gpios(struct lb_gpios *gpios)
{
diff --git a/src/mainboard/google/oak/chromeos.c b/src/mainboard/google/oak/chromeos.c
index 93791fb37f..b5d70238a1 100644
--- a/src/mainboard/google/oak/chromeos.c
+++ b/src/mainboard/google/oak/chromeos.c
@@ -17,7 +17,6 @@
#include <bootmode.h>
#include <boot/coreboot_tables.h>
#include <gpio.h>
-#include <string.h>
#include "gpio.h"
diff --git a/src/mainboard/google/octopus/romstage.c b/src/mainboard/google/octopus/romstage.c
index c5bd9963ae..9d8b94d0b9 100644
--- a/src/mainboard/google/octopus/romstage.c
+++ b/src/mainboard/google/octopus/romstage.c
@@ -12,7 +12,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <string.h>
+
#include <baseboard/variants.h>
#include <boardid.h>
#include <console/console.h>
diff --git a/src/mainboard/google/octopus/variants/phaser/variant.c b/src/mainboard/google/octopus/variants/phaser/variant.c
index eb080f025f..aeefda54bc 100644
--- a/src/mainboard/google/octopus/variants/phaser/variant.c
+++ b/src/mainboard/google/octopus/variants/phaser/variant.c
@@ -15,7 +15,6 @@
#include <baseboard/variants.h>
#include <soc/pci_devs.h>
-#include <string.h>
#include <ec/google/chromeec/ec.h>
#define SKU_UNKNOWN 0xFFFFFFFF
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 77b7d5ea90..93d77daf03 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 2936fa2021..52e4af3ea7 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index da6b50d76f..76a4b4b677 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 3837a52bb7..8e6db19a4d 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c
index 99a97d8bf4..d47a323a4f 100644
--- a/src/mainboard/google/rambi/chromeos.c
+++ b/src/mainboard/google/rambi/chromeos.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <bootmode.h>
#include <soc/gpio.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index 59eeefb27e..15faac9bf8 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/google/rambi/romstage.c b/src/mainboard/google/rambi/romstage.c
index 005ddc3bd4..5322267af9 100644
--- a/src/mainboard/google/rambi/romstage.c
+++ b/src/mainboard/google/rambi/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <cbfs.h>
#include <console/console.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/google/rambi/variants/ninja/lan.c b/src/mainboard/google/rambi/variants/ninja/lan.c
index 93ecc3ab5e..edf2a62bad 100644
--- a/src/mainboard/google/rambi/variants/ninja/lan.c
+++ b/src/mainboard/google/rambi/variants/ninja/lan.c
@@ -14,7 +14,6 @@
*/
#include <cbfs.h>
-#include <string.h>
#include <types.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/google/rambi/variants/sumo/lan.c b/src/mainboard/google/rambi/variants/sumo/lan.c
index 9a3c1301c8..9ed2b04967 100644
--- a/src/mainboard/google/rambi/variants/sumo/lan.c
+++ b/src/mainboard/google/rambi/variants/sumo/lan.c
@@ -14,7 +14,6 @@
*/
#include <cbfs.h>
-#include <string.h>
#include <types.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index bf5e2947a9..0b303ae6dd 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -14,16 +14,15 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
#include <vendorcode/google/chromeos/gnvs.h>
#include <ec/google/chromeec/ec.h>
-
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/lynxpoint/nvs.h>
+
#include "thermal.h"
static void acpi_update_thermal_table(global_nvs_t *gnvs)
diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index e26c3fb005..6cae38d442 100644
--- a/src/mainboard/google/slippy/chromeos.c
+++ b/src/mainboard/google/slippy/chromeos.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <bootmode.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/common/gpio.h>
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index e44abcd917..4bbc1d6907 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <smbios.h>
#include <device/device.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index fe8e5aa95d..86e8cb2edb 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -15,7 +15,6 @@
#include <bootmode.h>
#include <boot/coreboot_tables.h>
-#include <string.h>
#include "gpio.h"
diff --git a/src/mainboard/google/storm/chromeos.c b/src/mainboard/google/storm/chromeos.c
index 3110228ef2..b829457890 100644
--- a/src/mainboard/google/storm/chromeos.c
+++ b/src/mainboard/google/storm/chromeos.c
@@ -21,7 +21,6 @@
#include <gpio.h>
#include <soc/cdp.h>
#include <soc/gsbi.h>
-#include <string.h>
#include <timer.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 681aa55f85..46aadaf75b 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 2024abf34c..5f51a6b8bc 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index d76e9c184c..7539dd7f51 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron/chromeos.c
index 8547cdb216..ac14e37886 100644
--- a/src/mainboard/google/veyron/chromeos.c
+++ b/src/mainboard/google/veyron/chromeos.c
@@ -17,7 +17,6 @@
#include <ec/google/chromeec/ec.h>
#include <ec/google/chromeec/ec_commands.h>
#include <gpio.h>
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "board.h"
diff --git a/src/mainboard/google/veyron/sdram_configs.c b/src/mainboard/google/veyron/sdram_configs.c
index 8cc16b3147..291bc33fe9 100644
--- a/src/mainboard/google/veyron/sdram_configs.c
+++ b/src/mainboard/google/veyron/sdram_configs.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <gpio.h>
#include <soc/sdram.h>
-#include <string.h>
#include <types.h>
static struct rk3288_sdram_params sdram_configs[] = {
diff --git a/src/mainboard/google/veyron_mickey/chromeos.c b/src/mainboard/google/veyron_mickey/chromeos.c
index 92d5f9aa48..c775e48133 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.c
+++ b/src/mainboard/google/veyron_mickey/chromeos.c
@@ -15,7 +15,6 @@
#include <boot/coreboot_tables.h>
#include <gpio.h>
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "board.h"
diff --git a/src/mainboard/google/veyron_mickey/sdram_configs.c b/src/mainboard/google/veyron_mickey/sdram_configs.c
index 8cc16b3147..291bc33fe9 100644
--- a/src/mainboard/google/veyron_mickey/sdram_configs.c
+++ b/src/mainboard/google/veyron_mickey/sdram_configs.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <gpio.h>
#include <soc/sdram.h>
-#include <string.h>
#include <types.h>
static struct rk3288_sdram_params sdram_configs[] = {
diff --git a/src/mainboard/google/veyron_rialto/chromeos.c b/src/mainboard/google/veyron_rialto/chromeos.c
index d527ede5e9..a0ac77edbc 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.c
+++ b/src/mainboard/google/veyron_rialto/chromeos.c
@@ -15,7 +15,6 @@
#include <boot/coreboot_tables.h>
#include <gpio.h>
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "board.h"
diff --git a/src/mainboard/google/veyron_rialto/sdram_configs.c b/src/mainboard/google/veyron_rialto/sdram_configs.c
index 590b051ff8..8eae71dcbd 100644
--- a/src/mainboard/google/veyron_rialto/sdram_configs.c
+++ b/src/mainboard/google/veyron_rialto/sdram_configs.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <gpio.h>
#include <soc/sdram.h>
-#include <string.h>
#include <types.h>
static struct rk3288_sdram_params sdram_configs[] = {
diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/mptable.c b/src/mainboard/hp/dl165_g6_fam10/mptable.c
index f204632078..6bf83cf928 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mptable.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mptable.c
@@ -28,7 +28,6 @@
#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#if CONFIG(LOGICAL_CPUS)
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 66c480ebad..c02b0e624e 100644
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -22,7 +22,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index a840fe8545..eba2d1da8b 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -13,11 +13,9 @@
* GNU General Public License for more details.
*/
-
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
unsigned long acpi_fill_madt(unsigned long current)
{
diff --git a/src/mainboard/ibase/mb899/mptable.c b/src/mainboard/ibase/mb899/mptable.c
index 89fba6bd96..14f93eca51 100644
--- a/src/mainboard/ibase/mb899/mptable.c
+++ b/src/mainboard/ibase/mb899/mptable.c
@@ -18,7 +18,6 @@
#include <console/console.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
index c907d68a59..6cdf89ac26 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
index 30c1026c16..237ef2a2bd 100644
--- a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
+++ b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
@@ -14,11 +14,9 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
-
#include <cpu/amd/amdfam10_sysconf.h>
/* Global variables for MB layouts and these will be shared by irqtable mptable
diff --git a/src/mainboard/iei/kino-780am2-fam10/mptable.c b/src/mainboard/iei/kino-780am2-fam10/mptable.c
index bffe1a24f2..b04a315bb1 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mptable.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mptable.c
@@ -16,14 +16,11 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-
extern u32 apicid_sb700;
-
static void *smp_write_config_table(void *v)
{
struct mp_config_table *mc;
diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index 1c41df4c70..421e613072 100644
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index 081733c6c4..497b10b3ee 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -14,15 +14,14 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
#include <vendorcode/google/chromeos/gnvs.h>
-
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/lynxpoint/nvs.h>
+
#include "thermal.h"
static void acpi_update_thermal_table(global_nvs_t *gnvs)
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index 8c8ae40df2..49e66bff80 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 2903a5c5e0..d81798c6b0 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/mainboard.c b/src/mainboard/intel/bayleybay_fsp/mainboard.c
index 328087847a..16c1844ce5 100644
--- a/src/mainboard/intel/bayleybay_fsp/mainboard.c
+++ b/src/mainboard/intel/bayleybay_fsp/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
index 88cfb1d26f..ee9f36ed31 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
+++ b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c b/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c
index 457be7f2c7..2396505906 100644
--- a/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c
+++ b/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c
@@ -19,7 +19,6 @@
#include <fsp/api.h>
#include <soc/romstage.h>
#include "spd/spd.h"
-#include <string.h>
#include <spd_bin.h>
void mainboard_memory_init_params(FSPM_UPD *mupd)
diff --git a/src/mainboard/intel/d945gclf/mptable.c b/src/mainboard/intel/d945gclf/mptable.c
index d9aa098afd..c58cbf5999 100644
--- a/src/mainboard/intel/d945gclf/mptable.c
+++ b/src/mainboard/intel/d945gclf/mptable.c
@@ -17,7 +17,6 @@
#include <device/pci.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 666d48d7b1..74edc385c1 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index c57bd6f6ef..d07da832ca 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index 1259fe8a04..9a9fc24677 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index e126bd8e83..43818eebe4 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -16,7 +16,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/intel/harcuvar/fadt.c b/src/mainboard/intel/harcuvar/fadt.c
index d6c701a968..d26987187b 100644
--- a/src/mainboard/intel/harcuvar/fadt.c
+++ b/src/mainboard/intel/harcuvar/fadt.c
@@ -15,7 +15,6 @@
*
*/
-#include <string.h>
#include <arch/acpi.h>
#include <soc/acpi.h>
diff --git a/src/mainboard/intel/harcuvar/romstage.c b/src/mainboard/intel/harcuvar/romstage.c
index 44fdc4f467..53ecdec0da 100644
--- a/src/mainboard/intel/harcuvar/romstage.c
+++ b/src/mainboard/intel/harcuvar/romstage.c
@@ -20,7 +20,6 @@
#include <console/console.h>
#include <fsp/api.h>
#include <fsp/soc_binding.h>
-#include <string.h>
#if CONFIG(ENABLE_FSP_MEMORY_DOWN)
diff --git a/src/mainboard/intel/harcuvar/spd/spd.c b/src/mainboard/intel/harcuvar/spd/spd.c
index 37f4424684..914e4fd14c 100644
--- a/src/mainboard/intel/harcuvar/spd/spd.c
+++ b/src/mainboard/intel/harcuvar/spd/spd.c
@@ -18,7 +18,6 @@
#include <arch/byteorder.h>
#include <cbfs.h>
#include <console/console.h>
-#include <string.h>
#include "spd.h"
diff --git a/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c b/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
index 2d23fa3c68..dd33021ae5 100644
--- a/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
+++ b/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
@@ -18,7 +18,6 @@
#include <fsp/api.h>
#include <soc/romstage.h>
#include "spd/spd.h"
-#include <string.h>
#include <spd_bin.h>
void mainboard_memory_init_params(FSPM_UPD *mupd)
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index 101b04be74..51680742ad 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -18,7 +18,6 @@
#include <device/pci.h>
#include <gpio.h>
#include <soc/gpio.h>
-#include <string.h>
#include <ec/google/chromeec/ec.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/kblrvp/mainboard.c b/src/mainboard/intel/kblrvp/mainboard.c
index 604c069d77..78c7ae45fb 100644
--- a/src/mainboard/intel/kblrvp/mainboard.c
+++ b/src/mainboard/intel/kblrvp/mainboard.c
@@ -19,7 +19,6 @@
#include <device/device.h>
#include <gpio.h>
#include <stdlib.h>
-#include <string.h>
#include <soc/nhlt.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
diff --git a/src/mainboard/intel/kblrvp/romstage.c b/src/mainboard/intel/kblrvp/romstage.c
index c96f791516..1a483bda45 100644
--- a/src/mainboard/intel/kblrvp/romstage.c
+++ b/src/mainboard/intel/kblrvp/romstage.c
@@ -22,7 +22,6 @@
#include <soc/romstage.h>
#include <soc/gpio.h>
#include "spd/spd.h"
-#include <string.h>
#include <spd_bin.h>
#include "board_id.h"
diff --git a/src/mainboard/intel/kunimitsu/chromeos.c b/src/mainboard/intel/kunimitsu/chromeos.c
index 75115c88ba..f7a9d52ba6 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.c
+++ b/src/mainboard/intel/kunimitsu/chromeos.c
@@ -16,7 +16,6 @@
#include <gpio.h>
#include <soc/gpio.h>
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "gpio.h"
diff --git a/src/mainboard/intel/kunimitsu/mainboard.c b/src/mainboard/intel/kunimitsu/mainboard.c
index c87b565e74..4c93051dea 100644
--- a/src/mainboard/intel/kunimitsu/mainboard.c
+++ b/src/mainboard/intel/kunimitsu/mainboard.c
@@ -20,7 +20,6 @@
#include <device/device.h>
#include <gpio.h>
#include <stdlib.h>
-#include <string.h>
#include <soc/nhlt.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
diff --git a/src/mainboard/intel/kunimitsu/pei_data.c b/src/mainboard/intel/kunimitsu/pei_data.c
index 6a211243a7..bfc40c2748 100644
--- a/src/mainboard/intel/kunimitsu/pei_data.c
+++ b/src/mainboard/intel/kunimitsu/pei_data.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
#include "boardid.h"
diff --git a/src/mainboard/intel/kunimitsu/romstage_fsp20.c b/src/mainboard/intel/kunimitsu/romstage_fsp20.c
index 285239a3c9..ee1ddd58cb 100644
--- a/src/mainboard/intel/kunimitsu/romstage_fsp20.c
+++ b/src/mainboard/intel/kunimitsu/romstage_fsp20.c
@@ -20,7 +20,6 @@
#include <soc/romstage.h>
#include <soc/gpio.h>
#include "spd/spd.h"
-#include <string.h>
void mainboard_memory_init_params(FSPM_UPD *mupd)
{
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index edb66fc036..fe95a3106c 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 29c5de7dfa..38ca9ff8a2 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -22,7 +22,6 @@
#include <soc/acpi.h>
#include <soc/iomap.h>
#include <soc/nvs.h>
-#include <string.h>
#include <types.h>
#include <boardid.h>
#include "onboard.h"
diff --git a/src/mainboard/intel/strago/chromeos.c b/src/mainboard/intel/strago/chromeos.c
index 5e9cad641f..03eff1be4e 100644
--- a/src/mainboard/intel/strago/chromeos.c
+++ b/src/mainboard/intel/strago/chromeos.c
@@ -15,7 +15,6 @@
*/
#include <gpio.h>
-#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#define WP_GPIO GP_E_22
diff --git a/src/mainboard/intel/strago/romstage.c b/src/mainboard/intel/strago/romstage.c
index c25e31723c..0f3067ea81 100644
--- a/src/mainboard/intel/strago/romstage.c
+++ b/src/mainboard/intel/strago/romstage.c
@@ -17,7 +17,6 @@
#include <soc/gpio.h>
#include <soc/pci_devs.h>
#include <soc/romstage.h>
-#include <string.h>
#include <chip.h>
#include "onboard.h"
#include <boardid.h>
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index 39bf213092..c94c7bff55 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index ad651f5c8c..9487e9b391 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <bootmode.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index 83975dbe51..4bfd039117 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/intel/wtm2/pei_data.c b/src/mainboard/intel/wtm2/pei_data.c
index 0b0e941639..705904e5d9 100644
--- a/src/mainboard/intel/wtm2/pei_data.c
+++ b/src/mainboard/intel/wtm2/pei_data.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index bc9c1542bc..787c432041 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
@@ -16,7 +16,6 @@
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
unsigned long acpi_fill_madt(unsigned long current)
{
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
index 9ae585854d..8fbdc58a77 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
@@ -15,18 +15,14 @@
* GNU General Public License for more details.
*/
-
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <drivers/generic/ioapic/chip.h>
#include <stdint.h>
-#include <string.h>
-
#include <southbridge/amd/common/amd_pci_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
-
static void *smp_write_config_table(void *v)
{
struct mp_config_table *mc;
diff --git a/src/mainboard/jetway/pa78vm5/acpi_tables.c b/src/mainboard/jetway/pa78vm5/acpi_tables.c
index 8c6a0962f5..92e711866f 100644
--- a/src/mainboard/jetway/pa78vm5/acpi_tables.c
+++ b/src/mainboard/jetway/pa78vm5/acpi_tables.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/jetway/pa78vm5/get_bus_conf.c b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/jetway/pa78vm5/get_bus_conf.c
+++ b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
@@ -14,7 +14,6 @@
*/
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/jetway/pa78vm5/mptable.c b/src/mainboard/jetway/pa78vm5/mptable.c
index 5fb82ff52a..6e9d1cce06 100644
--- a/src/mainboard/jetway/pa78vm5/mptable.c
+++ b/src/mainboard/jetway/pa78vm5/mptable.c
@@ -17,14 +17,11 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-
extern u32 apicid_sb700;
-
static void *smp_write_config_table(void *v)
{
struct mp_config_table *mc;
diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index 7a90f50bcd..7fcb594391 100644
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -19,7 +19,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c
index 7db977d136..2edb7daf0e 100644
--- a/src/mainboard/kontron/986lcd-m/mptable.c
+++ b/src/mainboard/kontron/986lcd-m/mptable.c
@@ -18,7 +18,6 @@
#include <console/console.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 26e02a0739..afedbfce83 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -16,7 +16,6 @@
*/
#include <types.h>
-#include <string.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 0ea982c029..f778f96432 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pnp_ops.h>
#include <device/pci_ops.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index a840fe8545..eba2d1da8b 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.c
@@ -13,11 +13,9 @@
* GNU General Public License for more details.
*/
-
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
unsigned long acpi_fill_madt(unsigned long current)
{
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/romstage.c b/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
index 01728a36a0..7591f8b873 100644
--- a/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
+++ b/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
@@ -21,6 +21,7 @@
#include <console/console.h>
#include <cbfs.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
+#include <string.h>
#include <southbridge/intel/bd82x6x/pch.h>
#include <ec/lenovo/pmh7/pmh7.h>
diff --git a/src/mainboard/lenovo/t60/mptable.c b/src/mainboard/lenovo/t60/mptable.c
index 8a9ee4838e..838757e0c6 100644
--- a/src/mainboard/lenovo/t60/mptable.c
+++ b/src/mainboard/lenovo/t60/mptable.c
@@ -18,7 +18,6 @@
#include <device/pci.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index 565fe2f437..070ee5951e 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -18,7 +18,6 @@
// __PRE_RAM__ means: use "unsigned" for device, not a struct.
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pnp_ops.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index caaeffc0d7..c5a3120838 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -19,7 +19,6 @@
/* __PRE_RAM__ means: use "unsigned" for device, not a struct. */
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c
index 38ede4bfff..a5b0c8189b 100644
--- a/src/mainboard/lenovo/x220/romstage.c
+++ b/src/mainboard/lenovo/x220/romstage.c
@@ -16,7 +16,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <arch/byteorder.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 614ad5e807..f97c3f503c 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -16,7 +16,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <arch/byteorder.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x60/mptable.c b/src/mainboard/lenovo/x60/mptable.c
index 7b23d5aa97..0118ba002f 100644
--- a/src/mainboard/lenovo/x60/mptable.c
+++ b/src/mainboard/lenovo/x60/mptable.c
@@ -18,7 +18,6 @@
#include <device/pci.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 513e8e15bb..39e0ed57ac 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -18,7 +18,6 @@
// __PRE_RAM__ means: use "unsigned" for device, not a struct.
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pnp_ops.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/lenovo/z61t/mptable.c b/src/mainboard/lenovo/z61t/mptable.c
index 8a9ee4838e..838757e0c6 100644
--- a/src/mainboard/lenovo/z61t/mptable.c
+++ b/src/mainboard/lenovo/z61t/mptable.c
@@ -18,7 +18,6 @@
#include <device/pci.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/lenovo/z61t/romstage.c b/src/mainboard/lenovo/z61t/romstage.c
index 9d606f7801..45cd9ecab4 100644
--- a/src/mainboard/lenovo/z61t/romstage.c
+++ b/src/mainboard/lenovo/z61t/romstage.c
@@ -18,7 +18,6 @@
// __PRE_RAM__ means: use "unsigned" for device, not a struct.
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pnp_ops.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/msi/ms7721/acpi_tables.c b/src/mainboard/msi/ms7721/acpi_tables.c
index a840fe8545..eba2d1da8b 100644
--- a/src/mainboard/msi/ms7721/acpi_tables.c
+++ b/src/mainboard/msi/ms7721/acpi_tables.c
@@ -13,11 +13,9 @@
* GNU General Public License for more details.
*/
-
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
-#include <string.h>
unsigned long acpi_fill_madt(unsigned long current)
{
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index 6e759739c9..c81798587f 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -19,7 +19,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/msi/ms9652_fam10/mptable.c b/src/mainboard/msi/ms9652_fam10/mptable.c
index f3947e7b60..13b5d92125 100644
--- a/src/mainboard/msi/ms9652_fam10/mptable.c
+++ b/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -18,7 +18,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
#include "mb_sysconf.h"
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index 11015f6a67..2da427d710 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -16,7 +16,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/pnp_ops.h>
diff --git a/src/mainboard/opencellular/elgon/romstage.c b/src/mainboard/opencellular/elgon/romstage.c
index 8456e2d023..94c09ecaf5 100644
--- a/src/mainboard/opencellular/elgon/romstage.c
+++ b/src/mainboard/opencellular/elgon/romstage.c
@@ -23,7 +23,6 @@
#include <console/console.h>
#include <program_loading.h>
#include <libbdk-hal/bdk-config.h>
-#include <string.h>
#include <arch/stages.h>
extern const struct bdk_devicetree_key_value devtree[];
diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 88589b0e49..b20c445fef 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -19,7 +19,6 @@
/* __PRE_RAM__ means: use "unsigned" for device, not a struct. */
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/pcengines/apu1/mptable.c b/src/mainboard/pcengines/apu1/mptable.c
index 32b2a6eae4..bb8d01ecb9 100644
--- a/src/mainboard/pcengines/apu1/mptable.c
+++ b/src/mainboard/pcengines/apu1/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <string.h>
#include <stdint.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/pcengines/apu2/acpi_tables.c b/src/mainboard/pcengines/apu2/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/pcengines/apu2/acpi_tables.c
+++ b/src/mainboard/pcengines/apu2/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c
index c80e9ee0c3..bd3c421a2f 100644
--- a/src/mainboard/pcengines/apu2/romstage.c
+++ b/src/mainboard/pcengines/apu2/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/purism/librem_skl/romstage.c b/src/mainboard/purism/librem_skl/romstage.c
index 48db885075..63d148a98e 100644
--- a/src/mainboard/purism/librem_skl/romstage.c
+++ b/src/mainboard/purism/librem_skl/romstage.c
@@ -16,7 +16,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <assert.h>
#include <soc/romstage.h>
#include <spd_bin.h>
diff --git a/src/mainboard/roda/rk886ex/mptable.c b/src/mainboard/roda/rk886ex/mptable.c
index 59ab0c4f62..cf87d7fa95 100644
--- a/src/mainboard/roda/rk886ex/mptable.c
+++ b/src/mainboard/roda/rk886ex/mptable.c
@@ -19,7 +19,6 @@
#include <console/console.h>
#include <arch/smp/mpspec.h>
#include <arch/ioapic.h>
-#include <string.h>
#include <stdint.h>
static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index fbda731c02..dbc4b6cb7b 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -17,7 +17,6 @@
/* __PRE_RAM__ means: use "unsigned" for device, not a struct. */
#include <stdint.h>
-#include <string.h>
#include <arch/io.h>
#include <device/pnp_ops.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index c41e964660..8038664025 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index b21ae2255d..17d7e0e296 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -14,7 +14,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index 57fdbcbad0..a8e28d67ac 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/sapphire/pureplatinumh61/romstage.c b/src/mainboard/sapphire/pureplatinumh61/romstage.c
index 30dfeab9aa..296e8963c2 100644
--- a/src/mainboard/sapphire/pureplatinumh61/romstage.c
+++ b/src/mainboard/sapphire/pureplatinumh61/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <arch/byteorder.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
@@ -23,7 +22,6 @@
#include <northbridge/intel/sandybridge/raminit_native.h>
#include <southbridge/intel/bd82x6x/pch.h>
-
void pch_enable_lpc(void)
{
pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x2400);
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index e126bd8e83..43818eebe4 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -16,7 +16,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/scaleway/tagada/bmcinfo.c b/src/mainboard/scaleway/tagada/bmcinfo.c
index 5ca736984d..237d551b59 100644
--- a/src/mainboard/scaleway/tagada/bmcinfo.c
+++ b/src/mainboard/scaleway/tagada/bmcinfo.c
@@ -16,9 +16,7 @@
#include <stdint.h>
#include <stdlib.h>
-#include <string.h>
#include <arch/early_variables.h>
-
#include <console/console.h>
#include <console/uart.h>
diff --git a/src/mainboard/scaleway/tagada/fadt.c b/src/mainboard/scaleway/tagada/fadt.c
index da25dec8a0..f40841efc3 100644
--- a/src/mainboard/scaleway/tagada/fadt.c
+++ b/src/mainboard/scaleway/tagada/fadt.c
@@ -16,7 +16,6 @@
*
*/
-#include <string.h>
#include <arch/acpi.h>
#include <soc/acpi.h>
diff --git a/src/mainboard/scaleway/tagada/romstage.c b/src/mainboard/scaleway/tagada/romstage.c
index c29ff9dff7..f14c1b6e3c 100644
--- a/src/mainboard/scaleway/tagada/romstage.c
+++ b/src/mainboard/scaleway/tagada/romstage.c
@@ -19,7 +19,6 @@
#include <console/console.h>
#include <fsp/api.h>
#include <fsp/soc_binding.h>
-#include <string.h>
#include "bmcinfo.h"
void mainboard_config_gpios(void);
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index 2903a5c5e0..d81798c6b0 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <types.h>
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
index 8b96670220..d41551db27 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -18,7 +18,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
#include "mb_sysconf.h"
diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 1d6410dcd6..4d6846c2de 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -16,7 +16,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c
index 5d4c1cb8d3..8c884c4d65 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -18,7 +18,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
#include "mb_sysconf.h"
diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index 76d255be60..051cd61efb 100644
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -16,7 +16,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/pnp_ops.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
index 530a913401..e9f181b836 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
#include <device/pci.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 3c0bf46e4a..8bc96c22a8 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -15,7 +15,6 @@
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <cpu/amd/multicore.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index e3a572ed52..112d20ae41 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index 3057a3fd90..f3958f8d61 100644
--- a/src/mainboard/supermicro/h8scm_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c
@@ -18,7 +18,6 @@
//#define SYSTEM_TYPE 2 /* MOBILE */
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c
index f9062ca06b..1781a6627d 100644
--- a/src/mainboard/tyan/s2912_fam10/mptable.c
+++ b/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -18,7 +18,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <device/pci_ops.h>
-#include <string.h>
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
#include "mb_sysconf.h"
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index 73951d18e2..3f504e1957 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -16,7 +16,6 @@
*/
#include <stdint.h>
-#include <string.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index f96dc448ca..80693cde46 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -23,7 +23,6 @@
#include <device/pci_def.h>
#include <lib.h>
#include <cpu/x86/bist.h>
-#include <string.h>
#include <timestamp.h>
#include <cbmem.h>