New subject: Change in ...coreboot[master]: src: Use 'include <string.h>' when appropriate

18 Mar 2019

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31966
Change subject: src: Drop unused 'include <string.h>'
......................................................................
src: Drop unused 'include <string.h>'
Change-Id: Iccac4dbaa2dd4144fc347af36ecfc9747da3de20
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr
---
M src/arch/arm64/boot.c
M src/arch/riscv/trap_handler.c
M src/arch/x86/boot.c
M src/commonlib/storage/pci_sdhci.c
M src/commonlib/storage/sd.c
M src/commonlib/storage/sdhci.c
M src/commonlib/storage/storage_write.c
M src/cpu/amd/agesa/family12/model_12_init.c
M src/cpu/amd/agesa/family14/model_14_init.c
M src/cpu/amd/agesa/family15tn/model_15_init.c
M src/cpu/amd/agesa/family16kb/model_16_init.c
M src/cpu/amd/family_10h-family_15h/model_10xxx_init.c
M src/cpu/amd/pi/00630F01/model_15_init.c
M src/cpu/amd/pi/00660F01/model_15_init.c
M src/cpu/amd/pi/00730F01/model_16_init.c
M src/cpu/intel/haswell/haswell_init.c
M src/cpu/intel/haswell/romstage.c
M src/cpu/intel/model_1067x/model_1067x_init.c
M src/cpu/intel/model_106cx/model_106cx_init.c
M src/cpu/intel/model_2065x/model_2065x_init.c
M src/cpu/intel/model_206ax/model_206ax_init.c
M src/cpu/intel/model_6ex/model_6ex_init.c
M src/cpu/intel/model_6fx/model_6fx_init.c
M src/cpu/intel/speedstep/acpi.c
M src/cpu/x86/mp_init.c
M src/device/pnp_device.c
M src/drivers/aspeed/ast2050/ast2050.c
M src/drivers/emulation/qemu/bochs.c
M src/drivers/emulation/qemu/cirrus.c
M src/drivers/generic/adau7002/adau7002.c
M src/drivers/generic/max98357a/max98357a.c
M src/drivers/i2c/at24rf08c/at24rf08c.c
M src/drivers/i2c/da7219/da7219.c
M src/drivers/i2c/max98373/max98373.c
M src/drivers/i2c/max98927/max98927.c
M src/drivers/i2c/nau8825/nau8825.c
M src/drivers/i2c/rt5663/rt5663.c
M src/drivers/i2c/tpm/chip.c
M src/drivers/i2c/tpm/tis_atmel.c
M src/drivers/intel/fsp1_0/hob.c
M src/drivers/intel/fsp2_0/notify.c
M src/drivers/intel/fsp2_0/temp_ram_exit.c
M src/drivers/intel/gma/intel_ddi.c
M src/drivers/intel/mipi_camera/camera.c
M src/drivers/ipmi/ipmi_kcs.c
M src/drivers/net/atl1e.c
M src/drivers/net/ne2k.c
M src/drivers/siemens/nc_fpga/nc_fpga.c
M src/drivers/sil/3114/sil_sata.c
M src/drivers/smmstore/store.c
M src/drivers/spi/flashconsole.c
M src/drivers/spi/tpm/tis.c
M src/drivers/usb/acpi/usb_acpi.c
M src/drivers/xgi/common/xgi_coreboot.c
M src/drivers/xgi/common/xgi_coreboot.h
M src/drivers/xgi/z9s/z9s.c
M src/include/device/azalia_device.h
M src/lib/cbmem_console.c
M src/lib/imd_cbmem.c
M src/mainboard/advansus/a785e-i/acpi_tables.c
M src/mainboard/advansus/a785e-i/get_bus_conf.c
M src/mainboard/advansus/a785e-i/mptable.c
M src/mainboard/advansus/a785e-i/romstage.c
M src/mainboard/amd/bettong/acpi_tables.c
M src/mainboard/amd/bimini_fam10/acpi_tables.c
M src/mainboard/amd/bimini_fam10/get_bus_conf.c
M src/mainboard/amd/bimini_fam10/mptable.c
M src/mainboard/amd/bimini_fam10/romstage.c
M src/mainboard/amd/db-ft3b-lc/acpi_tables.c
M src/mainboard/amd/db-ft3b-lc/mptable.c
M src/mainboard/amd/db-ft3b-lc/romstage.c
M src/mainboard/amd/gardenia/BiosCallOuts.c
M src/mainboard/amd/inagua/acpi_tables.c
M src/mainboard/amd/lamar/acpi_tables.c
M src/mainboard/amd/lamar/mptable.c
M src/mainboard/amd/lamar/romstage.c
M src/mainboard/amd/mahogany_fam10/acpi_tables.c
M src/mainboard/amd/mahogany_fam10/get_bus_conf.c
M src/mainboard/amd/mahogany_fam10/mptable.c
M src/mainboard/amd/mahogany_fam10/romstage.c
M src/mainboard/amd/olivehill/acpi_tables.c
M src/mainboard/amd/olivehill/romstage.c
M src/mainboard/amd/olivehillplus/acpi_tables.c
M src/mainboard/amd/olivehillplus/romstage.c
M src/mainboard/amd/parmer/acpi_tables.c
M src/mainboard/amd/persimmon/acpi_tables.c
M src/mainboard/amd/persimmon/mptable.c
M src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
M src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
M src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
M src/mainboard/amd/south_station/acpi_tables.c
M src/mainboard/amd/thatcher/acpi_tables.c
M src/mainboard/amd/thatcher/romstage.c
M src/mainboard/amd/tilapia_fam10/acpi_tables.c
M src/mainboard/amd/tilapia_fam10/get_bus_conf.c
M src/mainboard/amd/tilapia_fam10/mptable.c
M src/mainboard/amd/tilapia_fam10/romstage.c
M src/mainboard/amd/torpedo/acpi_tables.c
M src/mainboard/amd/union_station/OemCustomize.c
M src/mainboard/amd/union_station/acpi_tables.c
M src/mainboard/aopen/dxplplusu/acpi_tables.c
M src/mainboard/apple/macbook21/mptable.c
M src/mainboard/apple/macbook21/romstage.c
M src/mainboard/asrock/e350m1/acpi_tables.c
M src/mainboard/asrock/imb-a180/acpi_tables.c
M src/mainboard/asrock/imb-a180/romstage.c
M src/mainboard/asus/am1i-a/acpi_tables.c
M src/mainboard/asus/am1i-a/mptable.c
M src/mainboard/asus/f2a85-m/acpi_tables.c
M src/mainboard/asus/f2a85-m/romstage.c
M src/mainboard/asus/kcma-d8/acpi_tables.c
M src/mainboard/asus/kcma-d8/get_bus_conf.c
M src/mainboard/asus/kcma-d8/mptable.c
M src/mainboard/asus/kcma-d8/romstage.c
M src/mainboard/asus/kfsn4-dre/acpi_tables.c
M src/mainboard/asus/kfsn4-dre/get_bus_conf.c
M src/mainboard/asus/kfsn4-dre/mptable.c
M src/mainboard/asus/kfsn4-dre/romstage.c
M src/mainboard/asus/kgpe-d16/acpi_tables.c
M src/mainboard/asus/kgpe-d16/get_bus_conf.c
M src/mainboard/asus/kgpe-d16/mptable.c
M src/mainboard/asus/kgpe-d16/romstage.c
M src/mainboard/asus/m4a78-em/acpi_tables.c
M src/mainboard/asus/m4a78-em/get_bus_conf.c
M src/mainboard/asus/m4a78-em/mptable.c
M src/mainboard/asus/m4a78-em/romstage.c
M src/mainboard/asus/m4a785-m/acpi_tables.c
M src/mainboard/asus/m4a785-m/get_bus_conf.c
M src/mainboard/asus/m4a785-m/mptable.c
M src/mainboard/asus/m4a785-m/romstage.c
M src/mainboard/asus/m5a88-v/acpi_tables.c
M src/mainboard/asus/m5a88-v/get_bus_conf.c
M src/mainboard/asus/m5a88-v/mptable.c
M src/mainboard/asus/m5a88-v/romstage.c
M src/mainboard/asus/p2b-d/mptable.c
M src/mainboard/asus/p2b-ds/mptable.c
M src/mainboard/asus/p5gc-mx/romstage.c
M src/mainboard/avalue/eax-785e/acpi_tables.c
M src/mainboard/avalue/eax-785e/get_bus_conf.c
M src/mainboard/avalue/eax-785e/mptable.c
M src/mainboard/avalue/eax-785e/romstage.c
M src/mainboard/bap/ode_e20XX/acpi_tables.c
M src/mainboard/bap/ode_e20XX/mptable.c
M src/mainboard/bap/ode_e21XX/acpi_tables.c
M src/mainboard/bap/ode_e21XX/romstage.c
M src/mainboard/biostar/a68n_5200/acpi_tables.c
M src/mainboard/biostar/a68n_5200/romstage.c
M src/mainboard/biostar/am1ml/acpi_tables.c
M src/mainboard/biostar/am1ml/mptable.c
M src/mainboard/cavium/cn8100_sff_evb/romstage.c
M src/mainboard/elmex/pcm205400/acpi_tables.c
M src/mainboard/elmex/pcm205400/mptable.c
M src/mainboard/emulation/qemu-armv7/mainboard.c
M src/mainboard/esd/atom15/acpi_tables.c
M src/mainboard/getac/p470/mptable.c
M src/mainboard/getac/p470/romstage.c
M src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
M src/mainboard/gigabyte/ma785gm/acpi_tables.c
M src/mainboard/gigabyte/ma785gm/get_bus_conf.c
M src/mainboard/gigabyte/ma785gm/mptable.c
M src/mainboard/gigabyte/ma785gm/romstage.c
M src/mainboard/gigabyte/ma785gmt/acpi_tables.c
M src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
M src/mainboard/gigabyte/ma785gmt/mptable.c
M src/mainboard/gigabyte/ma785gmt/romstage.c
M src/mainboard/gigabyte/ma78gm/acpi_tables.c
M src/mainboard/gigabyte/ma78gm/get_bus_conf.c
M src/mainboard/gigabyte/ma78gm/mptable.c
M src/mainboard/gigabyte/ma78gm/romstage.c
M src/mainboard/gizmosphere/gizmo/acpi_tables.c
M src/mainboard/gizmosphere/gizmo2/acpi_tables.c
M src/mainboard/gizmosphere/gizmo2/mptable.c
M src/mainboard/google/auron/chromeos.c
M src/mainboard/google/auron/variants/auron_paine/pei_data.c
M src/mainboard/google/auron/variants/auron_yuna/pei_data.c
M src/mainboard/google/auron/variants/buddy/pei_data.c
M src/mainboard/google/auron/variants/buddy/variant.c
M src/mainboard/google/auron/variants/gandof/pei_data.c
M src/mainboard/google/auron/variants/lulu/pei_data.c
M src/mainboard/google/beltino/acpi_tables.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/beltino/lan.c
M src/mainboard/google/beltino/mainboard.c
M src/mainboard/google/beltino/romstage.c
M src/mainboard/google/butterfly/mainboard.c
M src/mainboard/google/butterfly/romstage.c
M src/mainboard/google/cyan/chromeos.c
M src/mainboard/google/dragonegg/romstage_fsp_params.c
M src/mainboard/google/gale/chromeos.c
M src/mainboard/google/glados/chromeos.c
M src/mainboard/google/jecht/acpi_tables.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/jecht/lan.c
M src/mainboard/google/jecht/variants/guado/pei_data.c
M src/mainboard/google/jecht/variants/jecht/pei_data.c
M src/mainboard/google/jecht/variants/rikku/pei_data.c
M src/mainboard/google/jecht/variants/tidus/pei_data.c
M src/mainboard/google/link/mainboard.c
M src/mainboard/google/nyan/chromeos.c
M src/mainboard/google/nyan_big/chromeos.c
M src/mainboard/google/nyan_blaze/chromeos.c
M src/mainboard/google/oak/chromeos.c
M src/mainboard/google/octopus/romstage.c
M src/mainboard/google/octopus/variants/phaser/variant.c
M src/mainboard/google/parrot/acpi_tables.c
M src/mainboard/google/parrot/mainboard.c
M src/mainboard/google/parrot/romstage.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/google/rambi/chromeos.c
M src/mainboard/google/rambi/mainboard.c
M src/mainboard/google/rambi/romstage.c
M src/mainboard/google/rambi/variants/ninja/lan.c
M src/mainboard/google/rambi/variants/sumo/lan.c
M src/mainboard/google/slippy/acpi_tables.c
M src/mainboard/google/slippy/chromeos.c
M src/mainboard/google/slippy/mainboard.c
M src/mainboard/google/smaug/chromeos.c
M src/mainboard/google/storm/chromeos.c
M src/mainboard/google/stout/acpi_tables.c
M src/mainboard/google/stout/mainboard.c
M src/mainboard/google/stout/romstage.c
M src/mainboard/google/veyron/chromeos.c
M src/mainboard/google/veyron/sdram_configs.c
M src/mainboard/google/veyron_mickey/chromeos.c
M src/mainboard/google/veyron_mickey/sdram_configs.c
M src/mainboard/google/veyron_rialto/chromeos.c
M src/mainboard/google/veyron_rialto/sdram_configs.c
M src/mainboard/hp/abm/acpi_tables.c
M src/mainboard/hp/dl165_g6_fam10/mptable.c
M src/mainboard/hp/dl165_g6_fam10/romstage.c
M src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
M src/mainboard/ibase/mb899/mptable.c
M src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
M src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
M src/mainboard/iei/kino-780am2-fam10/mptable.c
M src/mainboard/iei/kino-780am2-fam10/romstage.c
M src/mainboard/intel/baskingridge/acpi_tables.c
M src/mainboard/intel/baskingridge/mainboard.c
M src/mainboard/intel/bayleybay_fsp/acpi_tables.c
M src/mainboard/intel/bayleybay_fsp/mainboard.c
M src/mainboard/intel/camelbackmountain_fsp/mainboard.c
M src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c
M src/mainboard/intel/d945gclf/mptable.c
M src/mainboard/intel/emeraldlake2/acpi_tables.c
M src/mainboard/intel/emeraldlake2/mainboard.c
M src/mainboard/intel/emeraldlake2/romstage.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/harcuvar/fadt.c
M src/mainboard/intel/harcuvar/romstage.c
M src/mainboard/intel/harcuvar/spd/spd.c
M src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
M src/mainboard/intel/kblrvp/chromeos.c
M src/mainboard/intel/kblrvp/mainboard.c
M src/mainboard/intel/kblrvp/romstage.c
M src/mainboard/intel/kunimitsu/chromeos.c
M src/mainboard/intel/kunimitsu/mainboard.c
M src/mainboard/intel/kunimitsu/pei_data.c
M src/mainboard/intel/kunimitsu/romstage_fsp20.c
M src/mainboard/intel/minnowmax/acpi_tables.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/intel/strago/chromeos.c
M src/mainboard/intel/strago/romstage.c
M src/mainboard/intel/wtm2/acpi_tables.c
M src/mainboard/intel/wtm2/chromeos.c
M src/mainboard/intel/wtm2/mainboard.c
M src/mainboard/intel/wtm2/pei_data.c
M src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
M src/mainboard/jetway/nf81-t56n-lf/mptable.c
M src/mainboard/jetway/pa78vm5/acpi_tables.c
M src/mainboard/jetway/pa78vm5/get_bus_conf.c
M src/mainboard/jetway/pa78vm5/mptable.c
M src/mainboard/jetway/pa78vm5/romstage.c
M src/mainboard/kontron/986lcd-m/mptable.c
M src/mainboard/kontron/ktqm77/mainboard.c
M src/mainboard/kontron/ktqm77/romstage.c
M src/mainboard/lenovo/g505s/acpi_tables.c
M src/mainboard/lenovo/t430s/variants/t431s/romstage.c
M src/mainboard/lenovo/t60/mptable.c
M src/mainboard/lenovo/t60/romstage.c
M src/mainboard/lenovo/x201/romstage.c
M src/mainboard/lenovo/x220/romstage.c
M src/mainboard/lenovo/x230/romstage.c
M src/mainboard/lenovo/x60/mptable.c
M src/mainboard/lenovo/x60/romstage.c
M src/mainboard/lenovo/z61t/mptable.c
M src/mainboard/lenovo/z61t/romstage.c
M src/mainboard/lippert/frontrunner-af/acpi_tables.c
M src/mainboard/lippert/toucan-af/acpi_tables.c
M src/mainboard/msi/ms7721/acpi_tables.c
M src/mainboard/msi/ms9652_fam10/acpi_tables.c
M src/mainboard/msi/ms9652_fam10/mptable.c
M src/mainboard/msi/ms9652_fam10/romstage.c
M src/mainboard/opencellular/elgon/romstage.c
M src/mainboard/packardbell/ms2290/romstage.c
M src/mainboard/pcengines/apu1/acpi_tables.c
M src/mainboard/pcengines/apu1/mptable.c
M src/mainboard/pcengines/apu2/acpi_tables.c
M src/mainboard/pcengines/apu2/romstage.c
M src/mainboard/purism/librem_skl/romstage.c
M src/mainboard/roda/rk886ex/mptable.c
M src/mainboard/roda/rk886ex/romstage.c
M src/mainboard/samsung/lumpy/acpi_tables.c
M src/mainboard/samsung/stumpy/acpi_tables.c
M src/mainboard/samsung/stumpy/romstage.c
M src/mainboard/sapphire/pureplatinumh61/romstage.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/mainboard/scaleway/tagada/bmcinfo.c
M src/mainboard/scaleway/tagada/fadt.c
M src/mainboard/scaleway/tagada/romstage.c
M src/mainboard/siemens/mc_tcu3/acpi_tables.c
M src/mainboard/supermicro/h8dmr_fam10/mptable.c
M src/mainboard/supermicro/h8dmr_fam10/romstage.c
M src/mainboard/supermicro/h8qme_fam10/mptable.c
M src/mainboard/supermicro/h8qme_fam10/romstage.c
M src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
M src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
M src/mainboard/supermicro/h8scm_fam10/mptable.c
M src/mainboard/supermicro/h8scm_fam10/romstage.c
M src/mainboard/tyan/s2912_fam10/mptable.c
M src/mainboard/tyan/s2912_fam10/romstage.c
M src/mainboard/via/epia-m850/romstage.c
M src/northbridge/amd/amdfam10/get_pci1234.c
M src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
M src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
M src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
M src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
M src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
M src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
M src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
M src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
M src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
M src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
M src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
M src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
M src/northbridge/intel/e7505/northbridge.c
M src/northbridge/intel/fsp_rangeley/acpi.c
M src/northbridge/intel/fsp_rangeley/northbridge.c
M src/northbridge/intel/fsp_rangeley/raminit.c
M src/northbridge/intel/gm45/acpi.c
M src/northbridge/intel/gm45/northbridge.c
M src/northbridge/intel/gm45/pcie.c
M src/northbridge/intel/gm45/pm.c
M src/northbridge/intel/gm45/romstage.c
M src/northbridge/intel/gm45/thermal.c
M src/northbridge/intel/haswell/northbridge.c
M src/northbridge/intel/i440bx/northbridge.c
M src/northbridge/intel/i945/acpi.c
M src/northbridge/intel/i945/early_init.c
M src/northbridge/intel/i945/northbridge.c
M src/northbridge/intel/nehalem/gma.c
M src/northbridge/intel/nehalem/northbridge.c
M src/northbridge/intel/nehalem/smi.c
M src/northbridge/intel/pineview/early_init.c
M src/northbridge/intel/pineview/gma.c
M src/northbridge/intel/pineview/northbridge.c
M src/northbridge/intel/sandybridge/gma.c
M src/northbridge/intel/sandybridge/northbridge.c
M src/northbridge/intel/sandybridge/romstage.c
M src/northbridge/intel/x4x/acpi.c
M src/northbridge/intel/x4x/gma.c
M src/northbridge/intel/x4x/northbridge.c
M src/northbridge/via/vx900/northbridge.c
M src/security/tpm/tspi/log.c
M src/security/tpm/tspi/tspi.c
M src/security/tpm/tss/vendor/cr50/cr50.c
M src/security/vboot/bootmode.c
M src/security/vboot/vboot_common.c
M src/security/vboot/vboot_crtm.c
M src/security/vboot/vboot_loader.c
M src/soc/amd/common/block/pci/amd_pci_util.c
M src/soc/amd/common/block/pi/agesawrapper.c
M src/soc/amd/common/block/pi/amd_late_init.c
M src/soc/amd/stoneyridge/spi.c
M src/soc/intel/apollolake/romstage.c
M src/soc/intel/apollolake/uart.c
M src/soc/intel/baytrail/refcode.c
M src/soc/intel/baytrail/smm.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/baytrail/spi.c
M src/soc/intel/braswell/ramstage.c
M src/soc/intel/braswell/smm.c
M src/soc/intel/braswell/spi.c
M src/soc/intel/broadwell/cpu.c
M src/soc/intel/broadwell/gpio.c
M src/soc/intel/broadwell/smi.c
M src/soc/intel/broadwell/spi.c
M src/soc/intel/broadwell/systemagent.c
M src/soc/intel/cannonlake/chip.c
M src/soc/intel/cannonlake/uart.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/common/block/fast_spi/fast_spi.c
M src/soc/intel/common/block/uart/uart.c
M src/soc/intel/common/mma.c
M src/soc/intel/common/pch/lockdown/lockdown.c
M src/soc/intel/denverton_ns/csme_ie_kt.c
M src/soc/intel/denverton_ns/include/soc/soc_util.h
M src/soc/intel/denverton_ns/smm.c
M src/soc/intel/denverton_ns/soc_util.c
M src/soc/intel/denverton_ns/systemagent.c
M src/soc/intel/fsp_baytrail/smm.c
M src/soc/intel/fsp_baytrail/spi.c
M src/soc/intel/fsp_broadwell_de/chip.c
M src/soc/intel/icelake/chip.c
M src/soc/intel/icelake/romstage/power_state.c
M src/soc/intel/icelake/uart.c
M src/soc/intel/quark/spi.c
M src/soc/intel/skylake/cpu.c
M src/soc/intel/skylake/uart.c
M src/soc/mediatek/mt8173/ddp.c
M src/soc/mediatek/mt8173/dramc_pi_basic_api.c
M src/soc/mediatek/mt8173/emi.c
M src/soc/nvidia/tegra124/sor.c
M src/soc/nvidia/tegra124/spi.c
M src/soc/nvidia/tegra210/arm_tf.c
M src/soc/nvidia/tegra210/ccplex.c
M src/soc/nvidia/tegra210/soc.c
M src/soc/nvidia/tegra210/sor.c
M src/soc/nvidia/tegra210/spi.c
M src/soc/qualcomm/ipq40xx/spi.c
M src/soc/qualcomm/ipq806x/spi.c
M src/soc/rockchip/common/i2c.c
M src/soc/rockchip/common/vop.c
M src/soc/rockchip/rk3288/hdmi.c
M src/soc/rockchip/rk3288/sdram.c
M src/soc/rockchip/rk3288/soc.c
M src/soc/rockchip/rk3399/display.c
M src/soc/rockchip/rk3399/sdram.c
M src/soc/rockchip/rk3399/soc.c
M src/soc/samsung/exynos5250/alternate_cbfs.c
M src/soc/samsung/exynos5250/fb.c
M src/soc/samsung/exynos5250/gpio.c
M src/soc/samsung/exynos5420/alternate_cbfs.c
M src/soc/samsung/exynos5420/dp_lowlevel.c
M src/soc/samsung/exynos5420/gpio.c
M src/southbridge/amd/agesa/hudson/spi.c
M src/southbridge/amd/amd8111/lpc.c
M src/southbridge/amd/cimx/sb800/spi.c
M src/southbridge/amd/common/amd_pci_util.c
M src/southbridge/amd/sb700/spi.c
M src/southbridge/intel/bd82x6x/early_pch.c
M src/southbridge/intel/bd82x6x/elog.c
M src/southbridge/intel/common/gpio.c
M src/southbridge/intel/fsp_rangeley/gpio.c
M src/southbridge/intel/fsp_rangeley/romstage.c
M src/southbridge/intel/fsp_rangeley/spi.c
M src/southbridge/intel/i82371eb/acpi_tables.c
M src/southbridge/intel/ibexpeak/madt.c
M src/southbridge/intel/ibexpeak/smi.c
M src/southbridge/intel/lynxpoint/elog.c
M src/southbridge/intel/lynxpoint/lp_gpio.c
M src/southbridge/intel/lynxpoint/smi.c
M src/superio/nsc/pc87360/superio.c
M src/superio/nsc/pc87366/superio.c
M src/superio/nsc/pc87382/superio.c
M src/superio/nsc/pc87384/superio.c
M src/superio/nsc/pc87392/superio.c
M src/superio/nsc/pc87417/superio.c
M src/superio/nuvoton/wpcm450/superio.c
M src/superio/renesas/m3885x/superio.c
M src/superio/smsc/dme1737/superio.c
M src/superio/smsc/kbc1100/superio.c
M src/superio/smsc/lpc47b272/superio.c
M src/superio/smsc/lpc47b397/superio.c
M src/superio/smsc/lpc47m10x/superio.c
M src/superio/smsc/lpc47m15x/superio.c
M src/superio/smsc/lpc47n217/superio.c
M src/superio/smsc/lpc47n227/superio.c
M src/superio/smsc/mec1308/superio.c
M src/superio/winbond/w83627ehg/superio.c
M src/superio/winbond/w83627hf/superio.c
M src/superio/winbond/w83627thg/superio.c
M src/superio/winbond/w83627uhg/superio.c
M src/superio/winbond/w83697hf/superio.c
M src/superio/winbond/w83977tf/superio.c
478 files changed, 22 insertions(+), 486 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/31966/1

diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index fefc0d3..d17a20d 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -19,7 +19,6 @@
 #include <arch/transition.h>
 #include <arm_tf.h>
 #include <program_loading.h>
-#include <string.h>
static void run_payload(struct prog *prog)
 {
diff --git a/src/arch/riscv/trap_handler.c b/src/arch/riscv/trap_handler.c
index 6ec8e19..6b39fab 100644
--- a/src/arch/riscv/trap_handler.c
+++ b/src/arch/riscv/trap_handler.c
@@ -17,7 +17,6 @@
 #include <arch/encoding.h>
 #include <arch/exception.h>
 #include <console/console.h>
-#include <string.h>
 #include <vm.h>
 #include <mcall.h>
 #include <sbi.h>
diff --git a/src/arch/x86/boot.c b/src/arch/x86/boot.c
index 7819c0f..5f60f13 100644
--- a/src/arch/x86/boot.c
+++ b/src/arch/x86/boot.c
@@ -15,7 +15,6 @@
 #include <console/console.h>
 #include <program_loading.h>
 #include <ip_checksum.h>
-#include <string.h>
 #include <symbols.h>
int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size)
diff --git a/src/commonlib/storage/pci_sdhci.c b/src/commonlib/storage/pci_sdhci.c
index 2bba084..a2d3094 100644
--- a/src/commonlib/storage/pci_sdhci.c
+++ b/src/commonlib/storage/pci_sdhci.c
@@ -22,8 +22,10 @@
 #include <commonlib/sdhci.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include "sd_mmc.h"
 #include <stdint.h>
