src: include <assert.h> when appropriate

Change-Id: Ib843eb7144b7dc2932931b9e8f3f1d816bcc1e1a
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/26796
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: David Guckian

56 files changed, 4 insertions, 53 deletions

diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c
index f43bc028d274..291e4eef3ee6 100644
--- a/src/arch/arm64/arm_tf.c
+++ b/src/arch/arm64/arm_tf.c
@@ -18,7 +18,6 @@
 #include <arch/mmu.h>
 #include <arch/transition.h>
 #include <arm_tf.h>
-#include <assert.h>
 #include <bootmem.h>
 #include <cbfs.h>
 #include <console/console.h>
diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c
index 3f9f99422d61..e283f4da31a4 100644
--- a/src/arch/x86/acpigen.c
+++ b/src/arch/x86/acpigen.c
@@ -28,6 +28,7 @@
 #include <lib.h>
 #include <string.h>
 #include <arch/acpigen.h>
+#include <assert.h>
 #include <console/console.h>
 #include <device/device.h>
 
diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h
index 9e5769304b80..6114667c6c7d 100644
--- a/src/arch/x86/include/arch/acpigen.h
+++ b/src/arch/x86/include/arch/acpigen.h
@@ -18,7 +18,6 @@
 #ifndef LIBACPI_H
 #define LIBACPI_H
 
-#include <assert.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <arch/acpi.h>
diff --git a/src/commonlib/storage/pci_sdhci.c b/src/commonlib/storage/pci_sdhci.c
index a2d30949b350..1798c2cac7e1 100644
--- a/src/commonlib/storage/pci_sdhci.c
+++ b/src/commonlib/storage/pci_sdhci.c
@@ -18,7 +18,6 @@
 #endif
 
 #include <arch/early_variables.h>
-#include <assert.h>
 #include <commonlib/sdhci.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/commonlib/storage/sd.c b/src/commonlib/storage/sd.c
index 2e1ae85f06ef..06f0156c82ee 100644
--- a/src/commonlib/storage/sd.c
+++ b/src/commonlib/storage/sd.c
@@ -19,7 +19,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <commonlib/sd_mmc_ctrlr.h>
 #include <commonlib/storage.h>
 #include <delay.h>
diff --git a/src/commonlib/storage/sd_mmc.c b/src/commonlib/storage/sd_mmc.c
index fd59bd0b6fca..348d3fe17d77 100644
--- a/src/commonlib/storage/sd_mmc.c
+++ b/src/commonlib/storage/sd_mmc.c
@@ -20,7 +20,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <commonlib/storage.h>
 #include <delay.h>
 #include <endian.h>
diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c
index 5c85e99655d9..19daa2ee7eb0 100644
--- a/src/commonlib/storage/sdhci.c
+++ b/src/commonlib/storage/sdhci.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include "bouncebuf.h"
 #include <commonlib/sd_mmc_ctrlr.h>
 #include <commonlib/sdhci.h>
diff --git a/src/commonlib/storage/sdhci_adma.c b/src/commonlib/storage/sdhci_adma.c
index bf6f457a4662..e3209734bab2 100644
--- a/src/commonlib/storage/sdhci_adma.c
+++ b/src/commonlib/storage/sdhci_adma.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <commonlib/sdhci.h>
 #include <commonlib/storage.h>
 #include <console/console.h>
diff --git a/src/commonlib/storage/storage.c b/src/commonlib/storage/storage.c
index d8ff4bc729d9..f434a6c0b69d 100644
--- a/src/commonlib/storage/storage.c
+++ b/src/commonlib/storage/storage.c
@@ -21,7 +21,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <commonlib/storage.h>
 #include "sd_mmc.h"
 #include "storage.h"
diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c
index e634f85fc338..3c3e53a83913 100644
--- a/src/cpu/intel/hyperthreading/intel_sibling.c
+++ b/src/cpu/intel/hyperthreading/intel_sibling.c
@@ -17,7 +17,6 @@
 #include <device/device.h>
 #include <pc80/mc146818rtc.h>
 #include <smp/spinlock.h>
