aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/cpu/arm926ejs/spear/spr_misc.c1
-rw-r--r--arch/arm/mach-davinci/misc.c1
-rw-r--r--arch/arm/mach-imx/cmd_dek.c1
-rw-r--r--arch/arm/mach-imx/mx6/opos6ul.c1
-rw-r--r--arch/arm/mach-meson/board-common.c1
-rw-r--r--arch/arm/mach-omap2/boot-common.c1
-rw-r--r--arch/arm/mach-omap2/omap3/clock.c1
-rw-r--r--arch/arm/mach-omap2/utils.c1
-rw-r--r--arch/arm/mach-stm32mp/cpu.c1
-rw-r--r--arch/arm/mach-tegra/cboot.c1
-rw-r--r--arch/m68k/lib/bootm.c1
-rw-r--r--arch/nds32/include/asm/u-boot.h1
-rw-r--r--arch/powerpc/cpu/mpc85xx/fdt.c1
-rw-r--r--arch/powerpc/lib/bootm.c1
-rw-r--r--arch/riscv/include/asm/u-boot.h1
-rw-r--r--board/Arcturus/ucp1020/cmd_arc.c1
-rw-r--r--board/CZ.NIC/turris_mox/turris_mox.c1
-rw-r--r--board/CZ.NIC/turris_omnia/turris_omnia.c1
-rw-r--r--board/LaCie/net2big_v2/net2big_v2.c1
-rw-r--r--board/LaCie/netspace_v2/netspace_v2.c1
-rw-r--r--board/amlogic/p200/p200.c1
-rw-r--r--board/amlogic/p201/p201.c1
-rw-r--r--board/amlogic/p212/p212.c1
-rw-r--r--board/amlogic/q200/q200.c1
-rw-r--r--board/amlogic/s400/s400.c1
-rw-r--r--board/amlogic/u200/u200.c1
-rw-r--r--board/armadeus/apf27/apf27.c1
-rw-r--r--board/atmel/common/mac_eeprom.c1
-rw-r--r--board/birdland/bav335x/board.c1
-rw-r--r--board/bosch/guardian/board.c1
-rw-r--r--board/bosch/shc/board.c1
-rw-r--r--board/compulab/cl-som-imx7/cl-som-imx7.c1
-rw-r--r--board/compulab/cm_fx6/cm_fx6.c1
-rw-r--r--board/compulab/cm_t335/cm_t335.c1
-rw-r--r--board/compulab/cm_t35/cm_t35.c1
-rw-r--r--board/compulab/cm_t54/cm_t54.c1
-rw-r--r--board/davinci/da8xxevm/da850evm.c1
-rw-r--r--board/dhelectronics/dh_imx6/dh_imx6.c1
-rw-r--r--board/eets/pdu001/board.c1
-rw-r--r--board/freescale/imx8qm_mek/imx8qm_mek.c1
-rw-r--r--board/freescale/imx8qxp_mek/imx8qxp_mek.c1
-rw-r--r--board/gateworks/gw_ventana/gw_ventana.c1
-rw-r--r--board/gateworks/gw_ventana/gw_ventana_spl.c1
-rw-r--r--board/ge/mx53ppd/mx53ppd.c1
-rw-r--r--board/grinn/chiliboard/board.c1
-rw-r--r--board/gumstix/pepper/board.c1
-rw-r--r--board/imgtec/ci20/ci20.c1
-rw-r--r--board/intel/edison/edison.c1
-rw-r--r--board/isee/igep003x/board.c1
-rw-r--r--board/k+p/kp_imx53/kp_id_rev.c1
-rw-r--r--board/kosagi/novena/novena.c1
-rw-r--r--board/liebherr/display5/display5.c1
-rw-r--r--board/liebherr/display5/spl.c1
-rw-r--r--board/logicpd/zoom1/zoom1.c1
-rw-r--r--board/mscc/ocelot/ocelot.c1
-rw-r--r--board/nvidia/p2371-2180/p2371-2180.c1
-rw-r--r--board/nvidia/p2771-0000/p2771-0000.c1
-rw-r--r--board/phytec/pcm051/board.c1
-rw-r--r--board/phytec/pcm052/pcm052.c1
-rw-r--r--board/phytec/phycore_rk3288/phycore-rk3288.c1
-rw-r--r--board/qualcomm/dragonboard410c/dragonboard410c.c1
-rw-r--r--board/raspberrypi/rpi/rpi.c1
-rw-r--r--board/renesas/blanche/blanche.c1
-rw-r--r--board/renesas/sh7752evb/sh7752evb.c1
-rw-r--r--board/renesas/sh7753evb/sh7753evb.c1
-rw-r--r--board/renesas/sh7757lcr/sh7757lcr.c1
-rw-r--r--board/rockchip/tinker_rk3288/tinker-rk3288.c1
-rw-r--r--board/samtec/vining_fpga/socfpga.c1
-rw-r--r--board/siemens/common/factoryset.c1
-rw-r--r--board/siemens/pxm2/board.c1
-rw-r--r--board/siemens/taurus/taurus.c1
-rw-r--r--board/silica/pengwyn/board.c1
-rw-r--r--board/softing/vining_2000/vining_2000.c1
-rw-r--r--board/tcl/sl50/board.c1
-rw-r--r--board/technologic/ts4800/ts4800.c1
-rw-r--r--board/theobroma-systems/puma_rk3399/puma-rk3399.c1
-rw-r--r--board/ti/am335x/board.c1
-rw-r--r--board/ti/am43xx/board.c1
-rw-r--r--board/ti/am57xx/board.c1
-rw-r--r--board/ti/dra7xx/evm.c1
-rw-r--r--board/ti/ti814x/evm.c1
-rw-r--r--board/ti/ti816x/evm.c1
-rw-r--r--board/timll/devkit8000/devkit8000.c1
-rw-r--r--board/toradex/apalis-imx8/apalis-imx8.c1
-rw-r--r--board/toradex/apalis_imx6/apalis_imx6.c1
-rw-r--r--board/toradex/colibri-imx8x/colibri-imx8x.c1
-rw-r--r--board/toradex/colibri_imx6/colibri_imx6.c1
-rw-r--r--board/toradex/common/tdx-common.c1
-rw-r--r--board/vscom/baltos/board.c1
-rw-r--r--cmd/aes.c1
-rw-r--r--cmd/blob.c1
-rw-r--r--cmd/bootm.c1
-rw-r--r--cmd/efidebug.c1
-rw-r--r--cmd/elf.c1
-rw-r--r--cmd/ethsw.c2
-rw-r--r--cmd/i2c.c1
-rw-r--r--cmd/ini.c1
-rw-r--r--cmd/tpm_test.c1
-rw-r--r--common/image.c1
-rw-r--r--common/spl/spl_dfu.c1
-rw-r--r--drivers/bootcount/bootcount_env.c1
-rw-r--r--drivers/mtd/jedec_flash.c1
-rw-r--r--drivers/net/fec_mxc.c1
-rw-r--r--drivers/net/fm/fm.c1
-rw-r--r--drivers/net/fsl_mcdmafec.c1
-rw-r--r--drivers/net/mcffec.c1
-rw-r--r--drivers/net/ne2000_base.c1
-rw-r--r--drivers/net/sh_eth.c1
-rw-r--r--drivers/net/ti/cpsw-common.c1
-rw-r--r--drivers/qe/qe.c1
-rw-r--r--drivers/usb/gadget/ether.c1
-rw-r--r--lib/efi_loader/efi_boottime.c1
-rw-r--r--net/eth-uclass.c1
-rw-r--r--net/eth_common.c1
-rw-r--r--net/eth_legacy.c1
-rw-r--r--net/wol.c1
116 files changed, 1 insertions, 116 deletions
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 533268513ee..d36484c9d69 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <command.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <net.h>
#include <linux/mtd/st_smi.h>
diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index b310bc7293e..80e964274e1 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -10,7 +10,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <net.h>
#include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 463b869420b..1b111ba26b1 100644
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <command.h>
-#include <environment.h>
#include <malloc.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index 183a0c961c4..3ab9a3f022f 100644
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -14,7 +14,6 @@
#include <asm/io.h>
#include <common.h>
#include <env.h>
-#include <environment.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 08a7aae2b9f..0843dca156c 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -8,7 +8,6 @@
#include <env.h>
#include <linux/libfdt.h>
#include <linux/err.h>
-#include <environment.h>
#include <asm/arch/mem.h>
#include <asm/arch/sm.h>
#include <asm/armv8/mmu.h>
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index c8b8ac657fb..eb8c5843faf 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <ahci.h>
-#include <environment.h>
#include <spl.h>
#include <asm/omap_common.h>
#include <asm/arch/omap.h>
diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c
index cb9e91ebc3b..71f73492c6c 100644
--- a/arch/arm/mach-omap2/omap3/clock.c
+++ b/arch/arm/mach-omap2/omap3/clock.c
@@ -17,7 +17,6 @@
#include <asm/arch/clocks_omap3.h>
#include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h>
-#include <environment.h>
#include <command.h>
/******************************************************************************
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 5478416e9c8..0d5ca20e8e8 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -5,7 +5,6 @@
*/
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <asm/setup.h>
#include <asm/arch/sys_proto.h>
#include <asm/omap_common.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index b06b84c315e..a46e8438f7c 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -6,7 +6,6 @@
#include <clk.h>
#include <debug_uart.h>
#include <env.h>
-#include <environment.h>
#include <misc.h>
#include <asm/io.h>
#include <asm/arch/stm32.h>
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index bd4f33686da..0433081c6c5 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <fdt_support.h>
#include <fdtdec.h>
#include <stdlib.h>
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 5b7a68b2501..19445b3fc7a 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -11,7 +11,6 @@
#include <u-boot/zlib.h>
#include <bzlib.h>
#include <watchdog.h>
-#include <environment.h>
#include <asm/byteorder.h>
#ifdef CONFIG_SHOW_BOOT_PROGRESS
# include <status_led.h>
diff --git a/arch/nds32/include/asm/u-boot.h b/arch/nds32/include/asm/u-boot.h
index 68701d6da9a..8c949e7fb71 100644
--- a/arch/nds32/include/asm/u-boot.h
+++ b/arch/nds32/include/asm/u-boot.h
@@ -21,7 +21,6 @@
#include <asm/u-boot-nds32.h>
-#include <environment.h>
typedef struct bd_info {
unsigned long bi_arch_number; /* unique id for this board */
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index d17c382cc9f..db12aefb290 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
#include <asm/processor.h>
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 52bcd4e6f16..84691b75546 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -15,7 +15,6 @@
#include <malloc.h>
#include <u-boot/zlib.h>
#include <bzlib.h>
-#include <environment.h>
#include <asm/byteorder.h>
#include <asm/mp.h>
#include <bootm.h>
diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h
index 3186835e0ad..5ba8e778128 100644
--- a/arch/riscv/include/asm/u-boot.h
+++ b/arch/riscv/include/asm/u-boot.h
@@ -20,7 +20,6 @@
#include <asm/u-boot-riscv.h>
-#include <environment.h>
typedef struct bd_info {
unsigned long bi_boot_params; /* where this board expects params */
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 755f569d131..2e8477ed3b7 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -15,7 +15,6 @@
#include <spi_flash.h>
#include <mmc.h>
#include <version.h>
-#include <environment.h>
#include <asm/io.h>
static ulong fwenv_addr[MAX_FWENV_ADDR];
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index f3c89d63d54..946e20ab492 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -15,7 +15,6 @@
#include <linux/string.h>
#include <linux/libfdt.h>
#include <fdt_support.h>
-#include <environment.h>
#include "mox_sp.h"
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 418657c2d57..1d8d08a847d 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <miiphy.h>
#include <netdev.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 1609089502c..686608d25a5 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -11,7 +11,6 @@
#include <common.h>
#include <command.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <asm/mach-types.h>
#include <asm/arch/cpu.h>
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index ba667934e42..bd7ab22948b 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -11,7 +11,6 @@
#include <common.h>
#include <command.h>
#include <env.h>
-#include <environment.h>
#include <asm/mach-types.h>
#include <asm/arch/cpu.h>
#include <asm/arch/soc.h>
diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c
index 7f33ce0f0bb..41d331dda2d 100644
--- a/board/amlogic/p200/p200.c
+++ b/board/amlogic/p200/p200.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/arch/gx.h>
#include <asm/arch/sm.h>
diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c
index 0a17fbedf1d..e46fcaea6dc 100644
--- a/board/amlogic/p201/p201.c
+++ b/board/amlogic/p201/p201.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/arch/gx.h>
#include <asm/arch/sm.h>
diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
index 4d6ac7264cc..094ab5478d0 100644
--- a/board/amlogic/p212/p212.c
+++ b/board/amlogic/p212/p212.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/arch/gx.h>
#include <asm/arch/sm.h>
diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
index 880945f143b..f1faa7418e0 100644
--- a/board/amlogic/q200/q200.c
+++ b/board/amlogic/q200/q200.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/arch/gx.h>
#include <asm/arch/mem.h>
diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c
index 02a0e9286cb..bdb4eca8839 100644
--- a/board/amlogic/s400/s400.c
+++ b/board/amlogic/s400/s400.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <dm.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/arch/axg.h>
#include <asm/arch/sm.h>
diff --git a/board/amlogic/u200/u200.c b/board/amlogic/u200/u200.c
index 94ee3ce6e45..69fd29d4fec 100644
--- a/board/amlogic/u200/u200.c
+++ b/board/amlogic/u200/u200.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <dm.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/arch/axg.h>
#include <asm/arch/sm.h>
diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index bf2586d326a..20be0c3bd4e 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -7,7 +7,6 @@
*/
#include <common.h>
-#include <environment.h>
#include <jffs2/jffs2.h>
#include <nand.h>
#include <netdev.h>
diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c
index f016ef7a6a7..83a7778e995 100644
--- a/board/atmel/common/mac_eeprom.c
+++ b/board/atmel/common/mac_eeprom.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <i2c_eeprom.h>
#include <netdev.h>
diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c
index b0339ad8f02..9e64cbbc827 100644
--- a/board/birdland/bav335x/board.c
+++ b/board/birdland/bav335x/board.c
@@ -30,7 +30,6 @@
#include <power/tps65910.h>
#include <environment.h>
#include <watchdog.h>
-#include <environment.h>
#include "board.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 86ab180f5cd..bc3c6d229c2 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -12,7 +12,6 @@
#include <cpsw.h>
#include <dm.h>
#include <environment.h>
-#include <environment.h>
#include <errno.h>
#include <i2c.h>
#include <miiphy.h>
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 29be3739f91..358118f7577 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -33,7 +33,6 @@
#include <power/tps65217.h>
#include <environment.h>
#include <watchdog.h>
-#include <environment.h>
#include "mmc.h"
#include "board.h"
diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 6cc7554c1a4..395d5dce178 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <mmc.h>
#include <phy.h>
#include <netdev.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 57bbe41b8c9..feb7a71f007 100644
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -12,7 +12,6 @@
#include <dm.h>
#include <dwc_ahsata.h>
#include <env.h>
-#include <environment.h>
#include <fsl_esdhc_imx.h>
#include <miiphy.h>
#include <mtd_node.h>
diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index fca7685ca7a..6e38745191c 100644
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <miiphy.h>
#include <cpsw.h>
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index ead47006463..b52358baacd 100644
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -13,7 +13,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <status_led.h>
#include <netdev.h>
#include <net.h>
diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c
index d7c59d5a32a..811bbb528a8 100644
--- a/board/compulab/cm_t54/cm_t54.c
+++ b/board/compulab/cm_t54/cm_t54.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <fdt_support.h>
#include <usb.h>
#include <mmc.h>
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index d3f3819f112..d9019de6e00 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -11,7 +11,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <net.h>
#include <spi.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 1994dec8f99..2d0f78da118 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -22,7 +22,6 @@
#include <ahci.h>
#include <dwc_ahsata.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <fsl_esdhc_imx.h>
#include <fuse.h>
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index 74a66842748..8a3d0ada270 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -14,7 +14,6 @@
#include <errno.h>
#include <spl.h>
#include <i2c.h>
-#include <environment.h>
#include <watchdog.h>
#include <debug_uart.h>
#include <dm/ofnode.h>
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index f4b0ffc59de..76634a3a28a 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -7,7 +7,6 @@
#include <env.h>
#include <errno.h>
#include <linux/libfdt.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/gpio.h>
#include <asm/arch/clock.h>
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 26bbbca8fc6..4ba83142841 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -7,7 +7,6 @@
#include <env.h>
#include <errno.h>
#include <linux/libfdt.h>
-#include <environment.h>
#include <fsl_esdhc_imx.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 3c40a4a8922..8a694a71c90 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -22,7 +22,6 @@
#include <dm.h>
#include <dm/platform_data/serial_mxc.h>
#include <env.h>
-#include <environment.h>
#include <hwconfig.h>
#include <i2c.h>
#include <fdt_support.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 6886ff9b33b..b0891379a17 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -15,7 +15,6 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <spl.h>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index aadf4668d98..54485672982 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -21,7 +21,6 @@
#include <linux/libfdt.h>
#include <asm/mach-imx/mxc_i2c.h>
#include <asm/mach-imx/mx5_video.h>
-#include <environment.h>
#include <netdev.h>
#include <i2c.h>
#include <mmc.h>
diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 6b9e6e9a098..c6d53600fa1 100644
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -17,7 +17,6 @@
#include <asm/io.h>
#include <cpsw.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <miiphy.h>
#include <spl.h>
diff --git a/board/gumstix/pepper/board.c b/board/gumstix/pepper/board.c
index 7ae4c5cd77f..f5beb8c940e 100644
--- a/board/gumstix/pepper/board.c
+++ b/board/gumstix/pepper/board.c
@@ -26,7 +26,6 @@
#include <miiphy.h>
#include <cpsw.h>
#include <power/tps65217.h>
-#include <environment.h>
#include <watchdog.h>
#include "board.h"
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index f72a660581c..5368b67b38b 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <net.h>
#include <netdev.h>
#include <asm/io.h>
diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index f8f498d0884..f56b5b1affe 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <dwc3-uboot.h>
#include <env.h>
-#include <environment.h>
#include <mmc.h>
#include <u-boot/md5.h>
#include <usb.h>
diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 398c9459909..a8c2b121a47 100644
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -26,7 +26,6 @@
#include <fdt_support.h>
#include <mtd_node.h>
#include <jffs2/load_kernel.h>
-#include <environment.h>
#include "board.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 642adf78d8c..9dae54dda5f 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -11,7 +11,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include "kp_id_rev.h"
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index e0f0d7c60c0..b7b747d1965 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -25,7 +25,6 @@
#include <asm/mach-imx/sata.h>
#include <asm/mach-imx/video.h>
#include <dwc_ahsata.h>
-#include <environment.h>
#include <fsl_esdhc_imx.h>
#include <i2c.h>
#include <input.h>
diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index 5c70e1b6f28..037c4e69e59 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -26,7 +26,6 @@
#include <miiphy.h>
#include <netdev.h>
#include <i2c.h>
-#include <environment.h>
#include <dm.h>
#include <dm/platform_data/serial_mxc.h>
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index d92760b4870..354b63e431f 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -18,7 +18,6 @@
#include "asm/arch/iomux.h"
#include <asm/mach-imx/iomux-v3.h>
#include <asm/gpio.h>
-#include <environment.h>
#include <fsl_esdhc_imx.h>
#include <netdev.h>
#include <bootcount.h>
diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
index 54716125f38..6bfa41737f6 100644
--- a/board/logicpd/zoom1/zoom1.c
+++ b/board/logicpd/zoom1/zoom1.c
@@ -16,7 +16,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <ns16550.h>
#include <netdev.h>
#include <twl4030.h>
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index bcae8fa50ca..91d03951dbb 100644
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -7,7 +7,6 @@
#include <asm/io.h>
#include <asm/addrspace.h>
#include <asm/types.h>
-#include <environment.h>
#include <spi.h>
#include <led.h>
#include <wait_bit.h>
diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index b1da5c9982d..fa5288bf185 100644
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <fdtdec.h>
#include <i2c.h>
#include <linux/libfdt.h>
diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index 8c91b75f967..63cdb3a604b 100644
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <fdtdec.h>
#include <i2c.h>
#include <linux/libfdt.h>
diff --git a/board/phytec/pcm051/board.c b/board/phytec/pcm051/board.c
index 0cb85e940c4..43f6c5afcb8 100644
--- a/board/phytec/pcm051/board.c
+++ b/board/phytec/pcm051/board.c
@@ -10,7 +10,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <spl.h>
#include <asm/arch/cpu.h>
diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index 2417111765f..e1ebe8e75d0 100644
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -15,7 +15,6 @@
#include <asm/arch/clock.h>
#include <env.h>
#include <led.h>
-#include <environment.h>
#include <miiphy.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index 9f945e829d8..7b9178e3a69 100644
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -9,7 +9,6 @@
#include <dm.h>
#include <env.h>
#include <environment.h>
-#include <fdtdec.h>
#include <i2c.h>
#include <i2c_eeprom.h>
#include <netdev.h>
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 06d3d7e0f85..d7f0f93fb10 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -11,7 +11,6 @@
#include <usb.h>
#include <asm/gpio.h>
#include <fdt_support.h>
-#include <environment.h>
#include <asm/arch/dram.h>
#include <asm/arch/misc.h>
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 104589bff16..7a6ca8f759e 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -7,7 +7,6 @@
#include <config.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <efi_loader.h>
#include <fdt_support.h>
#include <fdt_simplefb.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 898abfbd85f..08c54486095 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -19,7 +19,6 @@
#include <dm.h>
#include <dm/platform_data/serial_sh.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <linux/errno.h>
#include <malloc.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index b14ce263f78..d0b850f35d4 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <malloc.h>
#include <asm/processor.h>
#include <asm/io.h>
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index f643867806b..e1bed7dcc37 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <malloc.h>
#include <asm/processor.h>
#include <asm/io.h>
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index 2d32440aeb3..d2671202e98 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <malloc.h>
#include <asm/processor.h>
#include <asm/io.h>
diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
index e379950095b..6c76c3c25c4 100644
--- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
+++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <i2c_eeprom.h>
#include <netdev.h>
diff --git a/board/samtec/vining_fpga/socfpga.c b/board/samtec/vining_fpga/socfpga.c
index 63ce4a20b5d..1e095a4e7db 100644
--- a/board/samtec/vining_fpga/socfpga.c
+++ b/board/samtec/vining_fpga/socfpga.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <asm/arch/reset_manager.h>
#include <asm/io.h>
#include <asm/gpio.h>
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index cd224a8e1c1..049a65ff778 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 0a82a5ef5c5..30f0902701e 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -14,7 +14,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <spl.h>
#include <asm/arch/cpu.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index d0efb67bbc1..1cf1f9e1f7c 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -15,7 +15,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <asm/io.h>
#include <asm/arch/at91sam9260_matrix.h>
#include <asm/arch/at91sam9_smc.h>
diff --git a/board/silica/pengwyn/board.c b/board/silica/pengwyn/board.c
index dc10b76160a..345701fd52c 100644
--- a/board/silica/pengwyn/board.c
+++ b/board/silica/pengwyn/board.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <asm/arch/cpu.h>
#include <asm/arch/hardware.h>
#include <asm/arch/ddr_defs.h>
diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index d1df8fc0cc6..51985b91c22 100644
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -19,7 +19,6 @@
#include <env.h>
#include <linux/sizes.h>
#include <common.h>
-#include <environment.h>
#include <fsl_esdhc_imx.h>
#include <mmc.h>
#include <i2c.h>
diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 8ddbee54363..a9c9d377b4f 100644
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -30,7 +30,6 @@
#include <power/tps65910.h>
#include <environment.h>
#include <watchdog.h>
-#include <environment.h>
#include "board.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index 38d3a3de26e..82eb0c285cc 100644
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -17,7 +17,6 @@
#include <asm/arch/crm_regs.h>
#include <asm/arch/clock.h>
#include <asm/mach-imx/mx5_video.h>
-#include <environment.h>
#include <mmc.h>
#include <input.h>
#include <fsl_esdhc_imx.h>
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index a00587c3fa4..4113a1c6ee0 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <misc.h>
#include <spl.h>
#include <syscon.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 58d09f7c20f..54adcd510de 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -36,7 +36,6 @@
#include <power/tps65910.h>
#include <environment.h>
#include <watchdog.h>
-#include <environment.h>
#include "../common/board_detect.h"
#include "board.h"
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 756b516aa6b..2e09cc20e8c 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <i2c.h>
#include <linux/errno.h>
#include <spl.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 0dacfd43277..f78e6c2e1f6 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -24,7 +24,6 @@
#include <asm/arch/sata.h>
#include <asm/arch/gpio.h>
#include <asm/arch/omap.h>
-#include <environment.h>
#include <usb.h>
#include <linux/usb/gadget.h>
#include <dwc3-uboot.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 97eef65d51a..74d04bb1e39 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -25,7 +25,6 @@
#include <asm/arch/sys_proto.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/sata.h>
-#include <environment.h>
#include <dwc3-uboot.h>
#include <dwc3-omap-uboot.h>
#include <i2c.h>
diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c
index a4c094b6dc2..2b9385d14b4 100644
--- a/board/ti/ti814x/evm.c
+++ b/board/ti/ti814x/evm.c
@@ -10,7 +10,6 @@
#include <common.h>
#include <cpsw.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <spl.h>
#include <asm/arch/cpu.h>
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index de9e91a685b..8f7b591b5c4 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <spl.h>
#include <asm/cache.h>
#include <asm/io.h>
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index f8970b0b6dd..490d8cbcd06 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -18,7 +18,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <ns16550.h>
#include <twl4030.h>
#include <asm/io.h>
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index a770472e17f..af48b560952 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -13,7 +13,6 @@
#include <asm/gpio.h>
#include <asm/io.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <linux/libfdt.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 89f1b728fd4..6421a22c25a 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -27,7 +27,6 @@
#include <dm/platform_data/serial_mxc.h>
#include <dwc_ahsata.h>
#include <env.h>
-#include <environment.h>
#include <fsl_esdhc_imx.h>
#include <imx_thermal.h>
#include <micrel.h>
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 69628b906cf..eae3c591a16 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -13,7 +13,6 @@
#include <asm/gpio.h>
#include <asm/io.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <linux/libfdt.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index f657db87d8f..ad40b589c1e 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -25,7 +25,6 @@
#include <asm/mach-imx/video.h>
#include <cpu.h>
#include <dm/platform_data/serial_mxc.h>
-#include <environment.h>
#include <fsl_esdhc_imx.h>
#include <imx_thermal.h>
#include <micrel.h>
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 71642a13ea1..e9441a7979d 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <g_dnl.h>
#include <linux/libfdt.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 5f5a51bfbf5..f5540841c9f 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -29,7 +29,6 @@
#include <miiphy.h>
#include <cpsw.h>
#include <power/tps65910.h>
-#include <environment.h>
#include <watchdog.h>
#include "board.h"
diff --git a/cmd/aes.c b/cmd/aes.c
index 25efb9642a2..7ff4a717093 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <command.h>
-#include <environment.h>
#include <uboot_aes.h>
#include <malloc.h>
#include <asm/byteorder.h>
diff --git a/cmd/blob.c b/cmd/blob.c
index d3b6e454bf4..80478b8802d 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <command.h>
-#include <environment.h>
#include <malloc.h>
#include <asm/byteorder.h>
#include <linux/compiler.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index b326ac9b431..8279f2b7cc6 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -11,7 +11,6 @@
#include <bootm.h>
#include <command.h>
#include <env.h>
-#include <environment.h>
#include <errno.h>
#include <image.h>
#include <malloc.h>
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 961e8fad22b..ef97e19d073 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <command.h>
#include <efi_loader.h>
-#include <environment.h>
#include <exports.h>
#include <hexdump.h>
#include <malloc.h>
diff --git a/cmd/elf.c b/cmd/elf.c
index 5e5cf47cf89..538562fda58 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -17,7 +17,6 @@
#include <command.h>
#include <elf.h>
#include <env.h>
-#include <environment.h>
#include <net.h>
#include <vxworks.h>
#ifdef CONFIG_X86
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 473324f8782..88468057997 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -7,7 +7,7 @@
#include <common.h>
#include <command.h>
-#include <environment.h>
+#include <env.h>
#include <errno.h>
#include <env_flags.h>
#include <ethsw.h>
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 09c4ba9a1c7..e0f8ece597c 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -71,7 +71,6 @@
#include <console.h>
#include <dm.h>
#include <edid.h>
-#include <environment.h>
#include <errno.h>
#include <i2c.h>
#include <malloc.h>
diff --git a/cmd/ini.c b/cmd/ini.c
index f4faa7cae1b..0c425262d0e 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -14,7 +14,6 @@
#include <common.h>
#include <command.h>
#include <env.h>
-#include <environment.h>
#include <linux/ctype.h>
#include <linux/string.h>
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 56a5aa4aa5e..c14dd75a260 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -5,7 +5,6 @@
#include <common.h>
#include <command.h>
-#include <environment.h>
#include <tpm-v1.h>
#include "tpm-user-utils.h"
diff --git a/common/image.c b/common/image.c
index 4a578f3ef08..84e859a30f4 100644
--- a/common/image.c
+++ b/common/image.c
@@ -17,7 +17,6 @@
#include <rtc.h>
-#include <environment.h>
#include <gzip.h>
#include <image.h>
#include <mapmem.h>
diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index 3f54ae02601..5728d43ad3f 100644
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -15,7 +15,6 @@
#include <g_dnl.h>
#include <usb.h>
#include <dfu.h>
-#include <environment.h>
static int run_dfu(int usb_index, char *interface, char *devstring)
{
diff --git a/drivers/bootcount/bootcount_env.c b/drivers/bootcount/bootcount_env.c
index 50e0857b3bf..b75c9002b2c 100644
--- a/drivers/bootcount/bootcount_env.c
+++ b/drivers/bootcount/bootcount_env.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
void bootcount_store(ulong a)
{
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index a3540c11152..f59b2bc62fb 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -15,7 +15,6 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <environment.h>
#define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index a8b141aba2b..080dbcf7db4 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -10,7 +10,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <malloc.h>
#include <memalign.h>
#include <miiphy.h>
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index ce0f1678fd0..4c9dce8dc57 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -15,7 +15,6 @@
#include <nand.h>
#include <spi_flash.h>
#include <mmc.h>
-#include <environment.h>
#ifdef CONFIG_ARM64
#include <asm/armv8/mmu.h>
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 41752c0b6af..e66fb16de87 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <malloc.h>
#include <command.h>
#include <config.h>
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index a8553cbbc2f..fb930412569 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -9,7 +9,6 @@
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <malloc.h>
#include <command.h>
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 3bc7a35086d..819a2460700 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -75,7 +75,6 @@ Add SNMP
#include <common.h>
#include <command.h>
#include <env.h>
-#include <environment.h>
#include <net.h>
#include <malloc.h>
#include <linux/compiler.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index e2ca4749f70..749f6519208 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -11,7 +11,6 @@
#include <config.h>
#include <common.h>
#include <env.h>
-#include <environment.h>
#include <malloc.h>
#include <net.h>
#include <netdev.h>
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index ac12cfe9b86..21b8bbda3d5 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <dm.h>
-#include <environment.h>
#include <fdt_support.h>
#include <asm/io.h>
#include <cpsw.h>
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 505ae9b45fb..6e4d732a07a 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -14,7 +14,6 @@
#include <linux/immap_qe.h>
#include <fsl_qe.h>
#include <mmc.h>
-#include <environment.h>
#ifdef CONFIG_ARCH_LS1021A
#include <asm/arch/immap_ls102xa.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index fa49d3126f0..a118283984c 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -10,7 +10,6 @@
#include <common.h>
#include <console.h>
#include <env.h>
-#include <environment.h>
#include <linux/errno.h>
#include <linux/netdevice.h>
#include <linux/usb/ch9.h>
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index f75ca1a67c9..b9bff894cbb 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <div64.h>
#include <efi_loader.h>
-#include <environment.h>
#include <malloc.h>
#include <linux/libfdt_env.h>
#include <u-boot/crc.h>
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 4e4f4724312..1d5d2f03b7d 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <net.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index dcc59186d89..ed26b1b6935 100644
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <dm.h>
#include <env.h>
-#include <environment.h>
#include <miiphy.h>
#include <net.h>
#include "eth_internal.h"
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 0f558b23ce1..850f362d873 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -8,7 +8,6 @@
#include <common.h>
#include <command.h>
#include <env.h>
-#include <environment.h>
#include <net.h>
#include <phy.h>
#include <linux/errno.h>
diff --git a/net/wol.c b/net/wol.c
index 51543343e40..0a625668a99 100644
--- a/net/wol.c
+++ b/net/wol.c
@@ -7,7 +7,6 @@
#include <command.h>
#include <env.h>
#include <net.h>
-#include <environment.h>
#include "wol.h"
static ulong wol_timeout = WOL_DEFAULT_TIMEOUT;