+#include <string.h>
+
+#include "sd_mmc.h"
 #include "storage.h"
/* Initialize an SDHCI port */
diff --git a/src/commonlib/storage/sd.c b/src/commonlib/storage/sd.c
index bd23b7f..1389ffb 100644
--- a/src/commonlib/storage/sd.c
+++ b/src/commonlib/storage/sd.c
@@ -26,7 +26,6 @@
 #include <endian.h>
 #include "sd_mmc.h"
 #include "storage.h"
-#include <string.h>
 #include <timer.h>
int sd_send_if_cond(struct storage_media *media)
diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c
index 06dffb1..1370a91 100644
--- a/src/commonlib/storage/sdhci.c
+++ b/src/commonlib/storage/sdhci.c
@@ -27,7 +27,6 @@
 #include "sdhci.h"
 #include "sd_mmc.h"
 #include "storage.h"
-#include <string.h>
 #include <timer.h>
 #include <commonlib/stdlib.h>
diff --git a/src/commonlib/storage/storage_write.c b/src/commonlib/storage/storage_write.c
index aef8624..684e80a 100644
--- a/src/commonlib/storage/storage_write.c
+++ b/src/commonlib/storage/storage_write.c
@@ -21,7 +21,6 @@
#include "sd_mmc.h"
 #include "storage.h"
-#include <string.h>
static uint32_t storage_write(struct storage_media *media, uint32_t start,
    uint64_t block_count, const void *src)
diff --git a/src/cpu/amd/agesa/family12/model_12_init.c b/src/cpu/amd/agesa/family12/model_12_init.c
index 0693ded..406d300 100644
--- a/src/cpu/amd/agesa/family12/model_12_init.c
+++ b/src/cpu/amd/agesa/family12/model_12_init.c
@@ -19,7 +19,6 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/amd/agesa/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c
index 1516a6b..7f05cd1 100644
--- a/src/cpu/amd/agesa/family14/model_14_init.c
+++ b/src/cpu/amd/agesa/family14/model_14_init.c
@@ -19,7 +19,6 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c
index 26b20dc..b614eed 100644
--- a/src/cpu/amd/agesa/family15tn/model_15_init.c
+++ b/src/cpu/amd/agesa/family15tn/model_15_init.c
@@ -20,7 +20,6 @@
 #include <cpu/amd/mtrr.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/amd/agesa/family16kb/model_16_init.c b/src/cpu/amd/agesa/family16kb/model_16_init.c
index e6fb0db..6c1309e 100644
--- a/src/cpu/amd/agesa/family16kb/model_16_init.c
+++ b/src/cpu/amd/agesa/family16kb/model_16_init.c
@@ -19,7 +19,6 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c
index 9819caf..ff9c7de 100644
--- a/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c
+++ b/src/cpu/amd/family_10h-family_15h/model_10xxx_init.c
@@ -22,7 +22,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <cpu/x86/smm.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/amd/pi/00630F01/model_15_init.c b/src/cpu/amd/pi/00630F01/model_15_init.c
index 3a641bf..550f116 100644
--- a/src/cpu/amd/pi/00630F01/model_15_init.c
+++ b/src/cpu/amd/pi/00630F01/model_15_init.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <string.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/amd/pi/00660F01/model_15_init.c b/src/cpu/amd/pi/00660F01/model_15_init.c
index 65d87c2..54446f7 100644
--- a/src/cpu/amd/pi/00660F01/model_15_init.c
+++ b/src/cpu/amd/pi/00660F01/model_15_init.c
@@ -20,7 +20,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <string.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/amd/pi/00730F01/model_16_init.c b/src/cpu/amd/pi/00730F01/model_16_init.c
index 5678c5f..fe82890 100644
--- a/src/cpu/amd/pi/00730F01/model_16_init.c
+++ b/src/cpu/amd/pi/00730F01/model_16_init.c
@@ -20,7 +20,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <string.h>
 #include <cpu/x86/pae.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index aa77964..25cf243 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -17,7 +17,6 @@
#include <console/console.h>
 #include <device/device.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index e64643a..ee87eff 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -14,7 +14,6 @@
  */
#include <stdint.h>
-#include <string.h>
 #include <console/console.h>
 #include <arch/cpu.h>
 #include <cf9_reset.h>
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 6068be1..e47712c 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -17,7 +17,6 @@
#include <console/console.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mp.h>
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index e443026..f43db16 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -15,7 +15,6 @@
#include <console/console.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index fd34229..f08a058 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -17,7 +17,6 @@
#include <console/console.h>
 #include <device/device.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index e746208..85b0937 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -18,7 +18,6 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/cpu.h>
 #include <cpu/cpu.h>
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index 19a22f1..740af42 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -16,7 +16,6 @@
#include <console/console.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index 4e19896..26d0c9d 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -16,7 +16,6 @@
#include <console/console.h>
 #include <device/device.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c
index b5e2c9e9..5cff412 100644
--- a/src/cpu/intel/speedstep/acpi.c
+++ b/src/cpu/intel/speedstep/acpi.c
@@ -23,7 +23,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/intel/speedstep.h>
 #include <device/device.h>