-#include <assert.h>
 
 #if CONFIG(PARALLEL_CPU_INIT)
 #error Intel hyper-threading requires serialized CPU init
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 85b0937b9c9f..524e49c5c606 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <arch/acpi.h>
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
index 00f630747ad6..e26701b0991f 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mp.h>
diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c
index be0850493fde..11a518746c82 100644
--- a/src/drivers/spi/winbond.c
+++ b/src/drivers/spi/winbond.c
@@ -18,7 +18,6 @@
 #include <spi_flash.h>
 #include <spi-generic.h>
 #include <string.h>
-#include <assert.h>
 #include <delay.h>
 #include <lib.h>
 
diff --git a/src/lib/gpio.c b/src/lib/gpio.c
index ab473cb229c3..8ea3b5eb8e7c 100644
--- a/src/lib/gpio.c
+++ b/src/lib/gpio.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <base3.h>
 #include <console/console.h>
 #include <delay.h>
diff --git a/src/mainboard/google/dragonegg/romstage_fsp_params.c b/src/mainboard/google/dragonegg/romstage_fsp_params.c
index e357ee78c05f..f2c6851a3fe6 100644
--- a/src/mainboard/google/dragonegg/romstage_fsp_params.c
+++ b/src/mainboard/google/dragonegg/romstage_fsp_params.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <baseboard/variants.h>
 #include <soc/romstage.h>
 
diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c
index 4b1f09f2e8b5..8b6706c15ce9 100644
--- a/src/mainboard/intel/galileo/vboot.c
+++ b/src/mainboard/intel/galileo/vboot.c
@@ -12,7 +12,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <bootmode.h>
 #include <device/i2c_simple.h>
 #include <soc/i2c.h>
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 2b94daa1276f..eca2f0c73d52 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -33,7 +33,6 @@
 #include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <arch/acpigen.h>
-#include <assert.h>
 #include <northbridge/amd/pi/nb_common.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
 #if CONFIG(BINARYPI_LEGACY_WRAPPER)
diff --git a/src/security/vboot/vbnv_flash.c b/src/security/vboot/vbnv_flash.c
index 85cd04a8e5d8..908846fe70f4 100644
--- a/src/security/vboot/vbnv_flash.c
+++ b/src/security/vboot/vbnv_flash.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/early_variables.h>
-#include <assert.h>
 #include <commonlib/region.h>
 #include <console/console.h>
 #include <string.h>
diff --git a/src/soc/cavium/cn81xx/ecam0.c b/src/soc/cavium/cn81xx/ecam0.c
index 6e0cb9c7313e..6659cdf3bc16 100644
--- a/src/soc/cavium/cn81xx/ecam0.c
+++ b/src/soc/cavium/cn81xx/ecam0.c
@@ -23,7 +23,6 @@
 #include <soc/addressmap.h>
 #include <soc/cavium/common/pci/chip.h>
 #include <soc/ecam.h>
-#include <assert.h>
 
 #define CAVM_PCCPF_XXX_VSEC_CTL 0x108
 #define CAVM_PCCPF_XXX_VSEC_SCTL 0x10c
diff --git a/src/soc/cavium/cn81xx/twsi.c b/src/soc/cavium/cn81xx/twsi.c
index d29bcda121ba..7137531d4901 100644
--- a/src/soc/cavium/cn81xx/twsi.c
+++ b/src/soc/cavium/cn81xx/twsi.c
@@ -20,7 +20,6 @@
 #include <soc/clock.h>
 #include <device/i2c.h>
 #include <device/i2c_simple.h>
-#include <assert.h>
 #include <delay.h>
 #include <device/mmio.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/cavium/common/ecam.c b/src/soc/cavium/common/ecam.c
index aaf9085ccfa4..ae2a91fe0d94 100644
--- a/src/soc/cavium/common/ecam.c
+++ b/src/soc/cavium/common/ecam.c
@@ -22,7 +22,6 @@
 #include <device/pci.h>
 #include <soc/addressmap.h>
 #include <soc/ecam.h>
