diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index fefc0d305e..d17a20d628 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 6ec8e199f1..6b39faba79 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 7819c0f2db..5f60f1394a 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 2bba084d11..a2d30949b3 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 bd23b7f70c..1389ffb409 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 06dffb1c0c..1370a91a14 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 aef8624127..d21cc293db 100644
--- a/src/commonlib/storage/storage_write.c
+++ b/src/commonlib/storage/storage_write.c
@@ -19,9 +19,10 @@
  * GNU General Public License for more details.
  */
 
+#include <stdlib.h>
+
 #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 0693dedeb8..406d300b21 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 1516a6b2c6..7f05cd15b6 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 26b20dcfd4..b614eedf56 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 e6fb0db6de..6c1309eea4 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 9819caf909..ff9c7de1d3 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 3a641bf07f..550f116567 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 65d87c22ec..54446f7d96 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 5678c5f58d..fe828900fc 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 aa77964f68..25cf243aca 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 e64643aa1e..ee87effc87 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 6068be166d..e47712c020 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 e44302606e..f43db16185 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 fd34229688..f08a058a57 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 e7462088a9..85b0937b9c 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 19a22f1839..740af4237a 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 4e198961ce..26d0c9d206 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 b5e2c9e9e2..5cff4125ae 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 2057df011f..138f194ee2 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 e56b00d774..402e5d1e83 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 b36c3b16bc..035d5c6ef9 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 de3feac20e..2310c9e463 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 d647c0cab1..04edef44aa 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 6e0d5f7fb8..1aff453396 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 3c677109b0..1408dacca6 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 f20678c72d..67760a0d03 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 5399f75395..2a4d78760e 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 0431c2e591..07e23a81f9 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 68a167d4a3..395b79b4be 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 a98054abd0..60c73b147d 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 1ce5993dad..415ae713c9 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 687ce050ed..7e950321b3 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 4b2f55441d..4456567e4d 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 05060d83b0..0244d1c821 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 a5c7ef07da..34d7e89c7b 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 5532c43c02..ced3584fd0 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 220f141177..58134db2d3 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 0cea0ba311..903c48062a 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 5ed46fe9fc..8d106837f9 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 d6e7a841b1..f6f04a1035 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 caba600a3a..6f8aca2446 100644
--- a/src/drivers/net/ne2k.c
+++ b/src/drivers/net/ne2k.c
@@ -35,7 +35,6 @@ SMC8416 PIO support added by Andrew Bettison (andrewb@zip.com.au) on 4/3/02
 #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 831ac7954f..ef1f2f2136 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 db8de68303..4908413fb8 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 489b82ff46..6f2014b155 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 2626ec549a..3109012bd4 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 40bf27dee2..b50ab0a88c 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 8c63d2aa6c..31a7a7f30b 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 795b8a5fe0..745baa2d88 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 39e74d1e47..dc8f49eb54 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 3544b8d69e..3b468114c9 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 002b8244b0..9ff332e964 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 32851ca2d9..faa937b381 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 a50d349a87..c458e5e3b1 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 b6faccfb1e..7f429996fd 100644
--- a/src/mainboard/advansus/a785e-i/acpi_tables.c
+++ b/src/mainboard/advansus/a785e-i/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c
index 837cb138f8..6b5ae68bc6 100644
--- a/src/mainboard/advansus/a785e-i/get_bus_conf.c
+++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/advansus/a785e-i/mptable.c b/src/mainboard/advansus/a785e-i/mptable.c
index 09eadc550f..cc66ce8266 100644
--- a/src/mainboard/advansus/a785e-i/mptable.c
+++ b/src/mainboard/advansus/a785e-i/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/io.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c
index db8d90a4ad..4a817cf844 100644
--- a/src/mainboard/advansus/a785e-i/romstage.c
+++ b/src/mainboard/advansus/a785e-i/romstage.c
@@ -16,7 +16,6 @@
 #define SYSTEM_TYPE 1	/* SERVER=0, DESKTOP=1, MOBILE=2 */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index b0f297cbb4..8c6840476e 100644
--- a/src/mainboard/amd/bettong/acpi_tables.c
+++ b/src/mainboard/amd/bettong/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/bimini_fam10/acpi_tables.c b/src/mainboard/amd/bimini_fam10/acpi_tables.c
index d91188754b..e7659d145f 100644
--- a/src/mainboard/amd/bimini_fam10/acpi_tables.c
+++ b/src/mainboard/amd/bimini_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index df0a564b76..4021c51ff9 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/bimini_fam10/mptable.c b/src/mainboard/amd/bimini_fam10/mptable.c
index e2aec96945..84c4eda9f8 100644
--- a/src/mainboard/amd/bimini_fam10/mptable.c
+++ b/src/mainboard/amd/bimini_fam10/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/io.h>
-#include <string.h>
 #include <stdint.h>
 #include <southbridge/amd/sb800/sb800.h>
 #include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 1f77351aab..7b2f0513a4 100644
--- a/src/mainboard/amd/bimini_fam10/romstage.c
+++ b/src/mainboard/amd/bimini_fam10/romstage.c
@@ -16,7 +16,6 @@
 #define SYSTEM_TYPE 1	/* SERVER = 0, DESKTOP = 1, MOBILE = 2 */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/mptable.c b/src/mainboard/amd/db-ft3b-lc/mptable.c
index aeb814a81b..3aad0e34f4 100644
--- a/src/mainboard/amd/db-ft3b-lc/mptable.c
+++ b/src/mainboard/amd/db-ft3b-lc/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/romstage.c b/src/mainboard/amd/db-ft3b-lc/romstage.c
index 2b37f9b2a6..3e9b1c89ca 100644
--- a/src/mainboard/amd/db-ft3b-lc/romstage.c
+++ b/src/mainboard/amd/db-ft3b-lc/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
diff --git a/src/mainboard/amd/gardenia/BiosCallOuts.c b/src/mainboard/amd/gardenia/BiosCallOuts.c
index 522a63fef1..d4fb55aac0 100644
--- a/src/mainboard/amd/gardenia/BiosCallOuts.c
+++ b/src/mainboard/amd/gardenia/BiosCallOuts.c
@@ -17,7 +17,6 @@
 #include <amdblocks/BiosCallOuts.h>
 #include <soc/southbridge.h>
 #include <stdlib.h>