-#include <string.h>
static int determine_total_number_of_cores(void)
 {
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 2057df0..138f194 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -16,6 +16,7 @@
#include <console/console.h>
 #include <stdint.h>
+#include <string.h>
 #include <rmodule.h>
 #include <arch/cpu.h>
 #include <commonlib/helpers.h>
diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c
index e56b00d..402e5d1 100644
--- a/src/device/pnp_device.c
+++ b/src/device/pnp_device.c
@@ -22,7 +22,6 @@
 #include <console/console.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
diff --git a/src/drivers/aspeed/ast2050/ast2050.c b/src/drivers/aspeed/ast2050/ast2050.c
index b36c3b1..035d5c6 100644
--- a/src/drivers/aspeed/ast2050/ast2050.c
+++ b/src/drivers/aspeed/ast2050/ast2050.c
@@ -14,7 +14,6 @@
  */
 #include <delay.h>
 #include <stdlib.h>
-#include <string.h>
 #include <arch/io.h>
 #include <edid.h>
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c
index de3feac..2310c9e 100644
--- a/src/drivers/emulation/qemu/bochs.c
+++ b/src/drivers/emulation/qemu/bochs.c
@@ -15,7 +15,6 @@
 #include <delay.h>
 #include <edid.h>
 #include <stdlib.h>
-#include <string.h>
 #include <arch/io.h>
#include <boot/coreboot_tables.h>
diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c
index d647c0c..04edef4 100644
--- a/src/drivers/emulation/qemu/cirrus.c
+++ b/src/drivers/emulation/qemu/cirrus.c
@@ -18,7 +18,6 @@
 #include <delay.h>
 #include <edid.h>
 #include <stdlib.h>
-#include <string.h>
#include <boot/coreboot_tables.h>
 #include <console/console.h>
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index 6e0d5f7..1aff453 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
 #include "chip.h"
#if CONFIG(HAVE_ACPI_TABLES)
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 3c67710..1408dac 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -20,7 +20,6 @@
 #include <device/path.h>
 #include <gpio.h>
 #include <stdint.h>
-#include <string.h>
 #include "chip.h"
#if CONFIG(HAVE_ACPI_TABLES)
diff --git a/src/drivers/i2c/at24rf08c/at24rf08c.c b/src/drivers/i2c/at24rf08c/at24rf08c.c
index f20678c..67760a0 100644
--- a/src/drivers/i2c/at24rf08c/at24rf08c.c
+++ b/src/drivers/i2c/at24rf08c/at24rf08c.c
@@ -14,7 +14,6 @@
  */
#include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/smbus.h>
 #include <smbios.h>
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index 5399f75..2a4d787 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
+
 #include "chip.h"
#if CONFIG(HAVE_ACPI_TABLES)
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index 0431c2e..07e23a8 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
 #include "chip.h"
#define MAX98373_ACPI_NAME	"MAXI"
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index 68a167d..395b79b 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
 #include "chip.h"
#define MAX98927_ACPI_NAME	"MAXI"
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index a98054a..60c73b1 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
 #include "chip.h"
#if CONFIG(HAVE_ACPI_TABLES)
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 1ce5993..415ae71 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
 #include "chip.h"
#define RT5663_ACPI_NAME	"RT53"
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index 687ce05..7e95032 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
 #include "tpm.h"
 #include "chip.h"
diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c
index 4b2f554..4456567 100644
--- a/src/drivers/i2c/tpm/tis_atmel.c
+++ b/src/drivers/i2c/tpm/tis_atmel.c
@@ -14,7 +14,6 @@
#include <arch/early_variables.h>
 #include <stdint.h>
-#include <string.h>
 #include <assert.h>
 #include <commonlib/endian.h>
 #include <console/console.h>
diff --git a/src/drivers/intel/fsp1_0/hob.c b/src/drivers/intel/fsp1_0/hob.c
index 05060d8..0244d1c 100644
--- a/src/drivers/intel/fsp1_0/hob.c
+++ b/src/drivers/intel/fsp1_0/hob.c
@@ -14,7 +14,6 @@
  */
#include <types.h>
-#include <string.h>
 #include <console/console.h>
 #include "fsp_util.h"
diff --git a/src/drivers/intel/fsp2_0/notify.c b/src/drivers/intel/fsp2_0/notify.c
index a5c7ef0..34d7e89 100644
--- a/src/drivers/intel/fsp2_0/notify.c
+++ b/src/drivers/intel/fsp2_0/notify.c
@@ -14,7 +14,6 @@
 #include <console/console.h>
 #include <cpu/x86/mtrr.h>
 #include <fsp/util.h>
-#include <string.h>
 #include <timestamp.h>
static void fsp_notify(enum fsp_notify_phase phase)
diff --git a/src/drivers/intel/fsp2_0/temp_ram_exit.c b/src/drivers/intel/fsp2_0/temp_ram_exit.c
index 5532c43..ced3584 100644
--- a/src/drivers/intel/fsp2_0/temp_ram_exit.c
+++ b/src/drivers/intel/fsp2_0/temp_ram_exit.c
@@ -14,7 +14,6 @@
 #include <fsp/api.h>
 #include <fsp/util.h>
 #include <memrange.h>
-#include <string.h>
 #include <cbfs.h>
void fsp_temp_ram_exit(void)
diff --git a/src/drivers/intel/gma/intel_ddi.c b/src/drivers/intel/gma/intel_ddi.c
index 220f141..58134db 100644
--- a/src/drivers/intel/gma/intel_ddi.c
+++ b/src/drivers/intel/gma/intel_ddi.c
@@ -26,7 +26,6 @@
  *
  */
 #include <types.h>
-#include <string.h>
 #include <stdlib.h>
 #include <device/device.h>
 #include <device/pci_def.h>
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 0cea0ba..903c480 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -20,7 +20,6 @@
 #include <device/i2c_simple.h>
 #include <device/device.h>
 #include <device/path.h>
-#include <string.h>
 #include "chip.h"
static void camera_fill_ssdt(struct device *dev)
diff --git a/src/drivers/ipmi/ipmi_kcs.c b/src/drivers/ipmi/ipmi_kcs.c
index 5ed46fe..8d106837 100644
--- a/src/drivers/ipmi/ipmi_kcs.c
+++ b/src/drivers/ipmi/ipmi_kcs.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <arch/io.h>
-#include <string.h>
 #include <delay.h>
 #include "ipmi_kcs.h"
diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c
index d6e7a84..f6f04a1 100644
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -23,7 +23,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <cbfs.h>
-#include <string.h>
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c
index caba600..6f8aca2 100644
--- a/src/drivers/net/ne2k.c
+++ b/src/drivers/net/ne2k.c
@@ -35,7 +35,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ip_checksum.h>
#include "ns8390.h"
diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c
index 831ac79..ef1f2f2 100644
--- a/src/drivers/siemens/nc_fpga/nc_fpga.c
+++ b/src/drivers/siemens/nc_fpga/nc_fpga.c
@@ -18,7 +18,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
-#include <string.h>
 #include <device/mmio.h>
 #include <delay.h>
 #include <hwilib.h>
diff --git a/src/drivers/sil/3114/sil_sata.c b/src/drivers/sil/3114/sil_sata.c
index db8de68..4908413f 100644
--- a/src/drivers/sil/3114/sil_sata.c
+++ b/src/drivers/sil/3114/sil_sata.c
@@ -16,8 +16,6 @@
#include <delay.h>
 #include <stdlib.h>
-#include <string.h>
-
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/drivers/smmstore/store.c b/src/drivers/smmstore/store.c
index 489b82f..6f2014b 100644
--- a/src/drivers/smmstore/store.c
+++ b/src/drivers/smmstore/store.c
@@ -19,7 +19,6 @@
 #include <commonlib/region.h>
 #include <console/console.h>
 #include <smmstore.h>
-#include <string.h>
/*
  * The region format is still not finalized, but so far it looks like this:
diff --git a/src/drivers/spi/flashconsole.c b/src/drivers/spi/flashconsole.c
index 2626ec5..3109012 100644
--- a/src/drivers/spi/flashconsole.c
+++ b/src/drivers/spi/flashconsole.c
@@ -19,7 +19,6 @@
 #include <fmap.h>
 #include <console/console.h>
 #include <console/flash.h>
-#include <string.h>
#define LINE_BUFFER_SIZE 128
 #define READ_BUFFER_SIZE 0x100
diff --git a/src/drivers/spi/tpm/tis.c b/src/drivers/spi/tpm/tis.c
index 40bf27d..b50ab0a 100644
--- a/src/drivers/spi/tpm/tis.c
+++ b/src/drivers/spi/tpm/tis.c
@@ -6,7 +6,6 @@
#include <arch/early_variables.h>
 #include <console/console.h>
-#include <string.h>
 #include <security/tpm/tis.h>
#include "tpm.h"
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index 8c63d2a..31a7a7f 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/src/drivers/usb/acpi/usb_acpi.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/path.h>
 #include <stdint.h>
-#include <string.h>
 #include "chip.h"
static bool usb_acpi_add_gpios_to_crs(struct drivers_usb_acpi_config *cfg)
diff --git a/src/drivers/xgi/common/xgi_coreboot.c b/src/drivers/xgi/common/xgi_coreboot.c
index 795b8a5..745baa2 100644
--- a/src/drivers/xgi/common/xgi_coreboot.c
+++ b/src/drivers/xgi/common/xgi_coreboot.c
@@ -17,7 +17,6 @@
  */
 #include <delay.h>
 #include <stdlib.h>
-#include <string.h>
 #include <vbe.h>
#include <console/console.h>
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h
index 39e74d1..dc8f49e 100644
--- a/src/drivers/xgi/common/xgi_coreboot.h
+++ b/src/drivers/xgi/common/xgi_coreboot.h
@@ -22,7 +22,6 @@
 #include <delay.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/mmio.h>
diff --git a/src/drivers/xgi/z9s/z9s.c b/src/drivers/xgi/z9s/z9s.c
index 3544b8d..3b46811 100644
--- a/src/drivers/xgi/z9s/z9s.c
+++ b/src/drivers/xgi/z9s/z9s.c
@@ -14,7 +14,6 @@
  */
 #include <delay.h>
 #include <stdlib.h>
-#include <string.h>
#include <console/console.h>
 #include <device/device.h>
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index 002b8244..9ff332e 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -17,7 +17,6 @@
 #define DEVICE_AZALIA_H
#include <types.h>
-#include <string.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <device/mmio.h>
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 32851ca..faa937b 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -19,7 +19,6 @@
 #include <cbmem.h>
 #include <arch/early_variables.h>
 #include <symbols.h>
-#include <string.h>
/*
  * Structure describing console buffer. It is overlaid on a flat memory area,
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index a50d349..c458e5e 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <cbmem.h>
 #include <imd.h>
-#include <string.h>
 #include <stdlib.h>
 #include <arch/early_variables.h>
diff --git a/src/mainboard/advansus/a785e-i/acpi_tables.c b/src/mainboard/advansus/a785e-i/acpi_tables.c
index b6faccf..7f42999 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 837cb13..6b5ae68 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 09eadc5..cc66ce8 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 db8d90a..4a817cf 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 b0f297c..8c68404 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 d911887..e7659d1 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 df0a564..4021c51 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 e2aec96..84c4eda 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 1f77351..7b2f051 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 0b9e0c4..08f6076 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 aeb814a..3aad0e3 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 2b37f9b..3e9b1c8 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 522a63f..d4fb55a 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 f18a2aa..787c432 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 1bbd390..8b0c2c9 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 5b9170b..d89e02f 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 bf5c9de..3f7d33f 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 c907d68..6cdf89a 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 cbf436b..ee2a6ca 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 bffe1a2..090fd54 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 9140ead..c73eb0d 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 0b9e0c4..08f6076 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 7883a7f..9a28f98 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 0b9e0c4..08f6076 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 4bb35fb..0181747 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 3ff68e3..eba2d1d 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 f18a2aa..787c432 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 8fda666..d9f550e 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 33a81c6..e1f2409 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 61aa906..d65b82a 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 427a3ef..a525154 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 f18a2aa..787c432 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 3ff68e3..eba2d1d 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 cf8469b..65ed138 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 0cdcdb7..967343d 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 6bdf94a..37a3774 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 bffe1a2..090fd54 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 0a49d2c..a45d8f6 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 a68592a..7d7d86c 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 8a62901..f22cb6e 100644
--- a/src/mainboard/amd/union_station/OemCustomize.c
+++ b/src/mainboard/amd/union_station/OemCustomize.c
@@ -16,7 +16,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 f18a2aa..787c432 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 2981403..039e4ec 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 f508eaf..cbd30c72 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 63042f6..479ab59 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 bc9c154..787c432 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 0b9e0c4..08f6076 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 1aa8aa1..ce5e064 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 12a20ea..411ebe7 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 448a89e..d97e6ac 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 7338eee..eba2d1d 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 dffb726..2727904 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 d705b21..53622ba 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 be7b300..0d07389 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -15,7 +15,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/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index c9b83a0..65be183 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 a74c6dd..5d43a54 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 587e2ff..615f8b3 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 bb51ada..dd7ebc9 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 ad3f742..10a3798 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 6ac33f2..dbf704b 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 d705b21..53622ba 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 9264720..95a03fd 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -15,7 +15,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/kgpe-d16/mptable.c b/src/mainboard/asus/kgpe-d16/mptable.c
index ed01b54..6d7174d 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 7fe9b64..f7d30bd 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 0cdcdb7..967343d 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 cbf436b..ee2a6ca 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 bffe1a2..876e7ee 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 0e0e5af..c99179e 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 ec04eff..1170ed7 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 cbf436b..ee2a6ca 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 bffe1a2..090fd54 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/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/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 8b5a56f..1d59214 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 b6faccf..7f42999 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 837cb13..6b5ae68 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 a5e79e3..b4cd7e8 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 4ef603e..9216ecb 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 dac4e8c..fde1281 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 8c84099..4e085b1 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 26898cc..ffb3bf9 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 b6faccf..7f42999 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 837cb13..6b5ae68 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 4cc20fc..81763f9 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 6b91381..9347919 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 0b9e0c4..08f6076 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 d0704f3..ea9f959 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 0b9e0c4..08f6076 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 af8fd2a..10b7aab 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 0b9e0c4..08f6076 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 31a0dd7..ddcf4d0 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 12a20ea..411ebe7 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 cb1274e..4d93361 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 7bb53e3..b60b9cd 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 f18a2aa..787c432 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 8fda666..d9f550e 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 08b9bf2..cc14dd8 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 edb66fc0..fe95a31 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 c00102d..86006e1 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 3bc4aa6..423b4e8 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 b3ee2a8..b2d4bb4 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 0cdcdb7..967343d 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 cbf436b..ee2a6ca 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 bffe1a2..090fd54 100644
--- a/src/mainboard/gigabyte/ma785gm/mptable.c
+++ b/src/mainboard/gigabyte/ma785gm/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/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index f197ba9..4ca318a 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 0cdcdb7..967343d 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 241e187..dc6a78b 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/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/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index bffe1a2..876e7ee 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 1a0a011..746be76 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 0cdcdb7..967343d 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 cbf436b..ee2a6ca 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 bffe1a2..876e7ee 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 aa80a27..4d23bac 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 39d9096..2154cd8 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 0b9e0c4..08f6076 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 d0704f3..ea9f959 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 3355136..c27ad9e 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 a5b2384..96dbe66 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 a5b2384..96dbe66 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 159d5f6..f346372 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 5afb26c..9f8188f 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 ef2e336..a86fb0e 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 be7626c..e5976bc 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 7356030..2b2acba 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 8e8764e..c6b0db2 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 7286437..090f280 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 9466418..e0fd105 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 614a22e..70a8c19 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 6b69277..9cc13c9 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 6dfbfcb..d34b1e4 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 4b148f8..44101e3 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 633f69e..b05f1e0 100644
--- a/src/mainboard/google/dragonegg/romstage_fsp_params.c
+++ b/src/mainboard/google/dragonegg/romstage_fsp_params.c
@@ -18,7 +18,6 @@
 #include <cbfs.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 939b061..09fdc2f 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 490ec00..e169ec0 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -16,7 +16,6 @@
#include <gpio.h>
 #include <soc/gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
#include <variant/gpio.h>
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index c78a219..879ff93 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 6008ba7..05c8a3e 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 8a8b223..f733bca 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 1b5ea51..87ca1dc 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 1b5ea51..87ca1dc 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 4eeabbe..14f9676 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 7c034225..b7974ea 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 04b03ba..410866d 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 4fb8e78..be1b98d 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 f466d91..945a0e7 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 f466d91..945a0e7 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 93791fb..b5d7023 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 c5bd996..9d8b94d 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 eb080f0..aeefda5 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 77b7d5e..93d77da 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 2936fa2..52e4af3 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 da6b50d..76a4b4b 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 3837a52..8e6db19 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 99a97d8..d47a323 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 59eeefb..15faac9 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 005ddc3..5322267 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 93ecc3a..edf2a62 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 9a3c130..9ed2b04 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 bf5e294..816311a 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/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/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index e26c3fb..6cae38d 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 e44abcd..4bbc1d6 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 fe8e5aa..86e8cb2 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 3110228..b829457 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 681aa55..46aadaf 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 2024abf..5f51a6b 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 d76e9c1..7539dd7 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 8547cdb..ac14e37 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 8cc16b3..291bc33 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 92d5f9a..c775e48 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 8cc16b3..291bc33 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 d527ede..a0ac77e 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 590b051..8eae71d 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 0b9e0c4..08f6076 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 f204632..6bf83cf 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 66c480e..c02b0e6 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 a840fe8..eba2d1d 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 89fba6b..14f93ec 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 c907d68..6cdf89a 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 30c1026..237ef2a 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 bffe1a2..b04a315 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 1c41df4..421e613 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 081733c..b22e5d0 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/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/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index 8c8ae40..49e66bf 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 2903a5c..d81798c 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 3280878..16c1844 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 88cfb1d..ee9f36e 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 457be7f..2396505 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 d9aa098..c58cbf5 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 666d48d..74edc38 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 c57bd6f..d07da83 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 1259fe8..9a9fc24 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 e126bd8..43818ee 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 d6c701a..d269871 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 44fdc4f..53ecdec 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 37f4424..914e4fd 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 2d23fa3..dd33021 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 101b04b..5168074 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 604c069..78c7ae4 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 c96f791..1a483bd 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 75115c8..f7a9d52 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 c87b565..4c93051 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 6a21124..bfc40c2 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 285239a..ee1ddd5 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 edb66fc0..fe95a31 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 29c5de7..38ca9ff 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 5e9cad6..03eff1b 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 c25e317..0f3067e 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 39bf213..c94c7bf 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 ad651f5..9487e9b 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 83975db..4bfd039 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 0b0e941..705904e 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 bc9c154..787c432 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 9ae5858..8fbdc58 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 8c6a096..92e7118 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 cbf436b..ee2a6ca 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 5fb82ff..6e9d1cc 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 7a90f50..7fcb594 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 7db977d..2edb7da 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 26e02a0..afedbfc 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 0ea982c..f778f96 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 a840fe8..eba2d1d 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 01728a3..7591f8b 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 8a9ee48..838757e 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 565fe2f..070ee59 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 caaeffc..c5a3120 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 38ede4b..a5b0c81 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 614ad5e..f97c3f5 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 7b23d5a..0118ba0 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 513e8e1..39e0ed5 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 8a9ee48..838757e 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 9d606f7..45cd9ec 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 f18a2aa..787c432 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 f18a2aa..787c432 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 a840fe8..eba2d1d 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 6e75973..c817985 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 f3947e7..13b5d92 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 11015f6..2da427d 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 8456e2d..94c09ec 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 88589b0..b20c445 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 f18a2aa..787c432 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 32b2a6e..bb8d01e 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 0b9e0c4..08f6076 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 c80e9ee..bd3c421 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 48db885..63d148a 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 59ab0c4..cf87d7f 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 fbda731..dbc4b6c 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 c41e964..8038664 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 b21ae22..17d7e0e 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 57fdbcb..a8e28d6 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 30dfeab..296e896 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 e126bd8..43818ee 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 5ca7369..237d551 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 da25dec..f40841e 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 c29ff9d..f14c1b6 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 2903a5c..d81798c 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 8b96670..d41551d 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 1d6410d..4d6846c 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 5d4c1cb..8c884c4 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 76d255b..051cd61 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 530a913..e9f181b 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 3c0bf46..8bc96c2 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 e3a572e..112d20a 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 3057a3f..f3958f8 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 f9062ca..1781a66 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 73951d1..3f504e1 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 f96dc44..80693cd 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>
diff --git a/src/northbridge/amd/amdfam10/get_pci1234.c b/src/northbridge/amd/amdfam10/get_pci1234.c
index 0d372f4..94ec831 100644
--- a/src/northbridge/amd/amdfam10/get_pci1234.c
+++ b/src/northbridge/amd/amdfam10/get_pci1234.c
@@ -15,7 +15,6 @@
#include <bootstate.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
index 6d41560..c73fde4 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
@@ -18,7 +18,6 @@
 #include <inttypes.h>
 #include <console/console.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
index 4836757..47e11ec 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
@@ -16,7 +16,6 @@
#include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 #include <cpu/amd/mtrr.h>
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
index 3df0323..0debd3e 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
@@ -16,7 +16,6 @@
#include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
index a02b15f..d92d9c9 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
@@ -14,7 +14,6 @@
  */
#include <inttypes.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
index eb3143f..7cac2af 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
@@ -15,7 +15,6 @@
  */
#include <inttypes.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c b/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
index 5a4fd2a..4975d55 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
@@ -15,7 +15,6 @@
  */
#include <inttypes.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c b/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
index d299f56..21f7058 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
@@ -17,7 +17,6 @@
 #include <arch/cpu.h>
 #include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
index 3ca1a98..2e264c5 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
@@ -17,7 +17,6 @@
 #include <arch/cpu.h>
 #include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
index eb30c8d..4beb087 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
@@ -16,7 +16,6 @@
#include <arch/cpu.h>
 #include <inttypes.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c b/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
index 6c3db47..31f5aba 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
@@ -20,7 +20,6 @@
#include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include <cpu/amd/msr.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c b/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
index a91fb08..ae6547b 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
@@ -17,7 +17,6 @@
 #include <arch/cpu.h>
 #include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
index b62661b..4c6b4bf 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
@@ -16,7 +16,6 @@
#include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 #include "mwlc_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
index 26ea031..6f95803 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
@@ -14,7 +14,6 @@
  */
#include <inttypes.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
index 1c2a135..c981623 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
@@ -18,7 +18,6 @@
#include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
index 3c512ed..732ec7b 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
@@ -15,7 +15,6 @@
#include <arch/io.h>
 #include <inttypes.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 #include "mwlc_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
index e4afa70..77eec5c 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
@@ -18,7 +18,6 @@
#include <arch/cpu.h>
 #include <inttypes.h>
-#include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 #include "mwlc_d.h"
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index 8c31f7e..322a752 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <cpu/cpu.h>
 #include <stdlib.h>
-#include <string.h>
 #include "e7505.h"
 #include <arch/acpi.h>
diff --git a/src/northbridge/intel/fsp_rangeley/acpi.c b/src/northbridge/intel/fsp_rangeley/acpi.c
index 901843d..54c8b3c 100644
--- a/src/northbridge/intel/fsp_rangeley/acpi.c
+++ b/src/northbridge/intel/fsp_rangeley/acpi.c
@@ -17,7 +17,6 @@
  */
#include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.c b/src/northbridge/intel/fsp_rangeley/northbridge.c
index cd900be..00b7cba 100644
--- a/src/northbridge/intel/fsp_rangeley/northbridge.c
+++ b/src/northbridge/intel/fsp_rangeley/northbridge.c
@@ -25,7 +25,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "northbridge.h"
diff --git a/src/northbridge/intel/fsp_rangeley/raminit.c b/src/northbridge/intel/fsp_rangeley/raminit.c
index 3294135..344adb7 100644
--- a/src/northbridge/intel/fsp_rangeley/raminit.c
+++ b/src/northbridge/intel/fsp_rangeley/raminit.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
-#include <string.h>
 #include <cbmem.h>
 #include <device/pci_def.h>
 #include "northbridge.h"
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index 301743c..3d90efb 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -15,7 +15,6 @@
  */
#include <types.h>
-#include <string.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 40e4f61..b18de77 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <arch/acpi.h>
diff --git a/src/northbridge/intel/gm45/pcie.c b/src/northbridge/intel/gm45/pcie.c
index c470b81..4199274 100644
--- a/src/northbridge/intel/gm45/pcie.c
+++ b/src/northbridge/intel/gm45/pcie.c
@@ -16,7 +16,6 @@
#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <console/console.h>
diff --git a/src/northbridge/intel/gm45/pm.c b/src/northbridge/intel/gm45/pm.c
index a447a23..d96bcf4 100644
--- a/src/northbridge/intel/gm45/pm.c
+++ b/src/northbridge/intel/gm45/pm.c
@@ -16,7 +16,6 @@
#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/speedstep.h>
diff --git a/src/northbridge/intel/gm45/romstage.c b/src/northbridge/intel/gm45/romstage.c
index 7335ac9..09439f2 100644
--- a/src/northbridge/intel/gm45/romstage.c
+++ b/src/northbridge/intel/gm45/romstage.c
@@ -27,6 +27,7 @@
 #include <northbridge/intel/gm45/gm45.h>
 #include <southbridge/intel/i82801ix/i82801ix.h>
 #include <southbridge/intel/common/gpio.h>
+#include <string.h>
#define LPC_DEV PCI_DEV(0, 0x1f, 0)
 #define MCH_DEV PCI_DEV(0, 0, 0)
diff --git a/src/northbridge/intel/gm45/thermal.c b/src/northbridge/intel/gm45/thermal.c
index 3ed75b3..7137f4d 100644
--- a/src/northbridge/intel/gm45/thermal.c
+++ b/src/northbridge/intel/gm45/thermal.c
@@ -16,7 +16,6 @@
#include <stdint.h>
 #include <stddef.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <spd.h>
 #include "delay.h"
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index ad4563b..9565d2c 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -26,7 +26,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/x86/smm.h>
 #include <boot/tables.h>
 #include "chip.h"
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index 2e4c3a1..ef6329c 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include "northbridge.h"
 #include "i440bx.h"
diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index f817cdf..3a9f6a2 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -15,7 +15,6 @@
  */
#include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <device/device.h>
diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index e8cacf6..d3ed277 100644
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -22,7 +22,6 @@
 #include <cbmem.h>
 #include <halt.h>
 #include <romstage_handoff.h>
-#include <string.h>
 #include "i945.h"
 #include <pc80/mc146818rtc.h>
 #include <southbridge/intel/common/gpio.h>
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index ce7d292..82392f4 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -21,7 +21,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <arch/acpi.h>
 #include <cpu/intel/smm/gen1/smi.h>
diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c
index 86fc583..16f1c35 100644
--- a/src/northbridge/intel/nehalem/gma.c
+++ b/src/northbridge/intel/nehalem/gma.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <drivers/intel/gma/edid.h>
 #include <drivers/intel/gma/i915.h>
diff --git a/src/northbridge/intel/nehalem/northbridge.c b/src/northbridge/intel/nehalem/northbridge.c
index 8a4f64c..575c600 100644
--- a/src/northbridge/intel/nehalem/northbridge.c
+++ b/src/northbridge/intel/nehalem/northbridge.c
@@ -26,7 +26,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "nehalem.h"
diff --git a/src/northbridge/intel/nehalem/smi.c b/src/northbridge/intel/nehalem/smi.c
index 6aefc9b..5bfc934 100644
--- a/src/northbridge/intel/nehalem/smi.c
+++ b/src/northbridge/intel/nehalem/smi.c
@@ -14,7 +14,6 @@
 #define __SIMPLE_DEVICE__
#include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/northbridge/intel/pineview/early_init.c b/src/northbridge/intel/pineview/early_init.c
index 4f28474..a0d5305 100644
--- a/src/northbridge/intel/pineview/early_init.c
+++ b/src/northbridge/intel/pineview/early_init.c
@@ -21,7 +21,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <device/pci.h>
-#include <string.h>
 #include <northbridge/intel/pineview/pineview.h>
 #include <northbridge/intel/pineview/chip.h>
 #include <pc80/mc146818rtc.h>
diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index 8bacc77..d6ece9d 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -22,7 +22,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <string.h>
 #include <device/pci_ops.h>
#include <drivers/intel/gma/i915_reg.h>
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index 5ddcd73..4b67cfd 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <arch/acpi.h>
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 00180fe..871f4d5 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <bootmode.h>
 #include <delay.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index e58a0eb..477c26e 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -25,7 +25,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "sandybridge.h"
diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c
index d48bac4..b49165c 100644
--- a/src/northbridge/intel/sandybridge/romstage.c
+++ b/src/northbridge/intel/sandybridge/romstage.c
@@ -16,7 +16,6 @@
  */
#include <stdint.h>
-#include <string.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/northbridge/intel/x4x/acpi.c b/src/northbridge/intel/x4x/acpi.c
index da9ed40..fb04fd8 100644
--- a/src/northbridge/intel/x4x/acpi.c
+++ b/src/northbridge/intel/x4x/acpi.c
@@ -16,7 +16,6 @@
  */
#include <types.h>
-#include <string.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 8de568a..2c045e6 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <commonlib/helpers.h>
 #include <cbmem.h>
diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index ba51430..b6616e1 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <arch/acpi.h>
diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c
index 0544c17..d865f38 100644
--- a/src/northbridge/via/vx900/northbridge.c
+++ b/src/northbridge/via/vx900/northbridge.c
@@ -25,7 +25,6 @@
 #include <cpu/cpu.h>
 #include <cf9_reset.h>
 #include <reset.h>
-#include <string.h>
#define RAM_4GB		(((u64)1) << 32)
diff --git a/src/security/tpm/tspi/log.c b/src/security/tpm/tspi/log.c
index ba4dbc1..6ab9067 100644
--- a/src/security/tpm/tspi/log.c
+++ b/src/security/tpm/tspi/log.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
-#include <string.h>
 #include <console/console.h>
 #include <security/tpm/tspi.h>
 #include <arch/early_variables.h>
diff --git a/src/security/tpm/tspi/tspi.c b/src/security/tpm/tspi/tspi.c
index aa2dc09..d789278 100644
--- a/src/security/tpm/tspi/tspi.c
+++ b/src/security/tpm/tspi/tspi.c
@@ -21,7 +21,6 @@
 #include <security/tpm/tspi.h>
 #include <security/tpm/tss.h>
 #include <stdlib.h>
-#include <string.h>
 #if CONFIG(VBOOT)
 #include <vb2_api.h>
 #include <assert.h>
diff --git a/src/security/tpm/tss/vendor/cr50/cr50.c b/src/security/tpm/tss/vendor/cr50/cr50.c
index 1522ce6..4f128dc 100644
--- a/src/security/tpm/tss/vendor/cr50/cr50.c
+++ b/src/security/tpm/tss/vendor/cr50/cr50.c
@@ -7,7 +7,6 @@
 #include <arch/early_variables.h>
 #include <console/console.h>
 #include <endian.h>
-#include <string.h>
 #include <vb2_api.h>
 #include <security/tpm/tis.h>
 #include <security/tpm/tss.h>
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 3fb693d..1d6525f 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -17,7 +17,6 @@
 #include <bootmode.h>
 #include <bootstate.h>
 #include <cbmem.h>
-#include <string.h>
 #include <vb2_api.h>
 #include <security/vboot/misc.h>
 #include <security/vboot/vbnv.h>
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index 51bc682..5e95c62 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -21,7 +21,6 @@
 #include <gbb_header.h>
 #include <reset.h>
 #include <stddef.h>
-#include <string.h>
 #include <security/vboot/gbb.h>
 #include <security/vboot/vboot_common.h>
 #include <security/vboot/vbnv.h>
diff --git a/src/security/vboot/vboot_crtm.c b/src/security/vboot/vboot_crtm.c
index f4a6d75..9e8b789 100644
--- a/src/security/vboot/vboot_crtm.c
+++ b/src/security/vboot/vboot_crtm.c
@@ -17,6 +17,7 @@
 #include <fmap.h>
 #include <security/vboot/vboot_crtm.h>
 #include <security/vboot/misc.h>
+#include <string.h>
/*
  * This functions sets the TCPA log namespace
diff --git a/src/security/vboot/vboot_loader.c b/src/security/vboot/vboot_loader.c
index e0facc1..0640ebd 100644
--- a/src/security/vboot/vboot_loader.c
+++ b/src/security/vboot/vboot_loader.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <rmodule.h>
-#include <string.h>
 #include <security/vboot/misc.h>
 #include <security/vboot/symbols.h>
 #include <security/vboot/vboot_common.h>
diff --git a/src/soc/amd/common/block/pci/amd_pci_util.c b/src/soc/amd/common/block/pci/amd_pci_util.c
index d06a8df..7a40d26 100644
--- a/src/soc/amd/common/block/pci/amd_pci_util.c
+++ b/src/soc/amd/common/block/pci/amd_pci_util.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <amdblocks/amd_pci_util.h>
 #include <pc80/i8259.h>
 #include <soc/amd_pci_int_defs.h>
diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c
index fc69b46..485dfd7 100644
--- a/src/soc/amd/common/block/pi/agesawrapper.c
+++ b/src/soc/amd/common/block/pi/agesawrapper.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <cbmem.h>
 #include <delay.h>
-#include <string.h>
 #include <timestamp.h>
 #include <amdblocks/s3_resume.h>
 #include <amdblocks/agesawrapper.h>
diff --git a/src/soc/amd/common/block/pi/amd_late_init.c b/src/soc/amd/common/block/pi/amd_late_init.c
index 68cf3a1..fdecf00 100644
--- a/src/soc/amd/common/block/pi/amd_late_init.c
+++ b/src/soc/amd/common/block/pi/amd_late_init.c
@@ -23,6 +23,7 @@
 #include <dimm_info_util.h>
 #include <memory_info.h>
 #include <lib.h>
+#include <string.h>
#include <amdblocks/agesawrapper.h>
 #include <amdblocks/agesawrapper_call.h>
diff --git a/src/soc/amd/stoneyridge/spi.c b/src/soc/amd/stoneyridge/spi.c
index e6b1a36..c682d98 100644
--- a/src/soc/amd/stoneyridge/spi.c
+++ b/src/soc/amd/stoneyridge/spi.c
@@ -15,7 +15,6 @@
#include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <device/mmio.h>
 #include <lib.h>
 #include <timer.h>
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index bef7052..47fbc0d 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -48,7 +48,6 @@
 #include <soc/romstage.h>
 #include <soc/systemagent.h>
 #include <spi_flash.h>
-#include <string.h>
 #include <timer.h>
 #include <timestamp.h>
 #include "chip.h"
diff --git a/src/soc/intel/apollolake/uart.c b/src/soc/intel/apollolake/uart.c
index 66a1a1a..a85ad1f 100644
--- a/src/soc/intel/apollolake/uart.c
+++ b/src/soc/intel/apollolake/uart.c
@@ -24,7 +24,6 @@
 #include <intelblocks/uart.h>
 #include <soc/gpio.h>
 #include <soc/pci_devs.h>
-#include <string.h>
/* UART pad configuration. Support RXD and TXD for now. */
 const struct uart_gpio_pad_config uart_gpio_pads[] = {
diff --git a/src/soc/intel/baytrail/refcode.c b/src/soc/intel/baytrail/refcode.c
index a5946bc..24469ea 100644
--- a/src/soc/intel/baytrail/refcode.c
+++ b/src/soc/intel/baytrail/refcode.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
-#include <string.h>
 #include <arch/acpi.h>
 #include <cbmem.h>
 #include <console/console.h>
diff --git a/src/soc/intel/baytrail/smm.c b/src/soc/intel/baytrail/smm.c
index ec0aa85..4fe1da9 100644
--- a/src/soc/intel/baytrail/smm.c
+++ b/src/soc/intel/baytrail/smm.c
@@ -20,7 +20,6 @@
 #include <arch/io.h>
 #include <device/mmio.h>
 #include <cpu/x86/smm.h>
-#include <string.h>
#include <soc/iomap.h>
 #include <soc/pmc.h>
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 7b01cfa..0289e8b 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -30,6 +30,7 @@
 #include <device/pci_ids.h>
 #include <pc80/mc146818rtc.h>
 #include <drivers/uart/uart8250reg.h>
+#include <string.h>
#include <soc/iomap.h>
 #include <soc/irq.h>
diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index 1faf651..d5b962f 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -13,9 +13,9 @@
  */
/* This file is derived from the flashrom project. */
+
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <bootstate.h>
 #include <delay.h>
 #include <device/mmio.h>
diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c
index b8362cd..d6a1cda 100644
--- a/src/soc/intel/braswell/ramstage.c
+++ b/src/soc/intel/braswell/ramstage.c
@@ -38,6 +38,7 @@
 #include <soc/intel/common/acpi.h>
 #include <boardid.h>
 #include <stdlib.h>
+#include <string.h>
#define SHOW_PATTRS 1
diff --git a/src/soc/intel/braswell/smm.c b/src/soc/intel/braswell/smm.c
index 6f54d78..fe681c9 100644
--- a/src/soc/intel/braswell/smm.c
+++ b/src/soc/intel/braswell/smm.c
@@ -24,7 +24,6 @@
 #include <soc/iomap.h>
 #include <soc/pm.h>
 #include <soc/smm.h>
-#include <string.h>
/* Save settings which will be committed in SMI functions. */
 static uint32_t smm_save_params[SMM_SAVE_PARAM_COUNT];
diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c
index c87232d..b968283 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -14,6 +14,7 @@
  */
/* This file is derived from the flashrom project. */
+
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <bootstate.h>
@@ -28,7 +29,6 @@
 #include <spi-generic.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
typedef struct spi_slave ich_spi_slave;
diff --git a/src/soc/intel/broadwell/cpu.c b/src/soc/intel/broadwell/cpu.c
index d274be8..5592538 100644
--- a/src/soc/intel/broadwell/cpu.c
+++ b/src/soc/intel/broadwell/cpu.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <string.h>
 #include <arch/cpu.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/broadwell/gpio.c b/src/soc/intel/broadwell/gpio.c
index 50f6a29..81ad9d4 100644
--- a/src/soc/intel/broadwell/gpio.c
+++ b/src/soc/intel/broadwell/gpio.c
@@ -14,7 +14,6 @@
  */
#include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/broadwell/smi.c b/src/soc/intel/broadwell/smi.c
index f87b8a2..9aab0d1 100644
--- a/src/soc/intel/broadwell/smi.c
+++ b/src/soc/intel/broadwell/smi.c
@@ -20,7 +20,6 @@
 #include <arch/io.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
-#include <string.h>
 #include <soc/iomap.h>
 #include <soc/pch.h>
 #include <soc/pm.h>
diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c
index d812757..01d2830 100644
--- a/src/soc/intel/broadwell/spi.c
+++ b/src/soc/intel/broadwell/spi.c
@@ -14,7 +14,6 @@
 /* This file is derived from the flashrom project. */
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <bootstate.h>
 #include <commonlib/helpers.h>
 #include <delay.h>
diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c
index aef1d1c..c6444b1 100644
--- a/src/soc/intel/broadwell/systemagent.c
+++ b/src/soc/intel/broadwell/systemagent.c
@@ -23,7 +23,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index 993e7f3..d50c689 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -27,7 +27,6 @@
 #include <soc/itss.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
-#include <string.h>
#if CONFIG(HAVE_ACPI_TABLES)
 const char *soc_acpi_name(const struct device *dev)
diff --git a/src/soc/intel/cannonlake/uart.c b/src/soc/intel/cannonlake/uart.c
index d03d21e..421cafc 100644
--- a/src/soc/intel/cannonlake/uart.c
+++ b/src/soc/intel/cannonlake/uart.c
@@ -23,7 +23,6 @@
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>
-#include <string.h>
/* Serial IO UART controller legacy mode */
 #define PCR_SERIAL_IO_GPPRVRW7		0x618
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index e311ae6..c872e51 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -13,6 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
@@ -30,6 +31,7 @@
 #include <soc/iomap.h>
 #include <soc/nvs.h>
 #include <soc/pm.h>
+#include <string.h>
__attribute__((weak)) unsigned long acpi_fill_mcfg(unsigned long current)
 {
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c
index 2e3b99e..455b13c 100644
--- a/src/soc/intel/common/block/fast_spi/fast_spi.c
+++ b/src/soc/intel/common/block/fast_spi/fast_spi.c
@@ -26,7 +26,6 @@
 #include <spi_flash.h>
 #include <spi-generic.h>
 #include <stdlib.h>
-#include <string.h>
/*
  * Get the FAST_SPIBAR.
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 7f21372..b89bf6f 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -27,7 +27,6 @@
 #include <soc/pci_devs.h>
 #include <soc/iomap.h>
 #include <soc/nvs.h>
-#include <string.h>
#define UART_PCI_ENABLE	(PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER)
 #define UART_CONSOLE_INVALID_INDEX	0xFF
diff --git a/src/soc/intel/common/mma.c b/src/soc/intel/common/mma.c
index 77f8c1e..1b3a82a 100644
--- a/src/soc/intel/common/mma.c
+++ b/src/soc/intel/common/mma.c
@@ -18,6 +18,7 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <soc/intel/common/mma.h>
+#include <string.h>
#define MMA_TEST_METADATA_FILENAME	"mma_test_metadata.bin"
 #define MMA_TEST_NAME_TAG		"MMA_TEST_NAME"
diff --git a/src/soc/intel/common/pch/lockdown/lockdown.c b/src/soc/intel/common/pch/lockdown/lockdown.c
index 6f79466..99d8a35 100644
--- a/src/soc/intel/common/pch/lockdown/lockdown.c
+++ b/src/soc/intel/common/pch/lockdown/lockdown.c
@@ -21,7 +21,6 @@
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>
 #include <soc/soc_chip.h>
-#include <string.h>
#define PCR_DMI_GCS		0x274C
 #define PCR_DMI_GCS_BILD	(1 << 0)
diff --git a/src/soc/intel/denverton_ns/csme_ie_kt.c b/src/soc/intel/denverton_ns/csme_ie_kt.c
index 5f90185..5967840 100644
--- a/src/soc/intel/denverton_ns/csme_ie_kt.c
+++ b/src/soc/intel/denverton_ns/csme_ie_kt.c
@@ -16,7 +16,6 @@
#include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <console/console.h>
diff --git a/src/soc/intel/denverton_ns/include/soc/soc_util.h b/src/soc/intel/denverton_ns/include/soc/soc_util.h
index 91bd12e..c348948 100644
--- a/src/soc/intel/denverton_ns/include/soc/soc_util.h
+++ b/src/soc/intel/denverton_ns/include/soc/soc_util.h
@@ -19,6 +19,7 @@
#ifndef __ACPI__
 #include <device/device.h>
+#include <string.h>
/* Silicon revisions */
 typedef enum {
diff --git a/src/soc/intel/denverton_ns/smm.c b/src/soc/intel/denverton_ns/smm.c
index 9d3fa75..2df6994 100644
--- a/src/soc/intel/denverton_ns/smm.c
+++ b/src/soc/intel/denverton_ns/smm.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <cpu/x86/smm.h>
-#include <string.h>
#include <soc/iomap.h>
 #include <soc/soc_util.h>
diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c
index 1e44021..ba7ba0f 100644
--- a/src/soc/intel/denverton_ns/soc_util.c
+++ b/src/soc/intel/denverton_ns/soc_util.c
@@ -20,7 +20,7 @@
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/device.h>
-
+#include <string.h>
 #include <soc/iomap.h>
 #include <soc/soc_util.h>
 #include <soc/pmc.h>
diff --git a/src/soc/intel/denverton_ns/systemagent.c b/src/soc/intel/denverton_ns/systemagent.c
index e715469..cc1d696 100644
--- a/src/soc/intel/denverton_ns/systemagent.c
+++ b/src/soc/intel/denverton_ns/systemagent.c
@@ -24,7 +24,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <stdlib.h>
-#include <string.h>
 #include <timer.h>
#include <soc/iomap.h>
diff --git a/src/soc/intel/fsp_baytrail/smm.c b/src/soc/intel/fsp_baytrail/smm.c
index 651e7d1..4982a8c 100644
--- a/src/soc/intel/fsp_baytrail/smm.c
+++ b/src/soc/intel/fsp_baytrail/smm.c
@@ -20,7 +20,6 @@
 #include <arch/io.h>
 #include <device/mmio.h>
 #include <cpu/x86/smm.h>
-#include <string.h>
#include <soc/iomap.h>
 #include <soc/pmc.h>
diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c
index 573c1c4..979ee57 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -15,9 +15,9 @@
  */
/* This file is derived from the flashrom project. */
+
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <commonlib/helpers.h>
 #include <delay.h>
 #include <device/mmio.h>
diff --git a/src/soc/intel/fsp_broadwell_de/chip.c b/src/soc/intel/fsp_broadwell_de/chip.c
index 348e1c0..6b14845 100644
--- a/src/soc/intel/fsp_broadwell_de/chip.c
+++ b/src/soc/intel/fsp_broadwell_de/chip.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
-#include <string.h>
 #include <bootstate.h>
 #include <console/console.h>
 #include <device/device.h>
diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c
index 0978ab3..0e4388e 100644
--- a/src/soc/intel/icelake/chip.c
+++ b/src/soc/intel/icelake/chip.c
@@ -28,7 +28,6 @@
 #include <soc/itss.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
-#include <string.h>
#if CONFIG(HAVE_ACPI_TABLES)
 const char *soc_acpi_name(const struct device *dev)
diff --git a/src/soc/intel/icelake/romstage/power_state.c b/src/soc/intel/icelake/romstage/power_state.c
index cfeffbb..4077550 100644
--- a/src/soc/intel/icelake/romstage/power_state.c
+++ b/src/soc/intel/icelake/romstage/power_state.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/tco.h>
-#include <string.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
diff --git a/src/soc/intel/icelake/uart.c b/src/soc/intel/icelake/uart.c
index d03d21e..421cafc 100644
--- a/src/soc/intel/icelake/uart.c
+++ b/src/soc/intel/icelake/uart.c
@@ -23,7 +23,6 @@
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>
-#include <string.h>
/* Serial IO UART controller legacy mode */
 #define PCR_SERIAL_IO_GPPRVRW7		0x618
diff --git a/src/soc/intel/quark/spi.c b/src/soc/intel/quark/spi.c
index 0822e7d..7ffa203 100644
--- a/src/soc/intel/quark/spi.c
+++ b/src/soc/intel/quark/spi.c
@@ -25,6 +25,7 @@
 #include <soc/pci_devs.h>
 #include <soc/QuarkNcSocId.h>
 #include <soc/spi.h>
+#include <string.h>
struct spi_context spi_driver_context = {
    NULL,
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 0ff5a13..0343a23 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <string.h>
 #include <chip.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
diff --git a/src/soc/intel/skylake/uart.c b/src/soc/intel/skylake/uart.c
index 53d408a..1b2a742 100644
--- a/src/soc/intel/skylake/uart.c
+++ b/src/soc/intel/skylake/uart.c
@@ -23,7 +23,6 @@
 #include <soc/bootblock.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>
-#include <string.h>
/* Serial IO UART controller legacy mode */
 #define PCR_SERIAL_IO_GPPRVRW7		0x618
diff --git a/src/soc/mediatek/mt8173/ddp.c b/src/soc/mediatek/mt8173/ddp.c
index 9f2f3b9..09ea200 100644
--- a/src/soc/mediatek/mt8173/ddp.c
+++ b/src/soc/mediatek/mt8173/ddp.c
@@ -17,7 +17,6 @@
 #include <delay.h>
 #include <edid.h>
 #include <stdlib.h>
-#include <string.h>
 #include <stddef.h>
 #include <soc/addressmap.h>
 #include <soc/ddp.h>
diff --git a/src/soc/mediatek/mt8173/dramc_pi_basic_api.c b/src/soc/mediatek/mt8173/dramc_pi_basic_api.c
index 0a0bad4..6dda102 100644
--- a/src/soc/mediatek/mt8173/dramc_pi_basic_api.c
+++ b/src/soc/mediatek/mt8173/dramc_pi_basic_api.c
@@ -26,7 +26,6 @@
 #include <soc/mt6391.h>
 #include <soc/pll.h>
 #include <soc/spm.h>
-#include <string.h>
 #include <types.h>
struct mem_pll {
diff --git a/src/soc/mediatek/mt8173/emi.c b/src/soc/mediatek/mt8173/emi.c
index c1e5d11..68b178f 100644
--- a/src/soc/mediatek/mt8173/emi.c
+++ b/src/soc/mediatek/mt8173/emi.c
@@ -18,7 +18,6 @@
 #include <boardid.h>
 #include <console/console.h>
 #include <delay.h>
-#include <string.h>
 #include <soc/addressmap.h>
 #include <soc/dramc_common.h>
 #include <soc/dramc_register.h>
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index 457f918..9188f83 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -30,7 +30,6 @@
 #include <soc/sor.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
#include "chip.h"
diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c
index 51fa10f..45159c2 100644
--- a/src/soc/nvidia/tegra124/spi.c
+++ b/src/soc/nvidia/tegra124/spi.c
@@ -28,11 +28,9 @@
 #include <spi_flash.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <symbols.h>
 #include <timer.h>
-
 #if defined(CONFIG_DEBUG_SPI) && CONFIG_DEBUG_SPI
 # define DEBUG_SPI(x,...)	printk(BIOS_DEBUG, "TEGRA_SPI: " x)
 #else
diff --git a/src/soc/nvidia/tegra210/arm_tf.c b/src/soc/nvidia/tegra210/arm_tf.c
index 3ffcb0e..bd34185 100644
--- a/src/soc/nvidia/tegra210/arm_tf.c
+++ b/src/soc/nvidia/tegra210/arm_tf.c
@@ -19,7 +19,6 @@
 #include <soc/addressmap.h>
 #include <soc/console_uart.h>
 #include <stdlib.h>
-#include <string.h>
 #include <symbols.h>
typedef struct bl31_plat_params {
diff --git a/src/soc/nvidia/tegra210/ccplex.c b/src/soc/nvidia/tegra210/ccplex.c
index ce46e5e..fbda37f 100644
--- a/src/soc/nvidia/tegra210/ccplex.c
+++ b/src/soc/nvidia/tegra210/ccplex.c
@@ -25,7 +25,6 @@
 #include <soc/pmc.h>
 #include <soc/power.h>
 #include <soc/romstage.h>
-#include <string.h>
 #include <timer.h>
#define PMC_REGS (void *)(uintptr_t)(TEGRA_PMC_BASE)
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index a9d6835..c013099 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -26,7 +26,6 @@
 #include <soc/cpu.h>
 #include <soc/mc.h>
 #include <soc/nvidia/tegra/apbmisc.h>
-#include <string.h>
 #include <timer.h>
 #include <soc/sdram.h>
 #include <soc/sdram_configs.h>
diff --git a/src/soc/nvidia/tegra210/sor.c b/src/soc/nvidia/tegra210/sor.c
index 045715f..3055b29 100644
--- a/src/soc/nvidia/tegra210/sor.c
+++ b/src/soc/nvidia/tegra210/sor.c
@@ -22,7 +22,6 @@
 #include <delay.h>
 #include <soc/addressmap.h>
 #include <device/device.h>
-#include <string.h>
 #include <boot/tables.h>
 #include <soc/nvidia/tegra/dc.h>
 #include <soc/nvidia/tegra/types.h>
diff --git a/src/soc/nvidia/tegra210/spi.c b/src/soc/nvidia/tegra210/spi.c
index 6330779..6542df1 100644
--- a/src/soc/nvidia/tegra210/spi.c
+++ b/src/soc/nvidia/tegra210/spi.c
@@ -28,7 +28,6 @@
 #include <soc/spi.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <symbols.h>
 #include <timer.h>
diff --git a/src/soc/qualcomm/ipq40xx/spi.c b/src/soc/qualcomm/ipq40xx/spi.c
index c84a3e5..109eda9 100644
--- a/src/soc/qualcomm/ipq40xx/spi.c
+++ b/src/soc/qualcomm/ipq40xx/spi.c
@@ -34,7 +34,6 @@
 #include <soc/iomap.h>
 #include <soc/spi.h>
 #include <stdlib.h>
-#include <string.h>
static const struct blsp_spi spi_reg[] = {
    /* BLSP0 registers for SPI interface */
diff --git a/src/soc/qualcomm/ipq806x/spi.c b/src/soc/qualcomm/ipq806x/spi.c
index cdd2a99..6577345 100644
--- a/src/soc/qualcomm/ipq806x/spi.c
+++ b/src/soc/qualcomm/ipq806x/spi.c
@@ -20,7 +20,6 @@
 #include <soc/iomap.h>
 #include <soc/spi.h>
 #include <stdlib.h>
-#include <string.h>
#define SUCCESS		0
diff --git a/src/soc/rockchip/common/i2c.c b/src/soc/rockchip/common/i2c.c
index 3c66a58..e5f5a9a 100644
--- a/src/soc/rockchip/common/i2c.c
+++ b/src/soc/rockchip/common/i2c.c
@@ -24,7 +24,6 @@
 #include <soc/i2c.h>
 #include <soc/clock.h>
 #include <stdlib.h>
-#include <string.h>
#define RETRY_COUNT	3
 /* 100000us = 100ms */
diff --git a/src/soc/rockchip/common/vop.c b/src/soc/rockchip/common/vop.c
index ffd2bea..1ee861c 100644
--- a/src/soc/rockchip/common/vop.c
+++ b/src/soc/rockchip/common/vop.c
@@ -16,7 +16,6 @@
 #include <device/mmio.h>
 #include <delay.h>
 #include <stdlib.h>
-#include <string.h>
 #include <stddef.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
diff --git a/src/soc/rockchip/rk3288/hdmi.c b/src/soc/rockchip/rk3288/hdmi.c
index aecdeef..425d302 100644
--- a/src/soc/rockchip/rk3288/hdmi.c
+++ b/src/soc/rockchip/rk3288/hdmi.c
@@ -27,7 +27,6 @@
 #include <gpio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <string.h>
 #include <soc/addressmap.h>
 #include <soc/hdmi.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3288/sdram.c b/src/soc/rockchip/rk3288/sdram.c
index b343bab..808ff963 100644
--- a/src/soc/rockchip/rk3288/sdram.c
+++ b/src/soc/rockchip/rk3288/sdram.c
@@ -21,7 +21,6 @@
 #include <soc/grf.h>
 #include <soc/soc.h>
 #include <soc/pmu.h>
-#include <string.h>
 #include <types.h>
struct rk3288_ddr_pctl_regs {
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index ad679e5..19ad0eb 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -24,7 +24,6 @@
 #include <soc/sdram.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 #include <symbols.h>
#include "chip.h"
diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c
index 35e338d..e2e9f7d 100644
--- a/src/soc/rockchip/rk3399/display.c
+++ b/src/soc/rockchip/rk3399/display.c
@@ -23,7 +23,6 @@
 #include <gpio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <string.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/display.h>
diff --git a/src/soc/rockchip/rk3399/sdram.c b/src/soc/rockchip/rk3399/sdram.c
index e01b3a6..0e8cda6 100644
--- a/src/soc/rockchip/rk3399/sdram.c
+++ b/src/soc/rockchip/rk3399/sdram.c
@@ -22,7 +22,6 @@
 #include <soc/sdram.h>
 #include <soc/grf.h>
 #include <soc/soc.h>
-#include <string.h>
 #include <timer.h>
 #include <types.h>
diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c
index 65b791d..707b3e0 100644
--- a/src/soc/rockchip/rk3399/soc.c
+++ b/src/soc/rockchip/rk3399/soc.c
@@ -24,7 +24,6 @@
 #include <soc/symbols.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 #include <symbols.h>
 #include <arm-trusted-firmware/plat/rockchip/rk3399/include/shared/bl31_param.h>
diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c
index e7ceedb..955ed20 100644
--- a/src/soc/samsung/exynos5250/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5250/alternate_cbfs.c
@@ -22,7 +22,6 @@
 #include <soc/power.h>
 #include <soc/spi.h>
 #include <stdlib.h>
-#include <string.h>
 #include <symbols.h>
/* This allows USB A-A firmware upload from a compatible host in four parts:
diff --git a/src/soc/samsung/exynos5250/fb.c b/src/soc/samsung/exynos5250/fb.c
index 40d23b6..64980a1 100644
--- a/src/soc/samsung/exynos5250/fb.c
+++ b/src/soc/samsung/exynos5250/fb.c
@@ -26,7 +26,6 @@
 #include <soc/power.h>
 #include <soc/sysreg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <timer.h>
/*
diff --git a/src/soc/samsung/exynos5250/gpio.c b/src/soc/samsung/exynos5250/gpio.c
index 736f274..96cfef6 100644
--- a/src/soc/samsung/exynos5250/gpio.c
+++ b/src/soc/samsung/exynos5250/gpio.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <soc/cpu.h>
 #include <soc/gpio.h>
-#include <string.h>
#define CON_MASK(x)		(0xf << ((x) << 2))
 #define CON_SFR(x, v)		((v) << ((x) << 2))
diff --git a/src/soc/samsung/exynos5420/alternate_cbfs.c b/src/soc/samsung/exynos5420/alternate_cbfs.c
index 98674ba..178bc1f 100644
--- a/src/soc/samsung/exynos5420/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5420/alternate_cbfs.c
@@ -23,7 +23,6 @@
 #include <soc/power.h>
 #include <soc/spi.h>
 #include <stdlib.h>
-#include <string.h>
 #include <symbols.h>
/* This allows USB A-A firmware upload from a compatible host in four parts:
diff --git a/src/soc/samsung/exynos5420/dp_lowlevel.c b/src/soc/samsung/exynos5420/dp_lowlevel.c
index ebcb122..5381657 100644
--- a/src/soc/samsung/exynos5420/dp_lowlevel.c
+++ b/src/soc/samsung/exynos5420/dp_lowlevel.c
@@ -23,7 +23,6 @@
 #include <soc/power.h>
 #include <soc/sysreg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <timer.h>
/* FIXME: I think the DP controller shouldn't be hardcoded here... */
diff --git a/src/soc/samsung/exynos5420/gpio.c b/src/soc/samsung/exynos5420/gpio.c
index 1df3ae4..1462c29 100644
--- a/src/soc/samsung/exynos5420/gpio.c
+++ b/src/soc/samsung/exynos5420/gpio.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <soc/cpu.h>
 #include <soc/gpio.h>
-#include <string.h>
#define CON_MASK(x)		(0xf << ((x) << 2))
 #define CON_SFR(x, v)		((v) << ((x) << 2))
diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c
index 76c5877..9c546c5 100644
--- a/src/southbridge/amd/agesa/hudson/spi.c
+++ b/src/southbridge/amd/agesa/hudson/spi.c
@@ -14,7 +14,6 @@
  */
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <device/mmio.h>
 #include <console/console.h>
 #include <spi_flash.h>
diff --git a/src/southbridge/amd/amd8111/lpc.c b/src/southbridge/amd/amd8111/lpc.c
index 469c936..29758d1 100644
--- a/src/southbridge/amd/amd8111/lpc.c
+++ b/src/southbridge/amd/amd8111/lpc.c
@@ -29,7 +29,6 @@
 #include <cpu/amd/powernow.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
 #include "amd8111.h"
#define NMI_OFF 0
diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c
index d6eb1e2..ffda0a8 100644
--- a/src/southbridge/amd/cimx/sb800/spi.c
+++ b/src/southbridge/amd/cimx/sb800/spi.c
@@ -14,7 +14,6 @@
  */
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <device/mmio.h>
 #include <console/console.h>
 #include <spi_flash.h>
diff --git a/src/southbridge/amd/common/amd_pci_util.c b/src/southbridge/amd/common/amd_pci_util.c
index 8bb2e0e..103db98 100644
--- a/src/southbridge/amd/common/amd_pci_util.c
+++ b/src/southbridge/amd/common/amd_pci_util.c
@@ -17,7 +17,6 @@
 #include <device/pci.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include "amd_pci_util.h"
 #include <pc80/i8259.h>
 #include "amd_pci_int_defs.h"
diff --git a/src/southbridge/amd/sb700/spi.c b/src/southbridge/amd/sb700/spi.c
index 6b70d9d..ee031e9 100644
--- a/src/southbridge/amd/sb700/spi.c
+++ b/src/southbridge/amd/sb700/spi.c
@@ -16,7 +16,6 @@
#include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <device/mmio.h>
 #include <console/console.h>
 #include <spi-generic.h>
diff --git a/src/southbridge/intel/bd82x6x/early_pch.c b/src/southbridge/intel/bd82x6x/early_pch.c
index b5fbfbb..23942fe 100644
--- a/src/southbridge/intel/bd82x6x/early_pch.c
+++ b/src/southbridge/intel/bd82x6x/early_pch.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
-#include <string.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <arch/cbfs.h>
diff --git a/src/southbridge/intel/bd82x6x/elog.c b/src/southbridge/intel/bd82x6x/elog.c
index ef345ef..e96c38d 100644
--- a/src/southbridge/intel/bd82x6x/elog.c
+++ b/src/southbridge/intel/bd82x6x/elog.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
-#include <string.h>
 #include <elog.h>
 #include <southbridge/intel/common/pmutil.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/common/gpio.c b/src/southbridge/intel/common/gpio.c
index 1186058..0245f4f 100644
--- a/src/southbridge/intel/common/gpio.c
+++ b/src/southbridge/intel/common/gpio.c
@@ -14,7 +14,6 @@
  */
#include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
diff --git a/src/southbridge/intel/fsp_rangeley/gpio.c b/src/southbridge/intel/fsp_rangeley/gpio.c
index 831b169..6db431c 100644
--- a/src/southbridge/intel/fsp_rangeley/gpio.c
+++ b/src/southbridge/intel/fsp_rangeley/gpio.c
@@ -15,7 +15,6 @@
  */
#include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/intel/fsp_rangeley/romstage.c b/src/southbridge/intel/fsp_rangeley/romstage.c
index 2891ca4..14611b3 100644
--- a/src/southbridge/intel/fsp_rangeley/romstage.c
+++ b/src/southbridge/intel/fsp_rangeley/romstage.c
@@ -15,7 +15,6 @@
  */
#include <stdint.h>
-#include <string.h>
 #include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
diff --git a/src/southbridge/intel/fsp_rangeley/spi.c b/src/southbridge/intel/fsp_rangeley/spi.c
index e655767..afd89a7 100644
--- a/src/southbridge/intel/fsp_rangeley/spi.c
+++ b/src/southbridge/intel/fsp_rangeley/spi.c
@@ -14,9 +14,9 @@
  */
/* This file is derived from the flashrom project. */
+
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <commonlib/helpers.h>
 #include <delay.h>
 #include <device/mmio.h>
diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c
index 7c6d3b4..4b7dcf8 100644
--- a/src/southbridge/intel/i82371eb/acpi_tables.c
+++ b/src/southbridge/intel/i82371eb/acpi_tables.c
@@ -16,7 +16,6 @@
  */
#include <console/console.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c
index f7286bc..3676a47 100644
--- a/src/southbridge/intel/ibexpeak/madt.c
+++ b/src/southbridge/intel/ibexpeak/madt.c
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
-#include <string.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/southbridge/intel/ibexpeak/smi.c b/src/southbridge/intel/ibexpeak/smi.c
index 7de8b3b..4c9f2ac 100644
--- a/src/southbridge/intel/ibexpeak/smi.c
+++ b/src/southbridge/intel/ibexpeak/smi.c
@@ -23,7 +23,6 @@
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
-#include <string.h>
 #include <cpu/intel/smm/gen1/smi.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/lynxpoint/elog.c b/src/southbridge/intel/lynxpoint/elog.c
index e16e1be..6f12c70 100644
--- a/src/southbridge/intel/lynxpoint/elog.c
+++ b/src/southbridge/intel/lynxpoint/elog.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
-#include <string.h>
 #include <elog.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/lynxpoint/lp_gpio.c b/src/southbridge/intel/lynxpoint/lp_gpio.c
index 48e0be3..e3d8f02 100644
--- a/src/southbridge/intel/lynxpoint/lp_gpio.c
+++ b/src/southbridge/intel/lynxpoint/lp_gpio.c
@@ -14,7 +14,6 @@
  */
#include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
diff --git a/src/southbridge/intel/lynxpoint/smi.c b/src/southbridge/intel/lynxpoint/smi.c
index 426fb4233..7481765 100644
--- a/src/southbridge/intel/lynxpoint/smi.c
+++ b/src/southbridge/intel/lynxpoint/smi.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
-#include <string.h>
 #include "pch.h"
void southbridge_smm_clear_state(void)
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index d0959fe..33f27e1 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -17,7 +17,6 @@
#include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "pc87360.h"
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 16fc9e5..6d8c66e 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -17,7 +17,6 @@
#include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "pc87366.h"
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index 3a8767f..7c04023 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -16,7 +16,6 @@
#include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
 #include <stdlib.h>
 #include "pc87382.h"
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index a7aee07..cef7ff7 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -16,7 +16,6 @@
#include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
 #include <stdlib.h>
 #include "pc87384.h"
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index feaecfb1..a15d0a2 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -16,7 +16,6 @@
#include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
 #include <stdlib.h>
 #include "pc87392.h"
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index e85251b..f867ff3 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -18,7 +18,6 @@
#include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "pc87417.h"
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index d4d5e5c..c666818 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -16,7 +16,6 @@
#include <device/device.h>
 #include <device/pnp.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "wpcm450.h"
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index dd25ca7..b200855 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -17,7 +17,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/dme1737/superio.c b/src/superio/smsc/dme1737/superio.c
index 719444b..0bfd3b8 100644
--- a/src/superio/smsc/dme1737/superio.c
+++ b/src/superio/smsc/dme1737/superio.c
@@ -20,7 +20,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "dme1737.h"
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index 7fe54ce..e43e791 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -19,7 +19,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "kbc1100.h"
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index c5cfe03..6ac2d6d 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "lpc47b272.h"
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index f0ca914..ad8153f 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -21,7 +21,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "lpc47b397.h"
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index bfa5d33..cd13854 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -22,7 +22,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "lpc47m10x.h"
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 26562c2..80ed456 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -19,7 +19,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "lpc47m15x.h"
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 0a14e4c..b10e8a1 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "lpc47n217.h"
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index 3574c5f..610f685 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -20,7 +20,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 977c084..74b8b2e 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -19,7 +19,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <device/smbus.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "mec1308.h"
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 2a1c5a9..88fbc31 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -21,7 +21,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <console/console.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 4ebd8d1..318eaa4 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -21,7 +21,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <console/console.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index a2ef514..875a4a8 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include "w83627thg.h"
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 3cc4585..82974ba 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -17,7 +17,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index 9a647c0..a3c132c 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -19,7 +19,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <console/console.h>
-#include <string.h>
 #include <lib.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 9f0c0ae..b4f316b 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "w83977tf.h"
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/31966
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iccac4dbaa2dd4144fc347af36ecfc9747da3de20
Gerrit-Change-Number: 31966
Gerrit-PatchSet: 1
Gerrit-Owner: HAOUAS Elyes ehaouas@noos.fr
Gerrit-MessageType: newchange



    

Change in ...coreboot[master]: src: Drop unused 'include <string.h>'