-#include <assert.h>
 
 /**
  * Get PCI BAR address from cavium specific extended capability.
diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index 9696a580c0fa..6208c9c739d4 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -21,6 +21,7 @@
 #include <console/console.h>
 #include <device/mmio.h>
 #include <arch/smp/mpspec.h>
+#include <assert.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <cpu/x86/smm.h>
diff --git a/src/soc/intel/apollolake/gpio_apl.c b/src/soc/intel/apollolake/gpio_apl.c
index 265e613d61ee..b76c9b09fe88 100644
--- a/src/soc/intel/apollolake/gpio_apl.c
+++ b/src/soc/intel/apollolake/gpio_apl.c
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <intelblocks/gpio.h>
 #include <intelblocks/pcr.h>
 #include <soc/pcr_ids.h>
diff --git a/src/soc/intel/apollolake/gpio_glk.c b/src/soc/intel/apollolake/gpio_glk.c
index 037273c3fa22..99f4e4ddc0c1 100644
--- a/src/soc/intel/apollolake/gpio_glk.c
+++ b/src/soc/intel/apollolake/gpio_glk.c
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <intelblocks/gpio.h>
 #include <intelblocks/pcr.h>
 #include <soc/pcr_ids.h>
diff --git a/src/soc/intel/apollolake/uart.c b/src/soc/intel/apollolake/uart.c
index 1a31e2025d09..27be4e65f9c0 100644
--- a/src/soc/intel/apollolake/uart.c
+++ b/src/soc/intel/apollolake/uart.c
@@ -20,7 +20,6 @@
  * shouldn't cause any fragmentation.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <intelblocks/uart.h>
 #include <soc/gpio.h>
diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c
index 893f37d421ca..c168da9a3843 100644
--- a/src/soc/intel/cannonlake/romstage/romstage.c
+++ b/src/soc/intel/cannonlake/romstage/romstage.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <chip.h>
 #include <cpu/x86/mtrr.h>
 #include <cbmem.h>
diff --git a/src/soc/intel/cannonlake/uart.c b/src/soc/intel/cannonlake/uart.c
index 1b72b24d5fff..2bd906adf894 100644
--- a/src/soc/intel/cannonlake/uart.c
+++ b/src/soc/intel/cannonlake/uart.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <device/pci_def.h>
 #include <intelblocks/gpio.h>
diff --git a/src/soc/intel/common/block/sgx/sgx.c b/src/soc/intel/common/block/sgx/sgx.c
index 3a4a5332805c..2d4cc53aa718 100644
--- a/src/soc/intel/common/block/sgx/sgx.c
+++ b/src/soc/intel/common/block/sgx/sgx.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index b89bf6f31e19..a8e5792a860d 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/acpi.h>
-#include <assert.h>
 #include <cbmem.h>
 #include <console/uart.h>
 #include <device/device.h>
diff --git a/src/soc/intel/denverton_ns/gpio.c b/src/soc/intel/denverton_ns/gpio.c
index 30851fd75b91..7c45d40de547 100644
--- a/src/soc/intel/denverton_ns/gpio.c
+++ b/src/soc/intel/denverton_ns/gpio.c
@@ -16,7 +16,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <intelblocks/gpio.h>
 #include <intelblocks/pcr.h>
 #include <soc/pcr.h>
diff --git a/src/soc/intel/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c
index a61370a1ee6f..b0a2b6c0cd79 100644
--- a/src/soc/intel/icelake/romstage/romstage.c
+++ b/src/soc/intel/icelake/romstage/romstage.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <chip.h>
 #include <cpu/x86/mtrr.h>
 #include <cbmem.h>
diff --git a/src/soc/intel/icelake/uart.c b/src/soc/intel/icelake/uart.c
index 1b72b24d5fff..2bd906adf894 100644
--- a/src/soc/intel/icelake/uart.c
+++ b/src/soc/intel/icelake/uart.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <device/pci_def.h>
 #include <intelblocks/gpio.h>
diff --git a/src/soc/intel/quark/spi.c b/src/soc/intel/quark/spi.c
index 7ffa203bdc50..0bd0473db5f9 100644
--- a/src/soc/intel/quark/spi.c
+++ b/src/soc/intel/quark/spi.c
@@ -16,7 +16,6 @@
 
 #include <device/mmio.h>
 #include <device/pci_ops.h>
-#include <assert.h>
 #include <bootstate.h>
 #include <console/console.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 3e77b03c3fee..47d484162d80 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <arch/cpu.h>
 #include <bootstate.h>
 #include <console/console.h>
diff --git a/src/soc/intel/skylake/gpio.c b/src/soc/intel/skylake/gpio.c
index 3d66fa460200..39cbde6cc2d1 100644
--- a/src/soc/intel/skylake/gpio.c
+++ b/src/soc/intel/skylake/gpio.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <intelblocks/gpio.h>
 #include <intelblocks/pcr.h>
 #include <soc/pcr_ids.h>
diff --git a/src/soc/mediatek/common/include/soc/rtc_common.h b/src/soc/mediatek/common/include/soc/rtc_common.h
index d039e0becff9..ff5dd34d89a7 100644
--- a/src/soc/mediatek/common/include/soc/rtc_common.h
+++ b/src/soc/mediatek/common/include/soc/rtc_common.h
@@ -16,7 +16,6 @@
 #ifndef SOC_MEDIATEK_RTC_COMMON_H
 #define SOC_MEDIATEK_RTC_COMMON_H
 
-#include <assert.h>
 #include <bcd.h>
 #include <console/console.h>
 #include <rtc.h>
diff --git a/src/soc/mediatek/common/pmic_wrap.c b/src/soc/mediatek/common/pmic_wrap.c
index 1b8bc5d3a08e..6785c0a0bd02 100644
--- a/src/soc/mediatek/common/pmic_wrap.c
+++ b/src/soc/mediatek/common/pmic_wrap.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <soc/pmic_wrap.h>
 #include <timer.h>
 
diff --git a/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c b/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c
index 01a32e3cb4aa..0a8e69be1e9b 100644
--- a/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c
+++ b/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <console/console.h>
 #include <stdlib.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/mediatek/mt8173/emi.c b/src/soc/mediatek/mt8173/emi.c
index d4cd02aa09fd..be84668abee5 100644
--- a/src/soc/mediatek/mt8173/emi.c
+++ b/src/soc/mediatek/mt8173/emi.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <boardid.h>
 #include <console/console.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/mediatek/mt8173/pmic_wrap.c b/src/soc/mediatek/mt8173/pmic_wrap.c
index 6acaee2bee09..af88343c14f1 100644
--- a/src/soc/mediatek/mt8173/pmic_wrap.c
+++ b/src/soc/mediatek/mt8173/pmic_wrap.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <console/console.h>
 #include <delay.h>
 #include <soc/infracfg.h>
diff --git a/src/soc/mediatek/mt8183/mt6358.c b/src/soc/mediatek/mt8183/mt6358.c
index d338e1682dad..580327183cec 100644
--- a/src/soc/mediatek/mt8183/mt6358.c
+++ b/src/soc/mediatek/mt8183/mt6358.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <soc/pmic_wrap.h>
 #include <soc/mt6358.h>
diff --git a/src/soc/qualcomm/ipq40xx/i2c.c b/src/soc/qualcomm/ipq40xx/i2c.c
index f5c9943cfa60..f20dada0b06e 100644
--- a/src/soc/qualcomm/ipq40xx/i2c.c
+++ b/src/soc/qualcomm/ipq40xx/i2c.c
@@ -29,7 +29,6 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <stdlib.h>
diff --git a/src/soc/qualcomm/ipq806x/i2c.c b/src/soc/qualcomm/ipq806x/i2c.c
index cd57591bebf0..c81373fade99 100644
--- a/src/soc/qualcomm/ipq806x/i2c.c
+++ b/src/soc/qualcomm/ipq806x/i2c.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <stdlib.h>
diff --git a/src/soc/rockchip/common/edp.c b/src/soc/rockchip/common/edp.c
index 98381a0d1a16..91e2de9ff4cf 100644
--- a/src/soc/rockchip/common/edp.c
+++ b/src/soc/rockchip/common/edp.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/soc/rockchip/common/pwm.c b/src/soc/rockchip/common/pwm.c
index ad0453b612b1..e5da05e6724b 100644
--- a/src/soc/rockchip/common/pwm.c
+++ b/src/soc/rockchip/common/pwm.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <soc/addressmap.h>
 #include <soc/grf.h>
 #include <soc/soc.h>
diff --git a/src/soc/rockchip/rk3288/hdmi.c b/src/soc/rockchip/rk3288/hdmi.c
index 425d302fbbc8..b4de270fc548 100644
--- a/src/soc/rockchip/rk3288/hdmi.c
+++ b/src/soc/rockchip/rk3288/hdmi.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <console/console.h>
 #include <delay.h>
 #include <edid.h>
diff --git a/src/soc/rockchip/rk3288/tsadc.c b/src/soc/rockchip/rk3288/tsadc.c
index a34105d9acb2..3223a4ddd467 100644
--- a/src/soc/rockchip/rk3288/tsadc.c
+++ b/src/soc/rockchip/rk3288/tsadc.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
 #include <soc/pmu.h>
diff --git a/src/soc/rockchip/rk3399/bl31_plat_params.c b/src/soc/rockchip/rk3399/bl31_plat_params.c
index 647566ba2d9f..9c11552301f3 100644
--- a/src/soc/rockchip/rk3399/bl31_plat_params.c
+++ b/src/soc/rockchip/rk3399/bl31_plat_params.c
@@ -15,7 +15,6 @@
  */
 
 #include <arm_tf.h>