-#include <string.h>
 
 void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env)
 {
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c
index 1bbd390fed..8b0c2c9690 100644
--- a/src/mainboard/amd/lamar/acpi_tables.c
+++ b/src/mainboard/amd/lamar/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/lamar/mptable.c b/src/mainboard/amd/lamar/mptable.c
index 5b9170bf71..d89e02fbef 100644
--- a/src/mainboard/amd/lamar/mptable.c
+++ b/src/mainboard/amd/lamar/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/lamar/romstage.c b/src/mainboard/amd/lamar/romstage.c
index bf5c9deeda..3f7d33f11b 100644
--- a/src/mainboard/amd/lamar/romstage.c
+++ b/src/mainboard/amd/lamar/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index c907d68a59..6cdf89ac26 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index bffe1a24f2..090fd54331 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -16,11 +16,9 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
-
 extern u32 apicid_sb700;
 
 
diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index 9140eade9d..c73eb0d388 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/olivehill/romstage.c b/src/mainboard/amd/olivehill/romstage.c
index 7883a7f792..9a28f98b33 100644
--- a/src/mainboard/amd/olivehill/romstage.c
+++ b/src/mainboard/amd/olivehill/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/amd/olivehillplus/acpi_tables.c
+++ b/src/mainboard/amd/olivehillplus/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c
index 4bb35fb3c0..0181747c22 100644
--- a/src/mainboard/amd/olivehillplus/romstage.c
+++ b/src/mainboard/amd/olivehillplus/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index 3ff68e3e41..eba2d1da8b 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 8fda6662db..d9f550ea42 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -16,7 +16,6 @@
 
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
index 33a81c6327..e1f2409504 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/multicore.h>
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
index 61aa9067fc..d65b82abf2 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #if CONFIG(LOGICAL_CPUS)
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index 427a3ef398..a525154eb3 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -16,7 +16,6 @@
 #define SYSTEM_TYPE 0	/* SERVER */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index 3ff68e3e41..eba2d1da8b 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index cf8469b519..65ed138c8d 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/amd/tilapia_fam10/acpi_tables.c b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi_tables.c
+++ b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
index 6bdf94a39d..37a3774e46 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/tilapia_fam10/mptable.c b/src/mainboard/amd/tilapia_fam10/mptable.c
index bffe1a24f2..090fd54331 100644
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -16,11 +16,9 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
-
 extern u32 apicid_sb700;
 
 
diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index 0a49d2cd1f..a45d8f6510 100644
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -16,7 +16,6 @@
 #define SYSTEM_TYPE 1	/* DESKTOP */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c
index a68592a130..7d7d86cc95 100644
--- a/src/mainboard/amd/torpedo/acpi_tables.c
+++ b/src/mainboard/amd/torpedo/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/union_station/OemCustomize.c b/src/mainboard/amd/union_station/OemCustomize.c
index 8a629011ba..866be54d37 100644
--- a/src/mainboard/amd/union_station/OemCustomize.c
+++ b/src/mainboard/amd/union_station/OemCustomize.c
@@ -15,8 +15,6 @@
 
 #include <AGESA.h>
 #include <PlatformMemoryConfiguration.h>
-
-#include <string.h>
 #include <northbridge/amd/agesa/state_machine.h>
 
 static const PCIe_PORT_DESCRIPTOR PortList[] = {
diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c
index 29814030ad..039e4ecc6a 100644
--- a/src/mainboard/aopen/dxplplusu/acpi_tables.c
+++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c
@@ -18,7 +18,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <device/pci.h>
 #include <assert.h>
diff --git a/src/mainboard/apple/macbook21/mptable.c b/src/mainboard/apple/macbook21/mptable.c
index f508eaf34e..cbd30c726e 100644
--- a/src/mainboard/apple/macbook21/mptable.c
+++ b/src/mainboard/apple/macbook21/mptable.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/apple/macbook21/romstage.c b/src/mainboard/apple/macbook21/romstage.c
index 63042f60b0..479ab5956b 100644
--- a/src/mainboard/apple/macbook21/romstage.c
+++ b/src/mainboard/apple/macbook21/romstage.c
@@ -18,7 +18,6 @@
 /* __PRE_RAM__ means: use "unsigned" for device, not a struct. */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index bc9c1542bc..787c432041 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.c
@@ -16,7 +16,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/asrock/imb-a180/romstage.c b/src/mainboard/asrock/imb-a180/romstage.c
index 1aa8aa18b9..ce5e0643a5 100644
--- a/src/mainboard/asrock/imb-a180/romstage.c
+++ b/src/mainboard/asrock/imb-a180/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/asus/am1i-a/acpi_tables.c b/src/mainboard/asus/am1i-a/acpi_tables.c
index 12a20ea520..411ebe7436 100644
--- a/src/mainboard/asus/am1i-a/acpi_tables.c
+++ b/src/mainboard/asus/am1i-a/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/asus/am1i-a/mptable.c b/src/mainboard/asus/am1i-a/mptable.c
index 448a89e5cd..d97e6ac7f0 100644
--- a/src/mainboard/asus/am1i-a/mptable.c
+++ b/src/mainboard/asus/am1i-a/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index 7338eee5bb..eba2d1da8b 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.c
@@ -16,7 +16,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/asus/f2a85-m/romstage.c b/src/mainboard/asus/f2a85-m/romstage.c
index dffb726dc6..2727904641 100644
--- a/src/mainboard/asus/f2a85-m/romstage.c
+++ b/src/mainboard/asus/f2a85-m/romstage.c
@@ -23,7 +23,6 @@
 #include <southbridge/amd/agesa/hudson/hudson.h>
 #include <southbridge/amd/agesa/hudson/smbus.h>
 #include <stdint.h>
-#include <string.h>
 
 #include <superio/ite/common/ite.h>
 #include <superio/ite/it8728f/it8728f.h>
diff --git a/src/mainboard/asus/kcma-d8/acpi_tables.c b/src/mainboard/asus/kcma-d8/acpi_tables.c
index d705b213a2..53622bae0c 100644
--- a/src/mainboard/asus/kcma-d8/acpi_tables.c
+++ b/src/mainboard/asus/kcma-d8/acpi_tables.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index be7b3001ea..cc64dea2d3 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -15,11 +15,9 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
-
 #include <cpu/amd/amdfam10_sysconf.h>
 
 void get_bus_conf(void)
diff --git a/src/mainboard/asus/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index c9b83a0070..65be183ce9 100644
--- a/src/mainboard/asus/kcma-d8/mptable.c
+++ b/src/mainboard/asus/kcma-d8/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c
index a74c6dd45c..5d43a54272 100644
--- a/src/mainboard/asus/kcma-d8/romstage.c
+++ b/src/mainboard/asus/kcma-d8/romstage.c
@@ -18,7 +18,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/asus/kfsn4-dre/acpi_tables.c b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
index 587e2ff852..615f8b33e9 100644
--- a/src/mainboard/asus/kfsn4-dre/acpi_tables.c
+++ b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
@@ -20,7 +20,6 @@
  * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering
  */
 
-#include <string.h>
 #include <assert.h>
 #include <arch/acpi.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index bb51ada9e0..dd7ebc962c 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/kfsn4-dre/mptable.c b/src/mainboard/asus/kfsn4-dre/mptable.c
index ad3f742373..10a379844d 100644
--- a/src/mainboard/asus/kfsn4-dre/mptable.c
+++ b/src/mainboard/asus/kfsn4-dre/mptable.c
@@ -25,7 +25,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c
index 6ac33f2ccd..dbf704b288 100644
--- a/src/mainboard/asus/kfsn4-dre/romstage.c
+++ b/src/mainboard/asus/kfsn4-dre/romstage.c
@@ -18,7 +18,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pnp_ops.h>
diff --git a/src/mainboard/asus/kgpe-d16/acpi_tables.c b/src/mainboard/asus/kgpe-d16/acpi_tables.c
index d705b213a2..53622bae0c 100644
--- a/src/mainboard/asus/kgpe-d16/acpi_tables.c
+++ b/src/mainboard/asus/kgpe-d16/acpi_tables.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
index 926472068f..81d0fc1b63 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -15,14 +15,11 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
-
 #include <cpu/amd/amdfam10_sysconf.h>
 
-
 void get_bus_conf(void)
 {
 	get_default_pci1234(1);
diff --git a/src/mainboard/asus/kgpe-d16/mptable.c b/src/mainboard/asus/kgpe-d16/mptable.c
index ed01b548db..6d7174da38 100644
--- a/src/mainboard/asus/kgpe-d16/mptable.c
+++ b/src/mainboard/asus/kgpe-d16/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index 7fe9b640ad..f7d30bda98 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -18,7 +18,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/mmio.h>
diff --git a/src/mainboard/asus/m4a78-em/acpi_tables.c b/src/mainboard/asus/m4a78-em/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/asus/m4a78-em/acpi_tables.c
+++ b/src/mainboard/asus/m4a78-em/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c
index bffe1a24f2..876e7ee578 100644
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index 0e0e5af761..c99179e48e 100644
--- a/src/mainboard/asus/m4a78-em/romstage.c
+++ b/src/mainboard/asus/m4a78-em/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/asus/m4a785-m/acpi_tables.c b/src/mainboard/asus/m4a785-m/acpi_tables.c
index ec04eff06b..1170ed7a49 100644
--- a/src/mainboard/asus/m4a785-m/acpi_tables.c
+++ b/src/mainboard/asus/m4a785-m/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <console/console.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c
index bffe1a24f2..b04a315bb1 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -16,14 +16,11 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
-
 extern u32 apicid_sb700;
 
-
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 8b5a56f9a6..1d5921440d 100644
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/asus/m5a88-v/acpi_tables.c b/src/mainboard/asus/m5a88-v/acpi_tables.c
index b6faccfb1e..7f429996fd 100644
--- a/src/mainboard/asus/m5a88-v/acpi_tables.c
+++ b/src/mainboard/asus/m5a88-v/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index 837cb138f8..6b5ae68bc6 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/asus/m5a88-v/mptable.c b/src/mainboard/asus/m5a88-v/mptable.c
index a5e79e3529..b4cd7e8589 100644
--- a/src/mainboard/asus/m5a88-v/mptable.c
+++ b/src/mainboard/asus/m5a88-v/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/io.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c
index 4ef603ecc2..9216ecb910 100644
--- a/src/mainboard/asus/m5a88-v/romstage.c
+++ b/src/mainboard/asus/m5a88-v/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <arch/cpu.h>
diff --git a/src/mainboard/asus/p2b-d/mptable.c b/src/mainboard/asus/p2b-d/mptable.c
index dac4e8cb17..fde12814ab 100644
--- a/src/mainboard/asus/p2b-d/mptable.c
+++ b/src/mainboard/asus/p2b-d/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/asus/p2b-ds/mptable.c b/src/mainboard/asus/p2b-ds/mptable.c
index 8c84099168..4e085b1327 100644
--- a/src/mainboard/asus/p2b-ds/mptable.c
+++ b/src/mainboard/asus/p2b-ds/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/asus/p5gc-mx/romstage.c b/src/mainboard/asus/p5gc-mx/romstage.c
index 26898cc669..ffb3bf9ea7 100644
--- a/src/mainboard/asus/p5gc-mx/romstage.c
+++ b/src/mainboard/asus/p5gc-mx/romstage.c
@@ -18,7 +18,6 @@
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/avalue/eax-785e/acpi_tables.c b/src/mainboard/avalue/eax-785e/acpi_tables.c
index b6faccfb1e..7f429996fd 100644
--- a/src/mainboard/avalue/eax-785e/acpi_tables.c
+++ b/src/mainboard/avalue/eax-785e/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/avalue/eax-785e/get_bus_conf.c b/src/mainboard/avalue/eax-785e/get_bus_conf.c
index 837cb138f8..6b5ae68bc6 100644
--- a/src/mainboard/avalue/eax-785e/get_bus_conf.c
+++ b/src/mainboard/avalue/eax-785e/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/avalue/eax-785e/mptable.c b/src/mainboard/avalue/eax-785e/mptable.c
index 4cc20fc47f..81763f99c7 100644
--- a/src/mainboard/avalue/eax-785e/mptable.c
+++ b/src/mainboard/avalue/eax-785e/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/io.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c
index 6b91381853..934791926c 100644
--- a/src/mainboard/avalue/eax-785e/romstage.c
+++ b/src/mainboard/avalue/eax-785e/romstage.c
@@ -16,7 +16,6 @@
 #define SYSTEM_TYPE 1	/* SERVER=0, DESKTOP=1, MOBILE=2 */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <arch/cpu.h>
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/bap/ode_e20XX/mptable.c b/src/mainboard/bap/ode_e20XX/mptable.c
index d0704f370d..ea9f95947d 100644
--- a/src/mainboard/bap/ode_e20XX/mptable.c
+++ b/src/mainboard/bap/ode_e20XX/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/bap/ode_e21XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/bap/ode_e21XX/romstage.c b/src/mainboard/bap/ode_e21XX/romstage.c
index af8fd2a70b..10b7aabe83 100644
--- a/src/mainboard/bap/ode_e21XX/romstage.c
+++ b/src/mainboard/bap/ode_e21XX/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
diff --git a/src/mainboard/biostar/a68n_5200/acpi_tables.c b/src/mainboard/biostar/a68n_5200/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/biostar/a68n_5200/acpi_tables.c
+++ b/src/mainboard/biostar/a68n_5200/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/biostar/a68n_5200/romstage.c b/src/mainboard/biostar/a68n_5200/romstage.c
index 31a0dd767f..ddcf4d0f78 100644
--- a/src/mainboard/biostar/a68n_5200/romstage.c
+++ b/src/mainboard/biostar/a68n_5200/romstage.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index 12a20ea520..411ebe7436 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/biostar/am1ml/mptable.c b/src/mainboard/biostar/am1ml/mptable.c
index cb1274ed91..4d93361cba 100644
--- a/src/mainboard/biostar/am1ml/mptable.c
+++ b/src/mainboard/biostar/am1ml/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/cavium/cn8100_sff_evb/romstage.c b/src/mainboard/cavium/cn8100_sff_evb/romstage.c
index 7bb53e3de3..b60b9cdc84 100644
--- a/src/mainboard/cavium/cn8100_sff_evb/romstage.c
+++ b/src/mainboard/cavium/cn8100_sff_evb/romstage.c
@@ -20,7 +20,6 @@
 #include <soc/mmu.h>
 #include <stdlib.h>
 #include <libbdk-hal/bdk-config.h>
-#include <string.h>
 
 extern const struct bdk_devicetree_key_value devtree[];
 
diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/elmex/pcm205400/acpi_tables.c
+++ b/src/mainboard/elmex/pcm205400/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/elmex/pcm205400/mptable.c b/src/mainboard/elmex/pcm205400/mptable.c
index 8fda6662db..d9f550ea42 100644
--- a/src/mainboard/elmex/pcm205400/mptable.c
+++ b/src/mainboard/elmex/pcm205400/mptable.c
@@ -16,7 +16,6 @@
 
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
index 08b9bf2213..cc14dd8e7b 100644
--- a/src/mainboard/emulation/qemu-armv7/mainboard.c
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <cbmem.h>
-#include <string.h>
 #include <halt.h>
 #include "mainboard.h"
 #include <edid.h>
diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index edb66fc036..fe95a3106c 100644
--- a/src/mainboard/esd/atom15/acpi_tables.c
+++ b/src/mainboard/esd/atom15/acpi_tables.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/getac/p470/mptable.c b/src/mainboard/getac/p470/mptable.c
index c00102d03b..86006e1363 100644
--- a/src/mainboard/getac/p470/mptable.c
+++ b/src/mainboard/getac/p470/mptable.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index 3bc4aa681a..423b4e869b 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index b3ee2a8e79..b2d4bb45aa 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
@@ -17,7 +17,6 @@
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gigabyte/ma785gm/acpi_tables.c b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/gigabyte/ma785gm/mptable.c b/src/mainboard/gigabyte/ma785gm/mptable.c
index bffe1a24f2..b04a315bb1 100644
--- a/src/mainboard/gigabyte/ma785gm/mptable.c
+++ b/src/mainboard/gigabyte/ma785gm/mptable.c
@@ -16,14 +16,11 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
-
 extern u32 apicid_sb700;
 
-
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index f197ba9105..4ca318a4d8 100644
--- a/src/mainboard/gigabyte/ma785gm/romstage.c
+++ b/src/mainboard/gigabyte/ma785gm/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
index 241e187283..5c53476a11 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
@@ -14,11 +14,9 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
-
 #include <cpu/amd/amdfam10_sysconf.h>
 
 /* Global variables for MB layouts and these will be shared by irqtable mptable
@@ -26,7 +24,6 @@
 */
 u32 apicid_sb700;
 
-
 void get_bus_conf(void)
 {
 	u32 apicid_base;
diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index bffe1a24f2..876e7ee578 100644
--- a/src/mainboard/gigabyte/ma785gmt/mptable.c
+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index 1a0a0119be..746be76642 100644
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gigabyte/ma78gm/acpi_tables.c b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
index 0cdcdb791c..967343da67 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c
index bffe1a24f2..876e7ee578 100644
--- a/src/mainboard/gigabyte/ma78gm/mptable.c
+++ b/src/mainboard/gigabyte/ma78gm/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index aa80a27398..4d23bac7b8 100644
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index 39d9096bf5..2154cd842f 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/mptable.c b/src/mainboard/gizmosphere/gizmo2/mptable.c
index d0704f370d..ea9f95947d 100644
--- a/src/mainboard/gizmosphere/gizmo2/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo2/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c
index 3355136a29..c27ad9e164 100644
--- a/src/mainboard/google/auron/chromeos.c
+++ b/src/mainboard/google/auron/chromeos.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <soc/gpio.h>
 
diff --git a/src/mainboard/google/auron/variants/auron_paine/pei_data.c b/src/mainboard/google/auron/variants/auron_paine/pei_data.c
index a5b2384d4c..96dbe660e0 100644
--- a/src/mainboard/google/auron/variants/auron_paine/pei_data.c
+++ b/src/mainboard/google/auron/variants/auron_paine/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/auron_yuna/pei_data.c b/src/mainboard/google/auron/variants/auron_yuna/pei_data.c
index a5b2384d4c..96dbe660e0 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/pei_data.c
+++ b/src/mainboard/google/auron/variants/auron_yuna/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/buddy/pei_data.c b/src/mainboard/google/auron/variants/buddy/pei_data.c
index 159d5f6d1e..f3463727eb 100644
--- a/src/mainboard/google/auron/variants/buddy/pei_data.c
+++ b/src/mainboard/google/auron/variants/buddy/pei_data.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/buddy/variant.c b/src/mainboard/google/auron/variants/buddy/variant.c
index 5afb26c5e6..9f8188fe43 100644
--- a/src/mainboard/google/auron/variants/buddy/variant.c
+++ b/src/mainboard/google/auron/variants/buddy/variant.c
@@ -14,7 +14,6 @@
 #include <cbfs.h>
 #include <fmap.h>
 #include <types.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
diff --git a/src/mainboard/google/auron/variants/gandof/pei_data.c b/src/mainboard/google/auron/variants/gandof/pei_data.c
index ef2e3362c4..a86fb0e9b3 100644
--- a/src/mainboard/google/auron/variants/gandof/pei_data.c
+++ b/src/mainboard/google/auron/variants/gandof/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/auron/variants/lulu/pei_data.c b/src/mainboard/google/auron/variants/lulu/pei_data.c
index be7626c4d7..e5976bcebf 100644
--- a/src/mainboard/google/auron/variants/lulu/pei_data.c
+++ b/src/mainboard/google/auron/variants/lulu/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 7356030394..2b2acbad61 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <types.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 8e8764e048..c6b0db2821 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <device/pci_ops.h>
 #include <bootmode.h>
 #include <device/device.h>
diff --git a/src/mainboard/google/beltino/lan.c b/src/mainboard/google/beltino/lan.c
index 7286437d46..090f280a83 100644
--- a/src/mainboard/google/beltino/lan.c
+++ b/src/mainboard/google/beltino/lan.c
@@ -14,7 +14,6 @@
  */
 
 #include <cbfs.h>
-#include <string.h>
 #include <types.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index 9466418f04..e0fd105eb1 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <smbios.h>
-#include <string.h>
 #include <types.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
diff --git a/src/mainboard/google/beltino/romstage.c b/src/mainboard/google/beltino/romstage.c
index 614a22ec81..70a8c1928a 100644
--- a/src/mainboard/google/beltino/romstage.c
+++ b/src/mainboard/google/beltino/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <cpu/intel/romstage.h>
 #include <cpu/intel/haswell/haswell.h>
 #include <northbridge/intel/haswell/haswell.h>
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 6b6927729b..9cc13c9473 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <cbfs.h>
 #include <device/device.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index 6dfbfcb8a0..d34b1e4574 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 4b148f8380..44101e347c 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -17,7 +17,6 @@
 #include <device/mmio.h>
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 /* The WP status pin lives on MF_ISH_GPIO_4 */
diff --git a/src/mainboard/google/dragonegg/romstage_fsp_params.c b/src/mainboard/google/dragonegg/romstage_fsp_params.c
index fd797ae937..e866c620d9 100644
--- a/src/mainboard/google/dragonegg/romstage_fsp_params.c
+++ b/src/mainboard/google/dragonegg/romstage_fsp_params.c
@@ -17,7 +17,6 @@
 #include <baseboard/variants.h>
 #include <console/console.h>
 #include <soc/romstage.h>
-#include <string.h>
 
 void mainboard_memory_init_params(FSPM_UPD *mupd)
 {
diff --git a/src/mainboard/google/gale/chromeos.c b/src/mainboard/google/gale/chromeos.c
index 939b061b6e..09fdc2fa60 100644
--- a/src/mainboard/google/gale/chromeos.c
+++ b/src/mainboard/google/gale/chromeos.c
@@ -21,7 +21,6 @@
 #include <gpio.h>
 #include <soc/cdp.h>
 #include <soc/blsp.h>
-#include <string.h>
 #include <timer.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index 490ec002ef..f826b55ea8 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -16,9 +16,7 @@
 
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-
 #include <variant/gpio.h>
 
 #if ENV_RAMSTAGE
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index c78a219f3c..879ff93d97 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index 6008ba70e3..05c8a3e298 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/google/jecht/lan.c b/src/mainboard/google/jecht/lan.c
index 8a8b223624..f733bca112 100644
--- a/src/mainboard/google/jecht/lan.c
+++ b/src/mainboard/google/jecht/lan.c
@@ -16,7 +16,6 @@
 #include <cbfs.h>
 #include <fmap.h>
 #include <types.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
diff --git a/src/mainboard/google/jecht/variants/guado/pei_data.c b/src/mainboard/google/jecht/variants/guado/pei_data.c
index 1b5ea51532..87ca1dc0c6 100644
--- a/src/mainboard/google/jecht/variants/guado/pei_data.c
+++ b/src/mainboard/google/jecht/variants/guado/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/jecht/pei_data.c b/src/mainboard/google/jecht/variants/jecht/pei_data.c
index 1b5ea51532..87ca1dc0c6 100644
--- a/src/mainboard/google/jecht/variants/jecht/pei_data.c
+++ b/src/mainboard/google/jecht/variants/jecht/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/rikku/pei_data.c b/src/mainboard/google/jecht/variants/rikku/pei_data.c
index 4eeabbeec4..14f96767fd 100644
--- a/src/mainboard/google/jecht/variants/rikku/pei_data.c
+++ b/src/mainboard/google/jecht/variants/rikku/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/jecht/variants/tidus/pei_data.c b/src/mainboard/google/jecht/variants/tidus/pei_data.c
index 7c03422553..b7974ea774 100644
--- a/src/mainboard/google/jecht/variants/tidus/pei_data.c
+++ b/src/mainboard/google/jecht/variants/tidus/pei_data.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 04b03bad0a..410866d0fe 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index 4fb8e78cab..be1b98d3ce 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -16,7 +16,6 @@
 #include <boot/coreboot_tables.h>
 #include <bootmode.h>
 #include <gpio.h>
-#include <string.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index f466d914ad..945a0e743c 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -16,7 +16,6 @@
 #include <boot/coreboot_tables.h>
 #include <bootmode.h>
 #include <gpio.h>
-#include <string.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index f466d914ad..945a0e743c 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -16,7 +16,6 @@
 #include <boot/coreboot_tables.h>
 #include <bootmode.h>
 #include <gpio.h>
-#include <string.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/oak/chromeos.c b/src/mainboard/google/oak/chromeos.c
index 93791fb37f..b5d70238a1 100644
--- a/src/mainboard/google/oak/chromeos.c
+++ b/src/mainboard/google/oak/chromeos.c
@@ -17,7 +17,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <string.h>
 
 #include "gpio.h"
 
diff --git a/src/mainboard/google/octopus/romstage.c b/src/mainboard/google/octopus/romstage.c
index c5bd9963ae..9d8b94d0b9 100644
--- a/src/mainboard/google/octopus/romstage.c
+++ b/src/mainboard/google/octopus/romstage.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <string.h>
+
 #include <baseboard/variants.h>
 #include <boardid.h>
 #include <console/console.h>
diff --git a/src/mainboard/google/octopus/variants/phaser/variant.c b/src/mainboard/google/octopus/variants/phaser/variant.c
index eb080f025f..aeefda54bc 100644
--- a/src/mainboard/google/octopus/variants/phaser/variant.c
+++ b/src/mainboard/google/octopus/variants/phaser/variant.c
@@ -15,7 +15,6 @@
 
 #include <baseboard/variants.h>
 #include <soc/pci_devs.h>
-#include <string.h>
 #include <ec/google/chromeec/ec.h>
 
 #define SKU_UNKNOWN     0xFFFFFFFF
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 77b7d5ea90..93d77daf03 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 2936fa2021..52e4af3ea7 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index da6b50d76f..76a4b4b677 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 3837a52bb7..8e6db19a4d 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c
index 99a97d8bf4..d47a323a4f 100644
--- a/src/mainboard/google/rambi/chromeos.c
+++ b/src/mainboard/google/rambi/chromeos.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <bootmode.h>
 #include <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index 59eeefb27e..15faac9bf8 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/google/rambi/romstage.c b/src/mainboard/google/rambi/romstage.c
index 005ddc3bd4..5322267af9 100644
--- a/src/mainboard/google/rambi/romstage.c
+++ b/src/mainboard/google/rambi/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <cbfs.h>
 #include <console/console.h>
 #include <soc/gpio.h>
diff --git a/src/mainboard/google/rambi/variants/ninja/lan.c b/src/mainboard/google/rambi/variants/ninja/lan.c
index 93ecc3ab5e..edf2a62bad 100644
--- a/src/mainboard/google/rambi/variants/ninja/lan.c
+++ b/src/mainboard/google/rambi/variants/ninja/lan.c
@@ -14,7 +14,6 @@
  */
 
 #include <cbfs.h>
-#include <string.h>
 #include <types.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/google/rambi/variants/sumo/lan.c b/src/mainboard/google/rambi/variants/sumo/lan.c
index 9a3c1301c8..9ed2b04967 100644
--- a/src/mainboard/google/rambi/variants/sumo/lan.c
+++ b/src/mainboard/google/rambi/variants/sumo/lan.c
@@ -14,7 +14,6 @@
  */
 
 #include <cbfs.h>
-#include <string.h>
 #include <types.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index bf5e2947a9..0b303ae6dd 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -14,16 +14,15 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <ec/google/chromeec/ec.h>
-
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
+
 #include "thermal.h"
 
 static void acpi_update_thermal_table(global_nvs_t *gnvs)
diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index e26c3fb005..6cae38d442 100644
--- a/src/mainboard/google/slippy/chromeos.c
+++ b/src/mainboard/google/slippy/chromeos.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <bootmode.h>
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <southbridge/intel/common/gpio.h>
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index e44abcd917..4bbc1d6907 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <smbios.h>
 #include <device/device.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index fe8e5aa95d..86e8cb2edb 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -15,7 +15,6 @@
 
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
-#include <string.h>
 
 #include "gpio.h"
 
diff --git a/src/mainboard/google/storm/chromeos.c b/src/mainboard/google/storm/chromeos.c
index 3110228ef2..b829457890 100644
--- a/src/mainboard/google/storm/chromeos.c
+++ b/src/mainboard/google/storm/chromeos.c
@@ -21,7 +21,6 @@
 #include <gpio.h>
 #include <soc/cdp.h>
 #include <soc/gsbi.h>
-#include <string.h>
 #include <timer.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 681aa55f85..46aadaf75b 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 2024abf34c..5f51a6b8bc 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index d76e9c184c..7539dd7f51 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron/chromeos.c
index 8547cdb216..ac14e37886 100644
--- a/src/mainboard/google/veyron/chromeos.c
+++ b/src/mainboard/google/veyron/chromeos.c
@@ -17,7 +17,6 @@
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
 #include <gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 #include "board.h"
diff --git a/src/mainboard/google/veyron/sdram_configs.c b/src/mainboard/google/veyron/sdram_configs.c
index 8cc16b3147..291bc33fe9 100644
--- a/src/mainboard/google/veyron/sdram_configs.c
+++ b/src/mainboard/google/veyron/sdram_configs.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <gpio.h>
 #include <soc/sdram.h>
-#include <string.h>
 #include <types.h>
 
 static struct rk3288_sdram_params sdram_configs[] = {
diff --git a/src/mainboard/google/veyron_mickey/chromeos.c b/src/mainboard/google/veyron_mickey/chromeos.c
index 92d5f9aa48..c775e48133 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.c
+++ b/src/mainboard/google/veyron_mickey/chromeos.c
@@ -15,7 +15,6 @@
 
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 #include "board.h"
diff --git a/src/mainboard/google/veyron_mickey/sdram_configs.c b/src/mainboard/google/veyron_mickey/sdram_configs.c
index 8cc16b3147..291bc33fe9 100644
--- a/src/mainboard/google/veyron_mickey/sdram_configs.c
+++ b/src/mainboard/google/veyron_mickey/sdram_configs.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <gpio.h>
 #include <soc/sdram.h>
-#include <string.h>
 #include <types.h>
 
 static struct rk3288_sdram_params sdram_configs[] = {
diff --git a/src/mainboard/google/veyron_rialto/chromeos.c b/src/mainboard/google/veyron_rialto/chromeos.c
index d527ede5e9..a0ac77edbc 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.c
+++ b/src/mainboard/google/veyron_rialto/chromeos.c
@@ -15,7 +15,6 @@
 
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 #include "board.h"
diff --git a/src/mainboard/google/veyron_rialto/sdram_configs.c b/src/mainboard/google/veyron_rialto/sdram_configs.c
index 590b051ff8..8eae71dcbd 100644
--- a/src/mainboard/google/veyron_rialto/sdram_configs.c
+++ b/src/mainboard/google/veyron_rialto/sdram_configs.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <gpio.h>
 #include <soc/sdram.h>
-#include <string.h>
 #include <types.h>
 
 static struct rk3288_sdram_params sdram_configs[] = {
diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/mptable.c b/src/mainboard/hp/dl165_g6_fam10/mptable.c
index f204632078..6bf83cf928 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mptable.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mptable.c
@@ -28,7 +28,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #if CONFIG(LOGICAL_CPUS)
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 66c480ebad..c02b0e624e 100644
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -22,7 +22,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index a840fe8545..eba2d1da8b 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -13,11 +13,9 @@
  * GNU General Public License for more details.
  */
 
-
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/ibase/mb899/mptable.c b/src/mainboard/ibase/mb899/mptable.c
index 89fba6bd96..14f93eca51 100644
--- a/src/mainboard/ibase/mb899/mptable.c
+++ b/src/mainboard/ibase/mb899/mptable.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
index c907d68a59..6cdf89ac26 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
index 30c1026c16..237ef2a2bd 100644
--- a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
+++ b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
@@ -14,11 +14,9 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
-
 #include <cpu/amd/amdfam10_sysconf.h>
 
 /* Global variables for MB layouts and these will be shared by irqtable mptable
diff --git a/src/mainboard/iei/kino-780am2-fam10/mptable.c b/src/mainboard/iei/kino-780am2-fam10/mptable.c
index bffe1a24f2..b04a315bb1 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mptable.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mptable.c
@@ -16,14 +16,11 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
-
 extern u32 apicid_sb700;
 
-
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index 1c41df4c70..421e613072 100644
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index 081733c6c4..497b10b3ee 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -14,15 +14,14 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
-
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
+
 #include "thermal.h"
 
 static void acpi_update_thermal_table(global_nvs_t *gnvs)
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index 8c8ae40df2..49e66bff80 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 2903a5c5e0..d81798c6b0 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/mainboard.c b/src/mainboard/intel/bayleybay_fsp/mainboard.c
index 328087847a..16c1844ce5 100644
--- a/src/mainboard/intel/bayleybay_fsp/mainboard.c
+++ b/src/mainboard/intel/bayleybay_fsp/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
index 88cfb1d26f..ee9f36ed31 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
+++ b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c b/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c
index 457be7f2c7..2396505906 100644
--- a/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c
+++ b/src/mainboard/intel/cannonlake_rvp/romstage_fsp_params.c
@@ -19,7 +19,6 @@
 #include <fsp/api.h>
 #include <soc/romstage.h>
 #include "spd/spd.h"
-#include <string.h>
 #include <spd_bin.h>
 
 void mainboard_memory_init_params(FSPM_UPD *mupd)
diff --git a/src/mainboard/intel/d945gclf/mptable.c b/src/mainboard/intel/d945gclf/mptable.c
index d9aa098afd..c58cbf5999 100644
--- a/src/mainboard/intel/d945gclf/mptable.c
+++ b/src/mainboard/intel/d945gclf/mptable.c
@@ -17,7 +17,6 @@
 #include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 666d48d7b1..74edc385c1 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index c57bd6f6ef..d07da832ca 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index 1259fe8a04..9a9fc24677 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index e126bd8e83..43818eebe4 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -16,7 +16,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/intel/harcuvar/fadt.c b/src/mainboard/intel/harcuvar/fadt.c
index d6c701a968..d26987187b 100644
--- a/src/mainboard/intel/harcuvar/fadt.c
+++ b/src/mainboard/intel/harcuvar/fadt.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 
 #include <soc/acpi.h>
diff --git a/src/mainboard/intel/harcuvar/romstage.c b/src/mainboard/intel/harcuvar/romstage.c
index 44fdc4f467..53ecdec0da 100644
--- a/src/mainboard/intel/harcuvar/romstage.c
+++ b/src/mainboard/intel/harcuvar/romstage.c
@@ -20,7 +20,6 @@
 #include <console/console.h>
 #include <fsp/api.h>
 #include <fsp/soc_binding.h>
-#include <string.h>
 
 #if CONFIG(ENABLE_FSP_MEMORY_DOWN)
 
diff --git a/src/mainboard/intel/harcuvar/spd/spd.c b/src/mainboard/intel/harcuvar/spd/spd.c
index 37f4424684..914e4fd14c 100644
--- a/src/mainboard/intel/harcuvar/spd/spd.c
+++ b/src/mainboard/intel/harcuvar/spd/spd.c
@@ -18,7 +18,6 @@
 #include <arch/byteorder.h>
 #include <cbfs.h>
 #include <console/console.h>
-#include <string.h>
 
 #include "spd.h"
 
diff --git a/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c b/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
index 2d23fa3c68..dd33021ae5 100644
--- a/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
+++ b/src/mainboard/intel/icelake_rvp/romstage_fsp_params.c
@@ -18,7 +18,6 @@
 #include <fsp/api.h>
 #include <soc/romstage.h>
 #include "spd/spd.h"
-#include <string.h>
 #include <spd_bin.h>
 
 void mainboard_memory_init_params(FSPM_UPD *mupd)
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index 101b04be74..51680742ad 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <string.h>
 #include <ec/google/chromeec/ec.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/intel/kblrvp/mainboard.c b/src/mainboard/intel/kblrvp/mainboard.c
index 604c069d77..78c7ae45fb 100644
--- a/src/mainboard/intel/kblrvp/mainboard.c
+++ b/src/mainboard/intel/kblrvp/mainboard.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <gpio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <soc/nhlt.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include "ec.h"
diff --git a/src/mainboard/intel/kblrvp/romstage.c b/src/mainboard/intel/kblrvp/romstage.c
index c96f791516..1a483bda45 100644
--- a/src/mainboard/intel/kblrvp/romstage.c
+++ b/src/mainboard/intel/kblrvp/romstage.c
@@ -22,7 +22,6 @@
 #include <soc/romstage.h>
 #include <soc/gpio.h>
 #include "spd/spd.h"
-#include <string.h>
 #include <spd_bin.h>
 #include "board_id.h"
 
diff --git a/src/mainboard/intel/kunimitsu/chromeos.c b/src/mainboard/intel/kunimitsu/chromeos.c
index 75115c88ba..f7a9d52ba6 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.c
+++ b/src/mainboard/intel/kunimitsu/chromeos.c
@@ -16,7 +16,6 @@
 
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 #include "gpio.h"
diff --git a/src/mainboard/intel/kunimitsu/mainboard.c b/src/mainboard/intel/kunimitsu/mainboard.c
index c87b565e74..4c93051dea 100644
--- a/src/mainboard/intel/kunimitsu/mainboard.c
+++ b/src/mainboard/intel/kunimitsu/mainboard.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <gpio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <soc/nhlt.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include "ec.h"
diff --git a/src/mainboard/intel/kunimitsu/pei_data.c b/src/mainboard/intel/kunimitsu/pei_data.c
index 6a211243a7..bfc40c2748 100644
--- a/src/mainboard/intel/kunimitsu/pei_data.c
+++ b/src/mainboard/intel/kunimitsu/pei_data.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
 #include "boardid.h"
diff --git a/src/mainboard/intel/kunimitsu/romstage_fsp20.c b/src/mainboard/intel/kunimitsu/romstage_fsp20.c
index 285239a3c9..ee1ddd58cb 100644
--- a/src/mainboard/intel/kunimitsu/romstage_fsp20.c
+++ b/src/mainboard/intel/kunimitsu/romstage_fsp20.c
@@ -20,7 +20,6 @@
 #include <soc/romstage.h>
 #include <soc/gpio.h>
 #include "spd/spd.h"
-#include <string.h>
 
 void mainboard_memory_init_params(FSPM_UPD *mupd)
 {
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index edb66fc036..fe95a3106c 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 29c5de7dfa..38ca9ff8a2 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <soc/acpi.h>
 #include <soc/iomap.h>
 #include <soc/nvs.h>
-#include <string.h>
 #include <types.h>
 #include <boardid.h>
 #include "onboard.h"
diff --git a/src/mainboard/intel/strago/chromeos.c b/src/mainboard/intel/strago/chromeos.c
index 5e9cad641f..03eff1be4e 100644
--- a/src/mainboard/intel/strago/chromeos.c
+++ b/src/mainboard/intel/strago/chromeos.c
@@ -15,7 +15,6 @@
  */
 
 #include <gpio.h>
-#include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
 #define WP_GPIO	GP_E_22
diff --git a/src/mainboard/intel/strago/romstage.c b/src/mainboard/intel/strago/romstage.c
index c25e31723c..0f3067ea81 100644
--- a/src/mainboard/intel/strago/romstage.c
+++ b/src/mainboard/intel/strago/romstage.c
@@ -17,7 +17,6 @@
 #include <soc/gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/romstage.h>
-#include <string.h>
 #include <chip.h>
 #include "onboard.h"
 #include <boardid.h>
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index 39bf213092..c94c7bff55 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index ad651f5c8c..9487e9b391 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <bootmode.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index 83975dbe51..4bfd039117 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/intel/wtm2/pei_data.c b/src/mainboard/intel/wtm2/pei_data.c
index 0b0e941639..705904e5d9 100644
--- a/src/mainboard/intel/wtm2/pei_data.c
+++ b/src/mainboard/intel/wtm2/pei_data.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index bc9c1542bc..787c432041 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
@@ -16,7 +16,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
index 9ae585854d..8fbdc58a77 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
@@ -15,18 +15,14 @@
  * GNU General Public License for more details.
  */
 
-
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <drivers/generic/ioapic/chip.h>
 #include <stdint.h>
-#include <string.h>
-
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 
-
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
diff --git a/src/mainboard/jetway/pa78vm5/acpi_tables.c b/src/mainboard/jetway/pa78vm5/acpi_tables.c
index 8c6a0962f5..92e711866f 100644
--- a/src/mainboard/jetway/pa78vm5/acpi_tables.c
+++ b/src/mainboard/jetway/pa78vm5/acpi_tables.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/jetway/pa78vm5/get_bus_conf.c b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
index cbf436bf6f..ee2a6caeb9 100644
--- a/src/mainboard/jetway/pa78vm5/get_bus_conf.c
+++ b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/jetway/pa78vm5/mptable.c b/src/mainboard/jetway/pa78vm5/mptable.c
index 5fb82ff52a..6e9d1cce06 100644
--- a/src/mainboard/jetway/pa78vm5/mptable.c
+++ b/src/mainboard/jetway/pa78vm5/mptable.c
@@ -17,14 +17,11 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
-
 extern u32 apicid_sb700;
 
-
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index 7a90f50bcd..7fcb594391 100644
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -19,7 +19,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c
index 7db977d136..2edb7daf0e 100644
--- a/src/mainboard/kontron/986lcd-m/mptable.c
+++ b/src/mainboard/kontron/986lcd-m/mptable.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 26e02a0739..afedbfce83 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -16,7 +16,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 0ea982c029..f778f96432 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index a840fe8545..eba2d1da8b 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.c
@@ -13,11 +13,9 @@
  * GNU General Public License for more details.
  */
 
-
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/romstage.c b/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
index 01728a36a0..7591f8b873 100644
--- a/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
+++ b/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
@@ -21,6 +21,7 @@
 #include <console/console.h>
 #include <cbfs.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
+#include <string.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <ec/lenovo/pmh7/pmh7.h>
 
diff --git a/src/mainboard/lenovo/t60/mptable.c b/src/mainboard/lenovo/t60/mptable.c
index 8a9ee4838e..838757e0c6 100644
--- a/src/mainboard/lenovo/t60/mptable.c
+++ b/src/mainboard/lenovo/t60/mptable.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index 565fe2f437..070ee5951e 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -18,7 +18,6 @@
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index caaeffc0d7..c5a3120838 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -19,7 +19,6 @@
 /* __PRE_RAM__ means: use "unsigned" for device, not a struct.  */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c
index 38ede4bfff..a5b0c8189b 100644
--- a/src/mainboard/lenovo/x220/romstage.c
+++ b/src/mainboard/lenovo/x220/romstage.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/byteorder.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 614ad5e807..f97c3f503c 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/byteorder.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/x60/mptable.c b/src/mainboard/lenovo/x60/mptable.c
index 7b23d5aa97..0118ba002f 100644
--- a/src/mainboard/lenovo/x60/mptable.c
+++ b/src/mainboard/lenovo/x60/mptable.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 513e8e15bb..39e0ed57ac 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -18,7 +18,6 @@
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/lenovo/z61t/mptable.c b/src/mainboard/lenovo/z61t/mptable.c
index 8a9ee4838e..838757e0c6 100644
--- a/src/mainboard/lenovo/z61t/mptable.c
+++ b/src/mainboard/lenovo/z61t/mptable.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/lenovo/z61t/romstage.c b/src/mainboard/lenovo/z61t/romstage.c
index 9d606f7801..45cd9ecab4 100644
--- a/src/mainboard/lenovo/z61t/romstage.c
+++ b/src/mainboard/lenovo/z61t/romstage.c
@@ -18,7 +18,6 @@
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/msi/ms7721/acpi_tables.c b/src/mainboard/msi/ms7721/acpi_tables.c
index a840fe8545..eba2d1da8b 100644
--- a/src/mainboard/msi/ms7721/acpi_tables.c
+++ b/src/mainboard/msi/ms7721/acpi_tables.c
@@ -13,11 +13,9 @@
  * GNU General Public License for more details.
  */
 
-
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <string.h>
 
 unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index 6e759739c9..c81798587f 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -19,7 +19,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/msi/ms9652_fam10/mptable.c b/src/mainboard/msi/ms9652_fam10/mptable.c
index f3947e7b60..13b5d92125 100644
--- a/src/mainboard/msi/ms9652_fam10/mptable.c
+++ b/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -18,7 +18,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index 11015f6a67..2da427d710 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pnp_ops.h>
diff --git a/src/mainboard/opencellular/elgon/romstage.c b/src/mainboard/opencellular/elgon/romstage.c
index 8456e2d023..94c09ecaf5 100644
--- a/src/mainboard/opencellular/elgon/romstage.c
+++ b/src/mainboard/opencellular/elgon/romstage.c
@@ -23,7 +23,6 @@
 #include <console/console.h>
 #include <program_loading.h>
 #include <libbdk-hal/bdk-config.h>
-#include <string.h>
 #include <arch/stages.h>
 
 extern const struct bdk_devicetree_key_value devtree[];
diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 88589b0e49..b20c445fef 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -19,7 +19,6 @@
 /* __PRE_RAM__ means: use "unsigned" for device, not a struct.  */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index f18a2aa007..787c432041 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/pcengines/apu1/mptable.c b/src/mainboard/pcengines/apu1/mptable.c
index 32b2a6eae4..bb8d01ecb9 100644
--- a/src/mainboard/pcengines/apu1/mptable.c
+++ b/src/mainboard/pcengines/apu1/mptable.c
@@ -16,7 +16,6 @@
 
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
-#include <string.h>
 #include <stdint.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/pcengines/apu2/acpi_tables.c b/src/mainboard/pcengines/apu2/acpi_tables.c
index 0b9e0c47c9..08f6076e7c 100644
--- a/src/mainboard/pcengines/apu2/acpi_tables.c
+++ b/src/mainboard/pcengines/apu2/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c
index c80e9ee0c3..bd3c421a2f 100644
--- a/src/mainboard/pcengines/apu2/romstage.c
+++ b/src/mainboard/pcengines/apu2/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/purism/librem_skl/romstage.c b/src/mainboard/purism/librem_skl/romstage.c
index 48db885075..63d148a98e 100644
--- a/src/mainboard/purism/librem_skl/romstage.c
+++ b/src/mainboard/purism/librem_skl/romstage.c
@@ -16,7 +16,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <assert.h>
 #include <soc/romstage.h>
 #include <spd_bin.h>
diff --git a/src/mainboard/roda/rk886ex/mptable.c b/src/mainboard/roda/rk886ex/mptable.c
index 59ab0c4f62..cf87d7fa95 100644
--- a/src/mainboard/roda/rk886ex/mptable.c
+++ b/src/mainboard/roda/rk886ex/mptable.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <string.h>
 #include <stdint.h>
 
 static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index fbda731c02..dbc4b6cb7b 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -17,7 +17,6 @@
 /* __PRE_RAM__ means: use "unsigned" for device, not a struct. */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index c41e964660..8038664025 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index b21ae2255d..17d7e0e296 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index 57fdbcbad0..a8e28d67ac 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/sapphire/pureplatinumh61/romstage.c b/src/mainboard/sapphire/pureplatinumh61/romstage.c
index 30dfeab9aa..296e8963c2 100644
--- a/src/mainboard/sapphire/pureplatinumh61/romstage.c
+++ b/src/mainboard/sapphire/pureplatinumh61/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <arch/byteorder.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
@@ -23,7 +22,6 @@
 #include <northbridge/intel/sandybridge/raminit_native.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 
-
 void pch_enable_lpc(void)
 {
 	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x2400);
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index e126bd8e83..43818eebe4 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -16,7 +16,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
diff --git a/src/mainboard/scaleway/tagada/bmcinfo.c b/src/mainboard/scaleway/tagada/bmcinfo.c
index 5ca736984d..237d551b59 100644
--- a/src/mainboard/scaleway/tagada/bmcinfo.c
+++ b/src/mainboard/scaleway/tagada/bmcinfo.c
@@ -16,9 +16,7 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <arch/early_variables.h>
-
 #include <console/console.h>
 #include <console/uart.h>
 
diff --git a/src/mainboard/scaleway/tagada/fadt.c b/src/mainboard/scaleway/tagada/fadt.c
index da25dec8a0..f40841efc3 100644
--- a/src/mainboard/scaleway/tagada/fadt.c
+++ b/src/mainboard/scaleway/tagada/fadt.c
@@ -16,7 +16,6 @@
  *
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 
 #include <soc/acpi.h>
diff --git a/src/mainboard/scaleway/tagada/romstage.c b/src/mainboard/scaleway/tagada/romstage.c
index c29ff9dff7..f14c1b6e3c 100644
--- a/src/mainboard/scaleway/tagada/romstage.c
+++ b/src/mainboard/scaleway/tagada/romstage.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <fsp/api.h>
 #include <fsp/soc_binding.h>
-#include <string.h>
 #include "bmcinfo.h"
 
 void mainboard_config_gpios(void);
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index 2903a5c5e0..d81798c6b0 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -15,7 +15,6 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
index 8b96670220..d41551db27 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -18,7 +18,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"
diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 1d6410dcd6..4d6846c2de 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c
index 5d4c1cb8d3..8c884c4d65 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -18,7 +18,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"
diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index 76d255be60..051cd61efb 100644
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pnp_ops.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
index 530a913401..e9f181b836 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 3c0bf46e4a..8bc96c22a8 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -15,7 +15,6 @@
 
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index e3a572ed52..112d20ae41 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -16,7 +16,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 
diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index 3057a3fd90..f3958f8d61 100644
--- a/src/mainboard/supermicro/h8scm_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c
@@ -18,7 +18,6 @@
 //#define SYSTEM_TYPE 2	/* MOBILE */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <arch/cpu.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c
index f9062ca06b..1781a6627d 100644
--- a/src/mainboard/tyan/s2912_fam10/mptable.c
+++ b/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -18,7 +18,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <string.h>
 #include <stdint.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index 73951d18e2..3f504e1957 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index f96dc448ca..80693cde46 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <lib.h>
 #include <cpu/x86/bist.h>
-#include <string.h>
 #include <timestamp.h>
 #include <cbmem.h>
 
diff --git a/src/northbridge/amd/amdfam10/get_pci1234.c b/src/northbridge/amd/amdfam10/get_pci1234.c
index 0d372f41df..94ec831d65 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 6d41560079..9aea1d79eb 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
@@ -18,7 +18,7 @@
 #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 48367570e1..efe1e8f52a 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
@@ -16,12 +16,12 @@
 
 #include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
-#include "mct_d.h"
-#include "mct_d_gcc.h"
 #include <cpu/amd/mtrr.h>
 #include <cpu/x86/mtrr.h>
 
+#include "mct_d.h"
+#include "mct_d_gcc.h"
+
 static void SetMTRRrangeWB_D(u32 Base, u32 *pLimit, u32 *pMtrrAddr);
 static void SetMTRRrange_D(u32 Base, u32 *pLimit, u32 *pMtrrAddr, u16 MtrrType);
 
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
index 3df032398c..e878649d75 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
@@ -16,7 +16,7 @@
 
 #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 a02b15f4c4..6918e9ca9d 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
@@ -14,7 +14,7 @@
  */
 
 #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 eb3143fd61..8bed3b7d33 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
@@ -15,7 +15,7 @@
  */
 
 #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 5a4fd2a7c0..76e0c5c029 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
@@ -15,7 +15,7 @@
  */
 
 #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 d299f56a0d..d9ae58ec70 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
@@ -17,7 +17,7 @@
 #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 3ca1a98abb..d75d1be036 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
@@ -17,7 +17,7 @@
 #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 eb30c8d929..9f9fc80a76 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
@@ -16,7 +16,7 @@
 
 #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 6c3db47542..e7b7883f13 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
@@ -20,8 +20,8 @@
 
 #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 a91fb08bdc..89edf6eee9 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
@@ -17,7 +17,7 @@
 #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 b62661b307..ab16887f1d 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
@@ -16,11 +16,11 @@
 
 #include <inttypes.h>
 #include <console/console.h>
-#include <string.h>
+#include <northbridge/amd/amdfam10/amdfam10.h>
+
 #include "mct_d.h"
 #include "mct_d_gcc.h"
 #include "mwlc_d.h"
-#include <northbridge/amd/amdfam10/amdfam10.h>
 
 u32 swapAddrBits_wl(struct DCTStatStruc *pDCTstat, uint8_t dct, uint32_t MRSValue);
 u32 swapBankBits(struct DCTStatStruc *pDCTstat, uint8_t dct, uint32_t MRSValue);
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
index 26ea031304..2904cfb3ad 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
@@ -14,7 +14,7 @@
  */
 
 #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 1c2a135975..5157a5ce8f 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
@@ -18,7 +18,7 @@
 
 #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 3c512edcda..ef99af8c5c 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
@@ -15,7 +15,7 @@
 
 #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 e4afa70fa0..61a00562f4 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
@@ -18,7 +18,7 @@
 
 #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 8c31f7ee83..e3d3faf4a1 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -11,6 +11,7 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/acpi.h>
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
@@ -18,9 +19,8 @@
 #include <device/pci.h>
 #include <cpu/cpu.h>
 #include <stdlib.h>
-#include <string.h>
+
 #include "e7505.h"
-#include <arch/acpi.h>
 
 unsigned long acpi_fill_mcfg(unsigned long current)
 {
diff --git a/src/northbridge/intel/fsp_rangeley/acpi.c b/src/northbridge/intel/fsp_rangeley/acpi.c
index 901843d0e1..0c52d52588 100644
--- a/src/northbridge/intel/fsp_rangeley/acpi.c
+++ b/src/northbridge/intel/fsp_rangeley/acpi.c
@@ -17,12 +17,12 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <arch/acpi.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <arch/acpigen.h>
+
 #include "northbridge.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.c b/src/northbridge/intel/fsp_rangeley/northbridge.c
index cd900be438..7663b26513 100644
--- a/src/northbridge/intel/fsp_rangeley/northbridge.c
+++ b/src/northbridge/intel/fsp_rangeley/northbridge.c
@@ -25,13 +25,13 @@
 #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"
 #include <drivers/intel/fsp1_0/fsp_util.h>
 #include <cpu/x86/lapic.h>
 
+#include "chip.h"
+#include "northbridge.h"
+
 static int bridge_revision_id = -1;
 
 int bridge_silicon_revision(void)
diff --git a/src/northbridge/intel/fsp_rangeley/raminit.c b/src/northbridge/intel/fsp_rangeley/raminit.c
index 32941357cf..da9ed71a67 100644
--- a/src/northbridge/intel/fsp_rangeley/raminit.c
+++ b/src/northbridge/intel/fsp_rangeley/raminit.c
@@ -14,12 +14,12 @@
  * GNU General Public License for more details.
  */
 
-#include <string.h>
 #include <cbmem.h>
 #include <device/pci_def.h>
-#include "northbridge.h"
 #include <drivers/intel/fsp1_0/fsp_util.h>
 
+#include "northbridge.h"
+
 static uintptr_t smm_region_start(void)
 {
 	/*
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index 301743ce4a..decf712302 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -15,13 +15,13 @@
  */
 
 #include <types.h>
-#include <string.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
+
 #include "gm45.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 40e4f61afd..f011cce8d7 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -20,11 +20,11 @@
 #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>
 #include <cpu/intel/smm/gen1/smi.h>
+
 #include "chip.h"
 #include "gm45.h"
 
diff --git a/src/northbridge/intel/gm45/pcie.c b/src/northbridge/intel/gm45/pcie.c
index c470b8147c..4199274f3c 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 a447a23093..d96bcf4528 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 7335ac914f..09439f25ef 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 3ed75b30af..1629a67b8d 100644
--- a/src/northbridge/intel/gm45/thermal.c
+++ b/src/northbridge/intel/gm45/thermal.c
@@ -16,11 +16,10 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <string.h>
 #include <device/pci_def.h>
 #include <spd.h>
-#include "delay.h"
 
+#include "delay.h"
 #include "gm45.h"
 
 void raminit_thermal(const sysinfo_t *sysinfo)
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index ad4563bb35..2b7afa8172 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -26,9 +26,9 @@
 #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"
 #include "haswell.h"
 
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index 2e4c3a15d3..ef6329c172 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 f817cdf570..3a9f6a2b2f 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 e8cacf622f..d3ed27745d 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 ce7d292a27..82392f4e53 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 86fc583f88..16f1c35935 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 8a4f64c809..575c6008fc 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 6aefc9b141..5bfc934e04 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 4f284747b9..a0d5305255 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 8bacc77598..d6ece9dc03 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 5ddcd73cea..4b67cfdefd 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 d302c52c35..7f7ea0c10f 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 e58a0ebc3a..477c26ec4e 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 d48bac4a0f..b49165cb3f 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 da9ed40687..fb04fd8582 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 8de568a0ea..2c045e6fd1 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 ba51430b20..b6616e1dd8 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 0544c17a66..d865f388cd 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 ba4dbc111a..6ab906710e 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 aa2dc09bfc..d7892784ee 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 1522ce6979..4f128dcac1 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 3fb693d4bc..1d6525f966 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 51bc682893..5e95c6215c 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 077946a04e..e4266b2ca9 100644
--- a/src/security/vboot/vboot_crtm.c
+++ b/src/security/vboot/vboot_crtm.c
@@ -18,6 +18,7 @@
 #include <cbfs.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 e0facc10d7..0640ebd173 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 d06a8df9fa..7a40d262eb 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 fc69b46ee2..485dfd719f 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 68cf3a1ba3..fdecf00581 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 e6b1a36d16..c682d980bb 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 bef7052cea..47fbc0db60 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 66a1a1abcc..a85ad1f6b9 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 a5946bccf1..24469ea3a5 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 ec0aa8585b..42bc518f36 100644
--- a/src/soc/intel/baytrail/smm.c
+++ b/src/soc/intel/baytrail/smm.c
@@ -20,8 +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>
 #include <soc/smm.h>
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 7b01cfa8e1..0289e8b4de 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 1faf6516b3..d5b962ffe7 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 b8362cdc58..d6a1cda8b3 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 6f54d78aef..fe681c9d90 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 c87232dd92..b968283fe7 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 d274be8c42..5592538ab3 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 50f6a29e0d..81ad9d4266 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 f87b8a2afc..9aab0d10a6 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 d8127577db..01d2830481 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 aef1d1cd44..c6444b15e8 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 993e7f3d4a..d50c6894d0 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 d03d21e3c1..421cafc718 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 e311ae6210..c872e51578 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 2e3b99e167..455b13ccb7 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 7f213722de..b89bf6f31e 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 77f8c1e227..1b3a82a088 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 6f79466b10..99d8a35ea7 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 5f90185183..5967840609 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 91bd12eead..c34894871e 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 9d3fa75a6a..2df6994fcd 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 1e44021d92..ba7ba0f0b7 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 e715469be9..cc1d696d77 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 651e7d13a5..94b09449c0 100644
--- a/src/soc/intel/fsp_baytrail/smm.c
+++ b/src/soc/intel/fsp_baytrail/smm.c
@@ -20,8 +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>
 #include <soc/smm.h>
diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c
index 573c1c4390..979ee573bb 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 348e1c00f1..6b1484577d 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 0978ab3dea..0e4388efd6 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 cfeffbbb1c..40775509e4 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 d03d21e3c1..421cafc718 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 0822e7d28d..7ffa203bdc 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 0ff5a137c6..0343a237f8 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 53d408aebc..1b2a7428df 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 9f2f3b90a1..09ea20005e 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 0a0bad40f6..6dda1026be 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 c1e5d119fe..68b178fcb5 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 457f918bd8..9188f83abd 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 51fa10f8ad..45159c2fee 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 3ffcb0e0aa..bd34185494 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 ce46e5ee35..fbda37f952 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 a9d6835b3a..c013099742 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 045715f35b..3055b2953e 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 6330779781..6542df19c1 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 c84a3e5be8..109eda9fc0 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 cdd2a99f8c..657734524c 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 3c66a580b6..e5f5a9a9bf 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 ffd2bea9aa..1ee861ca93 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 aecdeefcc5..425d302fbb 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 b343babf1c..808ff963a8 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 ad679e59b9..19ad0eb471 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 35e338dc96..e2e9f7d49b 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 e01b3a683b..0e8cda60d7 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 ee8ac8a4bf..3f3ff97c7f 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>
 
 void bootmem_platform_add_ranges(void)
diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c
index 7d24294523..9fef9ae377 100644
--- a/src/soc/samsung/exynos5250/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5250/alternate_cbfs.c
@@ -20,7 +20,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 40d23b65f7..64980a1aec 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 736f2743b4..96cfef6528 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 4ef049e084..a1e92a08bc 100644
--- a/src/soc/samsung/exynos5420/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5420/alternate_cbfs.c
@@ -21,7 +21,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 ebcb122ae9..538165706c 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 1df3ae4177..1462c2928c 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 76c587779a..9c546c5c40 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 469c9368da..c4a7896ca7 100644
--- a/src/southbridge/amd/amd8111/lpc.c
+++ b/src/southbridge/amd/amd8111/lpc.c
@@ -29,7 +29,7 @@
 #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 d6eb1e22b7..ffda0a8ea4 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 8bb2e0e4ef..103db988ef 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 6b70d9d7fc..ee031e927f 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 b5fbfbb071..23942feffb 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 ef345efb75..e96c38da6b 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 1186058cc9..0245f4fc2d 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 831b1696c4..6db431cb16 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 2891ca4ae7..14611b3891 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 e65576769c..afd89a7dba 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 7c6d3b4a2e..4b7dcf848f 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 f7286bc9b9..3676a47b20 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 7de8b3b995..4c9f2ac26d 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 e16e1be18a..6f12c70f61 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 48e0be3aaf..e3d8f02805 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 426fb4233d..3a6c4038c8 100644
--- a/src/southbridge/intel/lynxpoint/smi.c
+++ b/src/southbridge/intel/lynxpoint/smi.c
@@ -21,7 +21,7 @@
 #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 d0959feb9c..33f27e154c 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 16fc9e57ce..6d8c66e907 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 3a8767f6dd..7c04023670 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 a7aee07880..cef7ff7ee0 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 feaecfb10e..a15d0a2aad 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 e85251bf66..f867ff3e62 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 d4d5e5cc79..c666818530 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 dd25ca7a26..b200855abd 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 719444b177..0bfd3b811e 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 7fe54ce7f1..e43e791516 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 c5cfe0394e..6ac2d6dbf4 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 f0ca914769..ad8153f41c 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 bfa5d33a3c..cd13854128 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 26562c2cfc..80ed456ee4 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 0a14e4c44d..b10e8a1b28 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 3574c5fe5e..610f685e43 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 977c084922..74b8b2e3ca 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 2a1c5a9113..88fbc314a9 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 4ebd8d1c9f..318eaa4b03 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 a2ef514d4a..875a4a89b5 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 3cc4585391..82974ba056 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 9a647c0fd3..a3c132ccee 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 9f0c0ae377..b4f316ba75 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"