-#include <assert.h>
 #include <cbmem.h>
 #include <soc/bl31_plat_params.h>
 
diff --git a/src/soc/rockchip/rk3399/mipi.c b/src/soc/rockchip/rk3399/mipi.c
index ee8cc2e44526..cc16563c4350 100644
--- a/src/soc/rockchip/rk3399/mipi.c
+++ b/src/soc/rockchip/rk3399/mipi.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/soc/rockchip/rk3399/tsadc.c b/src/soc/rockchip/rk3399/tsadc.c
index d5aeccdec62c..7ec24648a229 100644
--- a/src/soc/rockchip/rk3399/tsadc.c
+++ b/src/soc/rockchip/rk3399/tsadc.c
@@ -14,7 +14,6 @@
  */
 
 #include <device/mmio.h>
-#include <assert.h>
 #include <delay.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c
index 9fef9ae377b5..e43167257939 100644
--- a/src/soc/samsung/exynos5250/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5250/alternate_cbfs.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <boot_device.h>
 #include <console/console.h>
 #include <soc/alternate_cbfs.h>
diff --git a/src/soc/samsung/exynos5250/pinmux.c b/src/soc/samsung/exynos5250/pinmux.c
index 10c8c953cd9e..9ddbea56b2ad 100644
--- a/src/soc/samsung/exynos5250/pinmux.c
+++ b/src/soc/samsung/exynos5250/pinmux.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <console/console.h>
 #include <soc/gpio.h>
 #include <soc/pinmux.h>
diff --git a/src/soc/samsung/exynos5420/alternate_cbfs.c b/src/soc/samsung/exynos5420/alternate_cbfs.c
index a1e92a08bc4b..ba3f9a3c8744 100644
--- a/src/soc/samsung/exynos5420/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5420/alternate_cbfs.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/cache.h>
-#include <assert.h>
 #include <boot_device.h>
 #include <console/console.h>
 #include <soc/alternate_cbfs.h>
diff --git a/src/soc/samsung/exynos5420/pinmux.c b/src/soc/samsung/exynos5420/pinmux.c
index d8c13780a495..999afa0247cc 100644
--- a/src/soc/samsung/exynos5420/pinmux.c
+++ b/src/soc/samsung/exynos5420/pinmux.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <assert.h>
 #include <soc/gpio.h>
 #include <soc/pinmux.h>
 #include <stdlib.h>
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index b200855abd74..522d64796a52 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 <assert.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
 
diff --git a/src/superio/smsc/lpc47n227/early_serial.c b/src/superio/smsc/lpc47n227/early_serial.c
index c02b8506d1fd..42213b74ccbb 100644
--- a/src/superio/smsc/lpc47n227/early_serial.c
+++ b/src/superio/smsc/lpc47n227/early_serial.c
@@ -17,7 +17,9 @@
 /* Pre-RAM driver for SMSC LPC47N227 Super I/O chip. */
 
 #include <arch/io.h>
+#include <assert.h>
 #include <device/pnp_ops.h>
+
 #include "lpc47n227.h"
 
 void pnp_enter_conf_state(pnp_devfn_t dev)