All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH 10/16] common: Drop vsprintf.h from common header
Date: Sun,  2 Aug 2020 16:59:34 -0600	[thread overview]
Message-ID: <20200802225940.51457-11-sjg@chromium.org> (raw)
In-Reply-To: <20200802225940.51457-1-sjg@chromium.org>

Move this out of the common header and include it only where needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 api/api.c                                              | 1 +
 arch/arc/lib/cache.c                                   | 1 +
 arch/arc/lib/interrupts.c                              | 1 +
 arch/arm/cpu/arm926ejs/spear/spr_misc.c                | 1 +
 arch/arm/cpu/armv7/ls102xa/fdt.c                       | 1 +
 arch/arm/cpu/armv8/cache_v8.c                          | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c   | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                 | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                | 1 +
 arch/arm/lib/bootm.c                                   | 1 +
 arch/arm/lib/interrupts_64.c                           | 1 +
 arch/arm/lib/interrupts_m.c                            | 1 +
 arch/arm/lib/semihosting.c                             | 1 +
 arch/arm/mach-imx/cmd_dek.c                            | 1 +
 arch/arm/mach-imx/cmd_nandbcb.c                        | 1 +
 arch/arm/mach-imx/hab.c                                | 1 +
 arch/arm/mach-imx/i2c-mxv7.c                           | 1 +
 arch/arm/mach-imx/imx8/ahab.c                          | 1 +
 arch/arm/mach-imx/imx8/snvs_security_sc.c              | 1 +
 arch/arm/mach-imx/imx8m/soc.c                          | 1 +
 arch/arm/mach-imx/imx_bootaux.c                        | 1 +
 arch/arm/mach-imx/mx6/mp.c                             | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                         | 1 +
 arch/arm/mach-k3/am6_init.c                            | 1 +
 arch/arm/mach-k3/common.c                              | 1 +
 arch/arm/mach-k3/j721e_init.c                          | 1 +
 arch/arm/mach-k3/sysfw-loader.c                        | 1 +
 arch/arm/mach-keystone/cmd_clock.c                     | 1 +
 arch/arm/mach-keystone/cmd_mon.c                       | 1 +
 arch/arm/mach-keystone/ddr3.c                          | 1 +
 arch/arm/mach-keystone/keystone.c                      | 1 +
 arch/arm/mach-kirkwood/cpu.c                           | 1 +
 arch/arm/mach-meson/sm.c                               | 1 +
 arch/arm/mach-nexell/clock.c                           | 1 +
 arch/arm/mach-omap2/emif-common.c                      | 1 +
 arch/arm/mach-omap2/sec-common.c                       | 1 +
 arch/arm/mach-omap2/utils.c                            | 1 +
 arch/arm/mach-orion5x/cpu.c                            | 1 +
 arch/arm/mach-rockchip/misc.c                          | 1 +
 arch/arm/mach-snapdragon/misc.c                        | 1 +
 arch/arm/mach-snapdragon/pinctrl-apq8016.c             | 3 ++-
 arch/arm/mach-snapdragon/pinctrl-apq8096.c             | 3 ++-
 arch/arm/mach-socfpga/misc.c                           | 1 +
 arch/arm/mach-socfpga/misc_s10.c                       | 1 +
 arch/arm/mach-stm32mp/cmd_stm32key.c                   | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c    | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c        | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h        | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c | 1 +
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c    | 1 +
 arch/arm/mach-stm32mp/cpu.c                            | 1 +
 arch/arm/mach-sunxi/board.c                            | 1 +
 arch/arm/mach-sunxi/dram_helpers.c                     | 1 +
 arch/arm/mach-sunxi/dram_sun4i.c                       | 1 +
 arch/arm/mach-sunxi/dram_sun50i_h6.c                   | 1 +
 arch/arm/mach-sunxi/dram_sun6i.c                       | 1 +
 arch/arm/mach-sunxi/dram_sunxi_dw.c                    | 1 +
 arch/arm/mach-uniphier/board_late_init.c               | 1 +
 arch/arm/mach-zynqmp/mp.c                              | 1 +
 arch/mips/lib/bootm.c                                  | 1 +
 arch/mips/lib/reloc.c                                  | 1 +
 arch/nds32/cpu/n1213/ae3xx/cpu.c                       | 1 +
 arch/nds32/lib/bootm.c                                 | 1 +
 arch/nds32/lib/interrupts.c                            | 1 +
 arch/nios2/lib/bootm.c                                 | 1 +
 arch/powerpc/cpu/mpc83xx/ecc.c                         | 1 +
 arch/powerpc/cpu/mpc83xx/traps.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/commproc.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init.c                    | 1 +
 arch/powerpc/cpu/mpc85xx/ether_fcc.c                   | 1 +
 arch/powerpc/cpu/mpc85xx/fdt.c                         | 1 +
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c          | 1 +
 arch/powerpc/cpu/mpc85xx/liodn.c                       | 1 +
 arch/powerpc/cpu/mpc85xx/mp.c                          | 1 +
 arch/powerpc/cpu/mpc85xx/portals.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/traps.c                       | 1 +
 arch/powerpc/cpu/mpc86xx/traps.c                       | 1 +
 arch/powerpc/cpu/mpc8xx/immap.c                        | 1 +
 arch/powerpc/cpu/mpc8xx/traps.c                        | 1 +
 arch/riscv/lib/spl.c                                   | 1 +
 arch/sandbox/cpu/os.c                                  | 1 +
 arch/sandbox/cpu/start.c                               | 1 +
 arch/sh/lib/bootm.c                                    | 1 +
 arch/sh/lib/zimageboot.c                               | 1 +
 arch/x86/cpu/coreboot/sdram.c                          | 1 +
 arch/x86/cpu/efi/payload.c                             | 1 +
 arch/x86/cpu/intel_common/mrc.c                        | 1 +
 arch/x86/cpu/qfw_cpu.c                                 | 1 +
 arch/x86/cpu/slimbootloader/sdram.c                    | 1 +
 arch/x86/cpu/slimbootloader/serial.c                   | 1 +
 arch/x86/cpu/slimbootloader/slimbootloader.c           | 1 +
 arch/x86/cpu/tangier/acpi.c                            | 1 +
 arch/x86/lib/fsp1/fsp_common.c                         | 1 +
 arch/x86/lib/fsp1/fsp_support.c                        | 1 +
 arch/x86/lib/ramtest.c                                 | 1 +
 arch/x86/lib/relocate.c                                | 1 +
 arch/x86/lib/tpl.c                                     | 1 +
 arch/x86/lib/zimage.c                                  | 1 +
 arch/xtensa/cpu/exceptions.c                           | 1 +
 board/Arcturus/ucp1020/ucp1020.c                       | 1 +
 board/BuR/brxre1/board.c                               | 1 +
 board/BuR/common/common.c                              | 1 +
 board/BuS/eb_cpu5282/eb_cpu5282.c                      | 1 +
 board/CZ.NIC/turris_mox/mox_sp.c                       | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                   | 1 +
 board/Synology/ds414/cmd_syno.c                        | 1 +
 board/amlogic/odroid-n2/odroid-n2.c                    | 1 +
 board/aristainetos/aristainetos.c                      | 1 +
 board/atmel/common/board.c                             | 1 +
 board/bluegiga/apx4devkit/apx4devkit.c                 | 1 +
 board/bluewater/gurnard/gurnard.c                      | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                 | 1 +
 board/cadence/xtfpga/xtfpga.c                          | 1 +
 board/cavium/thunderx/atf.c                            | 1 +
 board/cobra5272/flash.c                                | 3 ++-
 board/compulab/common/eeprom.c                         | 1 +
 board/compulab/common/omap3_display.c                  | 1 +
 board/corscience/tricorder/tricorder-eeprom.c          | 1 +
 board/corscience/tricorder/tricorder.c                 | 1 +
 board/davinci/da8xxevm/da850evm.c                      | 1 +
 board/davinci/da8xxevm/omapl138_lcdk.c                 | 1 +
 board/dhelectronics/dh_imx6/dh_imx6.c                  | 1 +
 board/dhelectronics/dh_stm32mp1/board.c                | 1 +
 board/eets/pdu001/board.c                              | 1 +
 board/egnite/ethernut5/ethernut5_pwrman.c              | 1 +
 board/engicam/common/board.c                           | 1 +
 board/esd/vme8349/caddy.c                              | 1 +
 board/freescale/common/cmd_esbc_validate.c             | 1 +
 board/freescale/common/fsl_validate.c                  | 1 +
 board/freescale/common/ngpixis.c                       | 1 +
 board/freescale/common/pixis.c                         | 1 +
 board/freescale/common/sgmii_riser.c                   | 1 +
 board/freescale/common/sys_eeprom.c                    | 1 +
 board/freescale/common/vid.c                           | 1 +
 board/freescale/corenet_ds/eth_hydra.c                 | 1 +
 board/freescale/corenet_ds/eth_p4080.c                 | 1 +
 board/freescale/corenet_ds/eth_superhydra.c            | 1 +
 board/freescale/ls1012aqds/eth.c                       | 1 +
 board/freescale/ls1021aqds/ddr.c                       | 1 +
 board/freescale/ls1043aqds/ddr.c                       | 1 +
 board/freescale/ls1046aqds/ddr.c                       | 1 +
 board/freescale/ls1046aqds/eth.c                       | 1 +
 board/freescale/ls1046ardb/ddr.c                       | 1 +
 board/freescale/ls1088a/ddr.c                          | 1 +
 board/freescale/ls1088a/eth_ls1088aqds.c               | 1 +
 board/freescale/ls2080a/ddr.c                          | 1 +
 board/freescale/ls2080aqds/ddr.c                       | 1 +
 board/freescale/ls2080aqds/eth.c                       | 1 +
 board/freescale/ls2080ardb/ddr.c                       | 1 +
 board/freescale/lx2160a/eth_lx2160aqds.c               | 1 +
 board/freescale/mpc8323erdb/mpc8323erdb.c              | 1 +
 board/freescale/mpc8349emds/ddr.c                      | 1 +
 board/freescale/mpc8572ds/ddr.c                        | 1 +
 board/freescale/mpc8641hpcn/ddr.c                      | 1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c            | 1 +
 board/freescale/p2041rdb/cpld.c                        | 1 +
 board/freescale/p2041rdb/ddr.c                         | 1 +
 board/freescale/p2041rdb/eth.c                         | 1 +
 board/freescale/qemu-ppce500/qemu-ppce500.c            | 1 +
 board/freescale/t102xrdb/ddr.c                         | 1 +
 board/freescale/t104xrdb/ddr.c                         | 1 +
 board/freescale/t208xqds/ddr.c                         | 1 +
 board/freescale/t208xqds/eth_t208xqds.c                | 1 +
 board/freescale/t208xrdb/ddr.c                         | 1 +
 board/freescale/t4rdb/ddr.c                            | 1 +
 board/gardena/smart-gateway-mt7688/board.c             | 1 +
 board/gateworks/gw_ventana/common.c                    | 1 +
 board/gateworks/gw_ventana/eeprom.c                    | 1 +
 board/gateworks/gw_ventana/gsc.c                       | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                | 1 +
 board/gdsys/a38x/controlcenterdc.c                     | 1 +
 board/gdsys/a38x/ihs_phys.c                            | 1 +
 board/gdsys/common/cmd_ioloop.c                        | 1 +
 board/gdsys/common/osd.c                               | 2 ++
 board/gdsys/common/osd_cmd.c                           | 1 +
 board/gdsys/mpc8308/gazerbeam.c                        | 1 +
 board/ge/bx50v3/bx50v3.c                               | 1 +
 board/grinn/liteboard/board.c                          | 1 +
 board/highbank/highbank.c                              | 1 +
 board/imgtec/malta/malta.c                             | 1 +
 board/intel/edison/edison.c                            | 1 +
 board/isee/igep00x0/igep00x0.c                         | 1 +
 board/k+p/kp_imx53/kp_id_rev.c                         | 1 +
 board/keymile/common/common.c                          | 1 +
 board/keymile/common/ivm.c                             | 1 +
 board/keymile/km_arm/km_arm.c                          | 1 +
 board/keymile/kmp204x/kmp204x.c                        | 1 +
 board/menlo/m53menlo/m53menlo.c                        | 1 +
 board/nokia/rx51/rx51.c                                | 1 +
 board/phytec/pfla02/pfla02.c                           | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c       | 1 +
 board/raspberrypi/rpi/rpi.c                            | 1 +
 board/renesas/sh7752evb/sh7752evb.c                    | 1 +
 board/renesas/sh7753evb/sh7753evb.c                    | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c                    | 1 +
 board/renesas/stout/cpld.c                             | 1 +
 board/renesas/ulcb/cpld.c                              | 1 +
 board/samsung/common/board.c                           | 1 +
 board/samsung/common/exynos5-dt.c                      | 1 +
 board/samsung/common/misc.c                            | 1 +
 board/samsung/odroid/odroid.c                          | 1 +
 board/samsung/trats/trats.c                            | 1 +
 board/samsung/trats2/trats2.c                          | 1 +
 board/sandbox/sandbox.c                                | 1 +
 board/siemens/capricorn/board.c                        | 1 +
 board/siemens/common/board.c                           | 1 +
 board/siemens/common/factoryset.c                      | 1 +
 board/siemens/pxm2/board.c                             | 1 +
 board/siemens/rut/board.c                              | 1 +
 board/siemens/taurus/taurus.c                          | 1 +
 board/sifive/fu540/fu540.c                             | 1 +
 board/sifive/fu540/spl.c                               | 1 +
 board/softing/vining_fpga/socfpga.c                    | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                   | 1 +
 board/st/common/stm32mp_dfu.c                          | 1 +
 board/st/stm32f429-discovery/stm32f429-discovery.c     | 1 +
 board/st/stm32f429-evaluation/stm32f429-evaluation.c   | 1 +
 board/st/stm32f469-discovery/stm32f469-discovery.c     | 1 +
 board/st/stm32mp1/stm32mp1.c                           | 1 +
 board/sunxi/board.c                                    | 1 +
 board/synopsys/hsdk/env-lib.c                          | 1 +
 board/synopsys/hsdk/hsdk.c                             | 1 +
 board/theadorable/theadorable.c                        | 1 +
 board/theobroma-systems/puma_rk3399/puma-rk3399.c      | 1 +
 board/ti/am335x/board.c                                | 1 +
 board/ti/am57xx/board.c                                | 1 +
 board/ti/common/board_detect.c                         | 1 +
 board/ti/dra7xx/evm.c                                  | 1 +
 board/ti/j721e/evm.c                                   | 1 +
 board/ti/ks2_evm/board.c                               | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c              | 1 +
 board/toradex/common/tdx-cfg-block.c                   | 1 +
 board/toradex/common/tdx-common.c                      | 1 +
 board/tqc/tqma6/tqma6.c                                | 1 +
 board/varisys/common/sys_eeprom.c                      | 1 +
 board/varisys/cyrus/ddr.c                              | 1 +
 board/vscom/baltos/board.c                             | 1 +
 board/warp7/warp7.c                                    | 1 +
 board/xilinx/versal/board.c                            | 1 +
 board/xilinx/zynq/board.c                              | 1 +
 board/xilinx/zynq/cmds.c                               | 1 +
 board/xilinx/zynqmp/cmds.c                             | 1 +
 board/xilinx/zynqmp/zynqmp.c                           | 1 +
 cmd/abootimg.c                                         | 1 +
 cmd/acpi.c                                             | 1 +
 cmd/adc.c                                              | 1 +
 cmd/adtimg.c                                           | 1 +
 cmd/aes.c                                              | 1 +
 cmd/armflash.c                                         | 1 +
 cmd/avb.c                                              | 1 +
 cmd/axi.c                                              | 1 +
 cmd/bcb.c                                              | 1 +
 cmd/bind.c                                             | 1 +
 cmd/binop.c                                            | 1 +
 cmd/blk_common.c                                       | 1 +
 cmd/blkcache.c                                         | 1 +
 cmd/blob.c                                             | 1 +
 cmd/bmp.c                                              | 1 +
 cmd/boot.c                                             | 1 +
 cmd/bootefi.c                                          | 1 +
 cmd/booti.c                                            | 1 +
 cmd/bootm.c                                            | 1 +
 cmd/bootmenu.c                                         | 1 +
 cmd/bootstage.c                                        | 1 +
 cmd/bootz.c                                            | 1 +
 cmd/cbfs.c                                             | 1 +
 cmd/cramfs.c                                           | 1 +
 cmd/cros_ec.c                                          | 1 +
 cmd/demo.c                                             | 1 +
 cmd/dfu.c                                              | 1 +
 cmd/disk.c                                             | 1 +
 cmd/eeprom.c                                           | 1 +
 cmd/efidebug.c                                         | 1 +
 cmd/elf.c                                              | 1 +
 cmd/ethsw.c                                            | 1 +
 cmd/exit.c                                             | 1 +
 cmd/fastboot.c                                         | 1 +
 cmd/fat.c                                              | 1 +
 cmd/fdt.c                                              | 1 +
 cmd/flash.c                                            | 1 +
 cmd/fpga.c                                             | 1 +
 cmd/fpgad.c                                            | 1 +
 cmd/fuse.c                                             | 1 +
 cmd/gpio.c                                             | 1 +
 cmd/gpt.c                                              | 1 +
 cmd/host.c                                             | 1 +
 cmd/i2c.c                                              | 1 +
 cmd/ini.c                                              | 1 +
 cmd/io.c                                               | 1 +
 cmd/iotrace.c                                          | 1 +
 cmd/itest.c                                            | 1 +
 cmd/jffs2.c                                            | 1 +
 cmd/led.c                                              | 1 +
 cmd/legacy-mtd-utils.c                                 | 1 +
 cmd/legacy_led.c                                       | 1 +
 cmd/load.c                                             | 1 +
 cmd/log.c                                              | 1 +
 cmd/lzmadec.c                                          | 1 +
 cmd/md5sum.c                                           | 1 +
 cmd/mdio.c                                             | 1 +
 cmd/mem.c                                              | 1 +
 cmd/mii.c                                              | 1 +
 cmd/misc.c                                             | 1 +
 cmd/mmc.c                                              | 1 +
 cmd/mp.c                                               | 1 +
 cmd/mtd.c                                              | 1 +
 cmd/mtdparts.c                                         | 1 +
 cmd/nand.c                                             | 1 +
 cmd/net.c                                              | 1 +
 cmd/nvedit.c                                           | 1 +
 cmd/nvedit_efi.c                                       | 1 +
 cmd/onenand.c                                          | 1 +
 cmd/osd.c                                              | 1 +
 cmd/panic.c                                            | 1 +
 cmd/pcap.c                                             | 1 +
 cmd/pci.c                                              | 1 +
 cmd/pmic.c                                             | 1 +
 cmd/pxe.c                                              | 1 +
 cmd/pxe_utils.c                                        | 1 +
 cmd/qfw.c                                              | 1 +
 cmd/read.c                                             | 1 +
 cmd/regulator.c                                        | 1 +
 cmd/remoteproc.c                                       | 1 +
 cmd/rng.c                                              | 1 +
 cmd/rockusb.c                                          | 1 +
 cmd/rtc.c                                              | 1 +
 cmd/sata.c                                             | 1 +
 cmd/setexpr.c                                          | 1 +
 cmd/sf.c                                               | 1 +
 cmd/smccc.c                                            | 1 +
 cmd/sound.c                                            | 1 +
 cmd/source.c                                           | 1 +
 cmd/spi.c                                              | 1 +
 cmd/strings.c                                          | 1 +
 cmd/sysboot.c                                          | 1 +
 cmd/test.c                                             | 1 +
 cmd/thordown.c                                         | 1 +
 cmd/ti/ddr3.c                                          | 1 +
 cmd/tlv_eeprom.c                                       | 1 +
 cmd/tpm-common.c                                       | 1 +
 cmd/tpm-v1.c                                           | 1 +
 cmd/tpm-v2.c                                           | 1 +
 cmd/trace.c                                            | 1 +
 cmd/tsi148.c                                           | 1 +
 cmd/ubi.c                                              | 1 +
 cmd/ubifs.c                                            | 1 +
 cmd/ufs.c                                              | 1 +
 cmd/universe.c                                         | 1 +
 cmd/unlz4.c                                            | 1 +
 cmd/unzip.c                                            | 1 +
 cmd/usb.c                                              | 1 +
 cmd/usb_gadget_sdp.c                                   | 1 +
 cmd/usb_mass_storage.c                                 | 1 +
 cmd/w1.c                                               | 1 +
 cmd/wdt.c                                              | 1 +
 cmd/wol.c                                              | 1 +
 cmd/x86/mtrr.c                                         | 1 +
 cmd/ximg.c                                             | 1 +
 cmd/yaffs2.c                                           | 1 +
 cmd/zfs.c                                              | 1 +
 cmd/zip.c                                              | 1 +
 common/autoboot.c                                      | 1 +
 common/board_r.c                                       | 1 +
 common/bootm.c                                         | 1 +
 common/bootm_os.c                                      | 1 +
 common/bootretry.c                                     | 1 +
 common/bootstage.c                                     | 1 +
 common/cli_hush.c                                      | 1 +
 common/console.c                                       | 1 +
 common/dlmalloc.c                                      | 1 +
 common/eeprom/eeprom_field.c                           | 1 +
 common/fdt_support.c                                   | 1 +
 common/hash.c                                          | 1 +
 common/image-cipher.c                                  | 1 +
 common/image-fdt.c                                     | 1 +
 common/image-fit.c                                     | 1 +
 common/image.c                                         | 1 +
 common/kallsyms.c                                      | 1 +
 common/kgdb.c                                          | 1 +
 common/lcd.c                                           | 1 +
 common/lcd_console.c                                   | 1 +
 common/log.c                                           | 1 +
 common/log_syslog.c                                    | 1 +
 common/main.c                                          | 1 +
 common/miiphyutil.c                                    | 1 +
 common/spl/spl.c                                       | 1 +
 common/splash.c                                        | 1 +
 common/splash_source.c                                 | 1 +
 common/stdio.c                                         | 1 +
 common/update.c                                        | 1 +
 common/usb_hub.c                                       | 1 +
 common/usb_storage.c                                   | 1 +
 common/xyzModem.c                                      | 1 +
 disk/part.c                                            | 1 +
 disk/part_amiga.c                                      | 1 +
 disk/part_dos.c                                        | 1 +
 disk/part_efi.c                                        | 1 +
 drivers/ata/fsl_sata.c                                 | 1 +
 drivers/ata/sata_mv.c                                  | 1 +
 drivers/ata/sata_sil.c                                 | 1 +
 drivers/bios_emulator/x86emu/debug.c                   | 1 +
 drivers/block/blk-uclass.c                             | 1 +
 drivers/block/ide.c                                    | 1 +
 drivers/block/sandbox.c                                | 1 +
 drivers/board/sandbox.c                                | 1 +
 drivers/clk/clk_pic32.c                                | 1 +
 drivers/clk/clk_zynq.c                                 | 1 +
 drivers/core/of_access.c                               | 1 +
 drivers/core/of_extra.c                                | 1 +
 drivers/core/ofnode.c                                  | 1 +
 drivers/cpu/bmips_cpu.c                                | 1 +
 drivers/cpu/cpu_sandbox.c                              | 1 +
 drivers/cpu/imx8_cpu.c                                 | 1 +
 drivers/crypto/fsl/error.c                             | 1 +
 drivers/crypto/fsl/sec.c                               | 1 +
 drivers/ddr/altera/sdram_arria10.c                     | 1 +
 drivers/ddr/fsl/interactive.c                          | 1 +
 drivers/ddr/fsl/main.c                                 | 1 +
 drivers/ddr/fsl/options.c                              | 1 +
 drivers/dfu/dfu.c                                      | 1 +
 drivers/dfu/dfu_mmc.c                                  | 1 +
 drivers/dfu/dfu_mtd.c                                  | 1 +
 drivers/dfu/dfu_nand.c                                 | 1 +
 drivers/dfu/dfu_ram.c                                  | 1 +
 drivers/dfu/dfu_sf.c                                   | 1 +
 drivers/dfu/dfu_virt.c                                 | 1 +
 drivers/dma/sandbox-dma-test.c                         | 1 +
 drivers/dma/ti/k3-udma.c                               | 1 +
 drivers/fastboot/fb_command.c                          | 1 +
 drivers/fastboot/fb_common.c                           | 1 +
 drivers/fastboot/fb_getvar.c                           | 1 +
 drivers/firmware/firmware-zynqmp.c                     | 1 +
 drivers/fpga/ivm_core.c                                | 1 +
 drivers/gpio/74x164_gpio.c                             | 1 +
 drivers/gpio/gpio-uclass.c                             | 1 +
 drivers/gpio/hi6220_gpio.c                             | 1 +
 drivers/gpio/imx_rgpio2p.c                             | 1 +
 drivers/gpio/mpc83xx_spisel_boot.c                     | 1 +
 drivers/gpio/mpc8xxx_gpio.c                            | 1 +
 drivers/gpio/mxc_gpio.c                                | 1 +
 drivers/gpio/mxs_gpio.c                                | 1 +
 drivers/gpio/omap_gpio.c                               | 1 +
 drivers/gpio/pca953x.c                                 | 1 +
 drivers/gpio/pca953x_gpio.c                            | 1 +
 drivers/gpio/pic32_gpio.c                              | 1 +
 drivers/gpio/rk_gpio.c                                 | 1 +
 drivers/gpio/sandbox.c                                 | 1 +
 drivers/gpio/sifive-gpio.c                             | 1 +
 drivers/gpio/sunxi_gpio.c                              | 1 +
 drivers/gpio/tca642x.c                                 | 1 +
 drivers/i2c/designware_i2c_pci.c                       | 1 +
 drivers/i2c/i2c-uclass.c                               | 1 +
 drivers/i2c/intel_i2c.c                                | 1 +
 drivers/misc/ds4510.c                                  | 1 +
 drivers/misc/fsl_portals.c                             | 1 +
 drivers/misc/k3_avs.c                                  | 1 +
 drivers/mmc/fsl_esdhc.c                                | 1 +
 drivers/mmc/mmc.c                                      | 1 +
 drivers/mmc/mmc_spi.c                                  | 1 +
 drivers/mmc/omap_hsmmc.c                               | 1 +
 drivers/mtd/cfi_flash.c                                | 1 +
 drivers/mtd/cfi_mtd.c                                  | 1 +
 drivers/mtd/mtdcore.c                                  | 1 +
 drivers/mtd/mtdpart.c                                  | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand.c               | 1 +
 drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c        | 1 +
 drivers/mtd/nand/raw/nand.c                            | 1 +
 drivers/mtd/nand/spi/core.c                            | 1 +
 drivers/mtd/onenand/onenand_base.c                     | 1 +
 drivers/mtd/spi/sf-uclass.c                            | 1 +
 drivers/mtd/spi/sf_mtd.c                               | 1 +
 drivers/mtd/ubi/build.c                                | 1 +
 drivers/mtd/ubi/debug.c                                | 1 +
 drivers/mtd/ubi/vmt.c                                  | 1 +
 drivers/mtd/ubi/wl.c                                   | 1 +
 drivers/net/ag7xxx.c                                   | 1 +
 drivers/net/altera_tse.c                               | 1 +
 drivers/net/bcm-sf2-eth.c                              | 1 +
 drivers/net/bcm6348-eth.c                              | 1 +
 drivers/net/bcm6368-eth.c                              | 1 +
 drivers/net/bcmgenet.c                                 | 1 +
 drivers/net/calxedaxgmac.c                             | 1 +
 drivers/net/dc2114x.c                                  | 1 +
 drivers/net/designware.c                               | 1 +
 drivers/net/dnet.c                                     | 1 +
 drivers/net/e1000.c                                    | 1 +
 drivers/net/e1000_spi.c                                | 1 +
 drivers/net/eepro100.c                                 | 1 +
 drivers/net/ep93xx_eth.c                               | 1 +
 drivers/net/ethoc.c                                    | 1 +
 drivers/net/fec_mxc.c                                  | 1 +
 drivers/net/fm/eth.c                                   | 1 +
 drivers/net/fm/fdt.c                                   | 1 +
 drivers/net/fsl-mc/dpio/qbman_private.h                | 1 +
 drivers/net/fsl-mc/mc.c                                | 1 +
 drivers/net/fsl_enetc.c                                | 1 +
 drivers/net/fsl_enetc_mdio.c                           | 1 +
 drivers/net/ftmac100.c                                 | 1 +
 drivers/net/ftmac110.c                                 | 1 +
 drivers/net/ks8851_mll.c                               | 1 +
 drivers/net/lan91c96.c                                 | 1 +
 drivers/net/ldpaa_eth/ldpaa_eth.c                      | 1 +
 drivers/net/macb.c                                     | 1 +
 drivers/net/mpc8xx_fec.c                               | 1 +
 drivers/net/mscc_eswitch/mscc_miim.c                   | 1 +
 drivers/net/mt7628-eth.c                               | 1 +
 drivers/net/mtk_eth.c                                  | 1 +
 drivers/net/mvgbe.c                                    | 1 +
 drivers/net/mvneta.c                                   | 1 +
 drivers/net/mvpp2.c                                    | 1 +
 drivers/net/natsemi.c                                  | 1 +
 drivers/net/netconsole.c                               | 1 +
 drivers/net/ns8382x.c                                  | 1 +
 drivers/net/pcnet.c                                    | 1 +
 drivers/net/pfe_eth/pfe_cmd.c                          | 1 +
 drivers/net/pfe_eth/pfe_eth.c                          | 1 +
 drivers/net/pfe_eth/pfe_mdio.c                         | 1 +
 drivers/net/phy/b53.c                                  | 1 +
 drivers/net/phy/cortina.c                              | 1 +
 drivers/net/phy/mv88e6352.c                            | 1 +
 drivers/net/ravb.c                                     | 1 +
 drivers/net/rtl8139.c                                  | 1 +
 drivers/net/sh_eth.c                                   | 1 +
 drivers/net/smc91111.c                                 | 1 +
 drivers/net/smc911x.c                                  | 1 +
 drivers/net/sni_ave.c                                  | 1 +
 drivers/net/sun8i_emac.c                               | 1 +
 drivers/net/ti/cpsw_mdio.c                             | 1 +
 drivers/net/ti/davinci_emac.c                          | 1 +
 drivers/net/ti/keystone_net.c                          | 1 +
 drivers/net/tsec.c                                     | 1 +
 drivers/net/uli526x.c                                  | 1 +
 drivers/net/vsc9953.c                                  | 1 +
 drivers/nvme/nvme-uclass.c                             | 1 +
 drivers/nvme/nvme.c                                    | 1 +
 drivers/pci/fsl_pci_init.c                             | 1 +
 drivers/pci/pci-uclass.c                               | 1 +
 drivers/pci/pci.c                                      | 1 +
 drivers/pci/pci_mvebu.c                                | 1 +
 drivers/pci/pcie_mediatek.c                            | 1 +
 drivers/phy/allwinner/phy-sun4i-usb.c                  | 1 +
 drivers/pinctrl/broadcom/pinctrl-bcm6838.c             | 1 +
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c          | 1 +
 drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c           | 1 +
 drivers/pinctrl/meson/pinctrl-meson.c                  | 1 +
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c            | 1 +
 drivers/pinctrl/pinctrl-sandbox.c                      | 1 +
 drivers/pinctrl/pinctrl-sti.c                          | 1 +
 drivers/pinctrl/pinctrl-stmfx.c                        | 1 +
 drivers/pinctrl/pinctrl-uclass.c                       | 1 +
 drivers/pinctrl/pinctrl_stm32.c                        | 1 +
 drivers/power/power_core.c                             | 1 +
 drivers/pwm/pwm-mtk.c                                  | 1 +
 drivers/qe/qe.c                                        | 1 +
 drivers/qe/uec.c                                       | 1 +
 drivers/ram/imxrt_sdram.c                              | 1 +
 drivers/ram/stm32_sdram.c                              | 1 +
 drivers/ram/stm32mp1/stm32mp1_ddr.c                    | 1 +
 drivers/ram/stm32mp1/stm32mp1_interactive.c            | 1 +
 drivers/ram/stm32mp1/stm32mp1_tests.c                  | 1 +
 drivers/ram/stm32mp1/stm32mp1_tuning.c                 | 1 +
 drivers/reset/reset-socfpga.c                          | 1 +
 drivers/rtc/m41t60.c                                   | 1 +
 drivers/scsi/scsi.c                                    | 1 +
 drivers/serial/serial-uclass.c                         | 1 +
 drivers/serial/serial.c                                | 1 +
 drivers/serial/serial_pxa.c                            | 1 +
 drivers/soc/soc_sandbox.c                              | 1 +
 drivers/soc/soc_ti_k3.c                                | 1 +
 drivers/spi/atmel-quadspi.c                            | 1 +
 drivers/spi/sandbox_spi.c                              | 1 +
 drivers/sysreset/sysreset_mpc83xx.c                    | 1 +
 drivers/timer/tsc_timer.c                              | 1 +
 drivers/tpm/cr50_i2c.c                                 | 1 +
 drivers/tpm/tpm2_ftpm_tee.c                            | 1 +
 drivers/tpm/tpm2_tis_sandbox.c                         | 1 +
 drivers/tpm/tpm2_tis_spi.c                             | 1 +
 drivers/tpm/tpm_tis_infineon.c                         | 1 +
 drivers/tpm/tpm_tis_lpc.c                              | 1 +
 drivers/tpm/tpm_tis_sandbox.c                          | 1 +
 drivers/tpm/tpm_tis_st33zp24_i2c.c                     | 1 +
 drivers/tpm/tpm_tis_st33zp24_spi.c                     | 1 +
 drivers/usb/cdns3/ep0.c                                | 1 +
 drivers/usb/cdns3/gadget.c                             | 1 +
 drivers/usb/common/fsl-dt-fixup.c                      | 1 +
 drivers/usb/dwc3/gadget.c                              | 1 +
 drivers/usb/eth/asix.c                                 | 1 +
 drivers/usb/eth/asix88179.c                            | 1 +
 drivers/usb/eth/lan7x.c                                | 1 +
 drivers/usb/eth/mcs7830.c                              | 1 +
 drivers/usb/eth/r8152.c                                | 1 +
 drivers/usb/eth/smsc95xx.c                             | 1 +
 drivers/usb/gadget/epautoconf.c                        | 1 +
 drivers/usb/gadget/ether.c                             | 1 +
 drivers/usb/gadget/f_mass_storage.c                    | 1 +
 drivers/usb/gadget/f_thor.c                            | 1 +
 drivers/usb/host/ehci-fsl.c                            | 1 +
 drivers/usb/host/ehci-omap.c                           | 1 +
 drivers/usb/host/usb-uclass.c                          | 1 +
 drivers/usb/musb-new/musb_core.c                       | 1 +
 drivers/usb/musb-new/musb_dsps.c                       | 1 +
 drivers/usb/musb-new/musb_gadget.c                     | 1 +
 drivers/usb/musb-new/ti-musb.c                         | 1 +
 drivers/video/ati_radeon_fb.c                          | 1 +
 drivers/video/cfb_console.c                            | 1 +
 drivers/video/fsl_diu_fb.c                             | 1 +
 drivers/video/mx3fb.c                                  | 1 +
 drivers/video/mxsfb.c                                  | 1 +
 drivers/video/vidconsole-uclass.c                      | 1 +
 drivers/video/video-uclass.c                           | 1 +
 drivers/video/videomodes.c                             | 1 +
 drivers/virtio/virtio-uclass.c                         | 1 +
 drivers/virtio/virtio_blk.c                            | 1 +
 drivers/virtio/virtio_pci_legacy.c                     | 1 +
 drivers/virtio/virtio_pci_modern.c                     | 1 +
 drivers/virtio/virtio_sandbox.c                        | 1 +
 env/attr.c                                             | 3 ++-
 env/mmc.c                                              | 1 +
 examples/standalone/atmel_df_pow2.c                    | 1 +
 fs/cramfs/cramfs.c                                     | 1 +
 fs/fs.c                                                | 1 +
 fs/ubifs/debug.c                                       | 1 +
 fs/ubifs/super.c                                       | 1 +
 fs/ubifs/ubifs.c                                       | 1 +
 fs/yaffs2/yaffs_uboot_glue.c                           | 1 +
 include/common.h                                       | 1 -
 include/efi.h                                          | 1 +
 include/exports.h                                      | 1 +
 include/vsprintf.h                                     | 1 +
 lib/acpi/acpi_device.c                                 | 1 +
 lib/crypto/public_key.c                                | 1 +
 lib/dhry/cmd_dhry.c                                    | 1 +
 lib/display_options.c                                  | 1 +
 lib/efi_driver/efi_block_device.c                      | 1 +
 lib/efi_loader/efi_boottime.c                          | 1 +
 lib/efi_loader/efi_device_path.c                       | 1 +
 lib/efi_loader/efi_device_path_to_text.c               | 1 +
 lib/efi_loader/efi_disk.c                              | 1 +
 lib/efi_loader/efi_var_file.c                          | 1 +
 lib/fdtdec.c                                           | 1 +
 lib/fdtdec_test.c                                      | 1 +
 lib/hexdump.c                                          | 1 +
 lib/libavb/avb_sysdeps_posix.c                         | 1 +
 lib/net_utils.c                                        | 1 +
 lib/oid_registry.c                                     | 1 +
 lib/panic.c                                            | 1 +
 lib/rsa/rsa-verify.c                                   | 1 +
 lib/strto.c                                            | 1 +
 lib/tiny-printf.c                                      | 1 +
 lib/tpm-common.c                                       | 1 +
 lib/trace.c                                            | 1 +
 lib/uuid.c                                             | 1 +
 net/arp.c                                              | 1 +
 net/bootp.c                                            | 1 +
 net/cdp.c                                              | 1 +
 net/eth-uclass.c                                       | 1 +
 net/eth_common.c                                       | 1 +
 net/eth_legacy.c                                       | 1 +
 net/net.c                                              | 1 +
 net/nfs.c                                              | 1 +
 net/tftp.c                                             | 1 +
 post/post.c                                            | 1 +
 test/dm/blk.c                                          | 1 +
 test/env/hashtable.c                                   | 1 +
 test/log/log_test.c                                    | 1 +
 test/print_ut.c                                        | 1 +
 test/unicode_ut.c                                      | 1 +
 test/ut.c                                              | 1 +
 669 files changed, 673 insertions(+), 5 deletions(-)

diff --git a/api/api.c b/api/api.c
index 748df20bebe..17f74052974 100644
--- a/api/api.c
+++ b/api/api.c
@@ -14,6 +14,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c
index f807cd83d6b..1bdffd052e4 100644
--- a/arch/arc/lib/cache.c
+++ b/arch/arc/lib/cache.c
@@ -6,6 +6,7 @@
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/compiler.h>
diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c
index 2b4145ad491..55065ee8494 100644
--- a/arch/arc/lib/interrupts.c
+++ b/arch/arc/lib/interrupts.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <irq_func.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arcregs.h>
 #include <asm/ptrace.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 928fb4d5106..b111d6126b6 100644
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/mtd/st_smi.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index ea068727f57..684c0c91ef5 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -7,6 +7,7 @@
 #include <clock_legacy.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index ad019f4fe2e..052ba4d5407 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -12,6 +12,7 @@
 #include <hang.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
index 34d5fe81d0e..917ae991a52 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
index 8619f8ecb83..986dd2482dc 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 4418709a459..fb8560b4b9a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -12,6 +12,7 @@
 #include <fsl_ifc.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
 #include <log.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 613e7abeaae..c9efede771e 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -20,6 +20,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/root.h>
diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c
index d19c2ad67c3..9e8d8eb6f1a 100644
--- a/arch/arm/lib/interrupts_64.c
+++ b/arch/arm/lib/interrupts_64.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <irq_func.h>
diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c
index 826d1fc1283..27973b71d6e 100644
--- a/arch/arm/lib/interrupts_m.c
+++ b/arch/arm/lib/interrupts_m.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 
 /*
diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c
index d186584c379..8b09d87cb16 100644
--- a/arch/arm/lib/semihosting.c
+++ b/arch/arm/lib/semihosting.c
@@ -16,6 +16,7 @@
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #define SYSOPEN		0x01
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 49dd473af72..a8199497a91 100644
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <fsl_sec.h>
diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index c2ca33888b5..2b7affaaccd 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <nand.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 0d2cbf98963..3f3d47c1300 100644
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -11,6 +11,7 @@
 #include <mapmem.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
index 5f5103a12a6..bf0742e57e3 100644
--- a/arch/arm/mach-imx/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -6,6 +6,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c
index 69033420ee5..1d92c07be24 100644
--- a/arch/arm/mach-imx/imx8/ahab.c
+++ b/arch/arm/mach-imx/imx8/ahab.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/sci/sci.h>
diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c
index 84d400f0283..6bb067e08bd 100644
--- a/arch/arm/mach-imx/imx8/snvs_security_sc.c
+++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c
@@ -16,6 +16,7 @@
 #include <stddef.h>
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index e98cff2788e..09830301e7b 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 46a4d3661d1..c94da85bf76 100644
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <command.h>
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
index fe591a8ffc3..d28d55d4be5 100644
--- a/arch/arm/mach-imx/mx6/mp.c
+++ b/arch/arm/mach-imx/mx6/mp.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 3731df69e9e..be74201f1a0 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index b502332d8ca..7a672c31f23 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <spl.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 98d2225e913..9592303e921 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index 622a4fb6cb5..7252a1f5d70 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
index eaa7984b0f6..f3c4bd61e8d 100644
--- a/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@ -12,6 +12,7 @@
 #include <spl.h>
 #include <malloc.h>
 #include <remoteproc.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/soc/ti/ti_sci_protocol.h>
diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c
index 22277b5987e..9130978537f 100644
--- a/arch/arm/mach-keystone/cmd_clock.c
+++ b/arch/arm/mach-keystone/cmd_clock.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/psc_defs.h>
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c
index 94e55331d5c..e98df01e89f 100644
--- a/arch/arm/mach-keystone/cmd_mon.c
+++ b/arch/arm/mach-keystone/cmd_mon.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <mach/mon.h>
 asm(".arch_extension sec\n\t");
diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c
index b646599587a..99c394cd91d 100644
--- a/arch/arm/mach-keystone/ddr3.c
+++ b/arch/arm/mach-keystone/ddr3.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <common.h>
 #include <asm/arch/msmc.h>
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 2337adb6ef2..a74c4d995b1 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/psc_defs.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
index 087240b4d3f..a202e83b08f 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index a2a30eb80b0..f4f54fafce9 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/sm.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c
index a0ba2d8e0cf..0fac5efc2a7 100644
--- a/arch/arm/mach-nexell/clock.c
+++ b/arch/arm/mach-nexell/clock.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 #include <linux/err.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c
index 7405d692e7b..a6428a23db4 100644
--- a/arch/arm/mach-omap2/emif-common.c
+++ b/arch/arm/mach-omap2/emif-common.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/emif.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 03375321a47..f96d1379bb3 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -20,6 +20,7 @@
 #include <log.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 2e10ab983eb..4ee409521ef 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -7,6 +7,7 @@
 #include <env.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index f2c925b2d11..81f3bd37ea3 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index ce75e7c1f2c..82a106e786e 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -15,6 +15,7 @@
 #include <hash.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <misc.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-snapdragon/misc.c b/arch/arm/mach-snapdragon/misc.c
index aaa561c2c68..03515f6d2bf 100644
--- a/arch/arm/mach-snapdragon/misc.c
+++ b/arch/arm/mach-snapdragon/misc.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <mmc.h>
+#include <vsprintf.h>
 #include <asm/arch/misc.h>
 
 /* UNSTUFF_BITS macro taken from Linux Kernel: drivers/mmc/core/sd.c */
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8016.c b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
index 1042b564c37..d261129a4dd 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8016.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8016.c
@@ -6,8 +6,9 @@
  *
  */
 
-#include "pinctrl-snapdragon.h"
 #include <common.h>
+#include <vsprintf.h>
+#include "pinctrl-snapdragon.h"
 
 #define MAX_PIN_NAME_LEN 32
 static char pin_name[MAX_PIN_NAME_LEN];
diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8096.c b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
index 20a71c319b3..da4a2d3901c 100644
--- a/arch/arm/mach-snapdragon/pinctrl-apq8096.c
+++ b/arch/arm/mach-snapdragon/pinctrl-apq8096.c
@@ -6,8 +6,9 @@
  *
  */
 
-#include "pinctrl-snapdragon.h"
 #include <common.h>
+#include <vsprintf.h>
+#include "pinctrl-snapdragon.h"
 
 #define MAX_PIN_NAME_LEN 32
 static char pin_name[MAX_PIN_NAME_LEN];
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 52226d549c7..406023f1ef9 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 9a522fb8961..e2b6a85cfd1 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -14,6 +14,7 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c
index d12e24f0fef..7ce8a9dee69 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32key.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32key.c
@@ -8,6 +8,7 @@
 #include <console.h>
 #include <misc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index d73a4cf4e99..72da2471fbe 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
@@ -8,6 +8,7 @@
 #include <dfu.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 0bac482c9ac..3ed7b8d3b38 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -11,6 +11,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/stm32mp1_smc.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
index 002b4d39be6..de1361d9841 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
@@ -6,6 +6,7 @@
 #ifndef _STM32PROG_H_
 #define _STM32PROG_H_
 
+#include <vsprintf.h>
 #include <linux/printk.h>
 
 /* - phase defines ------------------------------------------------*/
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
index 44bcfe8bdd2..1fbb870f581 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <serial.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
index bcc9239ba92..616f556ab90 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c
@@ -8,6 +8,7 @@
 #include <g_dnl.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/printk.h>
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 6ca75e24581..e31d33d3a30 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -12,6 +12,7 @@
 #include <misc.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/bsec.h>
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 5c66da3eb10..d7e77f95747 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -17,6 +17,7 @@
 #include <i2c.h>
 #include <serial.h>
 #include <spl.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c
index 520b597fcc0..de04e9d8428 100644
--- a/arch/arm/mach-sunxi/dram_helpers.c
+++ b/arch/arm/mach-sunxi/dram_helpers.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/barriers.h>
 #include <asm/io.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c
index 76d698214da..f85f52898d1 100644
--- a/arch/arm/mach-sunxi/dram_sun4i.c
+++ b/arch/arm/mach-sunxi/dram_sun4i.c
@@ -22,6 +22,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index 9e34da47479..a877d655d86 100644
--- a/arch/arm/mach-sunxi/dram_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun6i.c b/arch/arm/mach-sunxi/dram_sun6i.c
index 0590110d4ac..9d1620c9758 100644
--- a/arch/arm/mach-sunxi/dram_sun6i.c
+++ b/arch/arm/mach-sunxi/dram_sun6i.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <errno.h>
 #include <init.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index a4625385219..e3e40aaa5e6 100644
--- a/arch/arm/mach-sunxi/dram_sunxi_dw.c
+++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 2bfcf861b63..830a1e75d4e 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <init.h>
 #include <spl.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <nand.h>
diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c
index b2fcae619dc..589f9ec9ab2 100644
--- a/arch/arm/mach-zynqmp/mp.c
+++ b/arch/arm/mach-zynqmp/mp.c
@@ -8,6 +8,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index c0004176c4c..8745ee351e5 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -11,6 +11,7 @@
 #include <fdt_support.h>
 #include <lmb.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/addrspace.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c
index a0c60c40c86..d6ea2f5730d 100644
--- a/arch/mips/lib/reloc.c
+++ b/arch/mips/lib/reloc.c
@@ -29,6 +29,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <init.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/relocs.h>
 #include <asm/sections.h>
diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c
index 733a513ed58..1ca5690210f 100644
--- a/arch/nds32/cpu/n1213/ae3xx/cpu.c
+++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c
@@ -17,6 +17,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 3afd1c5cff2..5532d515b73 100644
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c
index e8b07be1ded..51e87c77ddd 100644
--- a/arch/nds32/lib/interrupts.c
+++ b/arch/nds32/lib/interrupts.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/u-boot.h>
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index 2c8f9731c74..59099a4d5ea 100644
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <irq_func.h>
 #include <log.h>
+#include <vsprintf.h>
 
 #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */
 
diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index 88d4cb5d5a0..2d9c8f24882 100644
--- a/arch/powerpc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
@@ -11,6 +11,7 @@
 #include <mpc83xx.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index c6c2917f881..b51bc729ca7 100644
--- a/arch/powerpc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index a63519bb5cd..79ad806dbdf 100644
--- a/arch/powerpc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -23,6 +23,7 @@
  */
 #include <common.h>
 #include <asm-offsets.h>
+#include <vsprintf.h>
 #include <asm/cpm_85xx.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index c8194852df5..1366e1f191d 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -15,6 +15,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/processor.h>
 #include <ioports.h>
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 2a6e07f2834..35bc146a38b 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cpm_85xx.h>
 #include <command.h>
 #include <config.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index c8388da6331..4864a6809a4 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 1af6e2ab7ac..96d6a8e000f 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -11,6 +11,7 @@
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
 #include <hwconfig.h>
 #endif
+#include <vsprintf.h>
 #include <asm/fsl_serdes.h>
 #include <asm/immap_85xx.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index 4a9fa7e78b0..5be3e08f040 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 8dd9b6d55ca..31ce76c01dd 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <env.h>
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index 5fc672d153d..add179be385 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/string.h>
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index ae448008d08..ba564dedcfd 100644
--- a/arch/powerpc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index 30fa3e08cde..d9728d0df33 100644
--- a/arch/powerpc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index d0e0753c269..1c65409ee30 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 02b8fc706e6..55c69225e37 100644
--- a/arch/powerpc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/ptrace.h>
 #include <command.h>
 #include <asm/processor.h>
diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index e0b17590d56..fce60935fb6 100644
--- a/arch/riscv/lib/spl.c
+++ b/arch/riscv/lib/spl.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/smp.h>
 
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index e4192b07be5..f0721d3f7c5 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -16,6 +16,7 @@
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 111fc85854e..b05daa01ed7 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -11,6 +11,7 @@
 #include <cli.h>
 #include <sort.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/getopt.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c
index b6e961f7083..f64ea4e2e66 100644
--- a/arch/sh/lib/bootm.c
+++ b/arch/sh/lib/bootm.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <asm/zimage.h>
 #include <linux/string.h>
diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c
index d1067a60f1e..8567d390376 100644
--- a/arch/sh/lib/zimageboot.c
+++ b/arch/sh/lib/zimageboot.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <env.h>
 #include <irq_func.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/zimage.h>
 #include <linux/string.h>
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c
index 16fec6c7116..8b768b0d099 100644
--- a/arch/x86/cpu/coreboot/sdram.c
+++ b/arch/x86/cpu/coreboot/sdram.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c
index d6b6c3781f4..eab1664200a 100644
--- a/arch/x86/cpu/efi/payload.c
+++ b/arch/x86/cpu/efi/payload.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/bootparam.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 9a8828b0e41..88fe58eea9a 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c
index cfa70c10e07..3db95256015 100644
--- a/arch/x86/cpu/qfw_cpu.c
+++ b/arch/x86/cpu/qfw_cpu.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <qfw.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
 #include <dm/root.h>
diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c
index bcae2d42519..e7513d97896 100644
--- a/arch/x86/cpu/slimbootloader/sdram.c
+++ b/arch/x86/cpu/slimbootloader/sdram.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/sizes.h>
diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c
index 8b84565ce62..10e4e9300ec 100644
--- a/arch/x86/cpu/slimbootloader/serial.c
+++ b/arch/x86/cpu/slimbootloader/serial.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <ns16550.h>
 #include <serial.h>
+#include <vsprintf.h>
 #include <asm/arch/slimbootloader.h>
 #include <asm/global_data.h>
 
diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
index c568651cf79..c83a06f639c 100644
--- a/arch/x86/cpu/slimbootloader/slimbootloader.c
+++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
@@ -7,6 +7,7 @@
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/arch/slimbootloader.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c
index 7a0020c74fe..8aa5efdcab9 100644
--- a/arch/x86/cpu/tangier/acpi.c
+++ b/arch/x86/cpu/tangier/acpi.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <cpu.h>
 #include <dm.h>
+#include <vsprintf.h>
 #include <acpi/acpi_table.h>
 #include <asm/ioapic.h>
 #include <asm/mpspec.h>
diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
index 20926171822..e70b7797238 100644
--- a/arch/x86/lib/fsp1/fsp_common.c
+++ b/arch/x86/lib/fsp1/fsp_common.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <rtc.h>
+#include <vsprintf.h>
 #include <acpi/acpi_s3.h>
 #include <asm/cmos_layout.h>
 #include <asm/early_cmos.h>
diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index 3bc46b24ab4..acaaf55bcc7 100644
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
 #include <asm/u-boot.h>
diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c
index 2e5ead02060..3cae664e49c 100644
--- a/arch/x86/lib/ramtest.c
+++ b/arch/x86/lib/ramtest.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/post.h>
 #include <asm/u-boot.h>
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index 8a5082d6f30..e31565a589e 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <relocate.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot-x86.h>
 #include <asm/sections.h>
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 91e34eb0799..dee51f4a753 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index d467657f879..219e70607bf 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -18,6 +18,7 @@
 #include <irq_func.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c
index 7047b1938d2..69325e20ec1 100644
--- a/arch/xtensa/cpu/exceptions.c
+++ b/arch/xtensa/cpu/exceptions.c
@@ -14,6 +14,7 @@
 #include <command.h>
 #include <irq_func.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
 #include <asm/regs.h>
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 791c91d0e0d..ccd5f8ae1e4 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/board/Arcturus/ucp1020/ucp1020.c
@@ -19,6 +19,7 @@
 #include <i2c.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index 8a47304bef7..9c2e080d6d3 100644
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index b6e763b77fa..9b96b0c30b9 100644
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -16,6 +16,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <lcd.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 7768aeb59df..863372e06e0 100644
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "asm/m5282.h"
diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c
index cc57b9f095f..2c0c4956cd4 100644
--- a/board/CZ.NIC/turris_mox/mox_sp.c
+++ b/board/CZ.NIC/turris_mox/mox_sp.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <vsprintf.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 7f2ed1350bf..32dabe99598 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <net.h>
diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c
index 95911a300a7..f6a434d08c9 100644
--- a/board/Synology/ds414/cmd_syno.c
+++ b/board/Synology/ds414/cmd_syno.c
@@ -13,6 +13,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
 
diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
index caf7fd68100..005e4bebf13 100644
--- a/board/amlogic/odroid-n2/odroid-n2.c
+++ b/board/amlogic/odroid-n2/odroid-n2.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/sm.h>
 #include <asm/arch/eth.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 70a2489a474..25c78926b07 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c
index fdf8f43cc79..44abbfabb07 100644
--- a/board/atmel/common/board.c
+++ b/board/atmel/common/board.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <env.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 93fda9c5b1f..ca44e5aba96 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -17,6 +17,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index 874d24e22d6..da597bbfb0a 100644
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -20,6 +20,7 @@
 #include <netdev.h>
 #endif
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 25005a390f5..79ba375cd2b 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index 227e14ac389..f0b20c518c0 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <env.h>
diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c
index 9c812e9531f..1c91cfe5f06 100644
--- a/board/cavium/thunderx/atf.c
+++ b/board/cavium/thunderx/atf.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index cefcc6634ff..f1874e35ff4 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -11,6 +11,7 @@
 #include <irq_func.h>
 #include <time.h>
 #include <uuid.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
@@ -77,7 +78,7 @@ unsigned long flash_init(void)
 		if (i == 0)
 			flashbase = PHYS_FLASH_1;
 		else
-			panic ("configured to many flash banks!\n");
+			panic("configured to many flash banks!\n");
 
 		for (j = 0; j < flash_info[i].sector_count; j++) {
 			if (j == 0) {
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
index 94ab9003b35..0ffa82dd6d3 100644
--- a/board/compulab/common/eeprom.c
+++ b/board/compulab/common/eeprom.c
@@ -12,6 +12,7 @@
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/setup.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index 93ae1c6b086..4b580b70fbe 100644
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <env.h>
diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c
index 002daf23f4d..1a878397007 100644
--- a/board/corscience/tricorder/tricorder-eeprom.c
+++ b/board/corscience/tricorder/tricorder-eeprom.c
@@ -10,6 +10,7 @@
 #include <eeprom.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index 8fec67a6912..08b8e7f4d04 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <twl4030.h>
 #include <status_led.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 80c317a5a5d..14f8f4d89a2 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -17,6 +17,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
 #include <asm/ti-common/davinci_nand.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 7a75494d7f3..3694a034b73 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
 #include <asm/ti-common/davinci_nand.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 910285c6a3d..04798f5bfde 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 3baa1bea26a..6b63252a3fa 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/stm32.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index a7e529c2151..adbd0847c4b 100644
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <spl.h>
 #include <i2c.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <debug_uart.h>
 #include <asm/global_data.h>
diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c
index b91020ec33f..ad5285f8ca9 100644
--- a/board/egnite/ethernut5/ethernut5_pwrman.c
+++ b/board/egnite/ethernut5/ethernut5_pwrman.c
@@ -34,6 +34,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/at91sam9260.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/gpio.h>
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index e301f3e98bc..9f94b91fe97 100644
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -12,6 +12,7 @@
 #include <init.h>
 #include <log.h>
 #include <mmc.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index 6bda7b04073..7ced22e8430 100644
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -12,6 +12,7 @@
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/mpc8349_pci.h>
 #include <pci.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c
index 2190e51c150..72b58360c27 100644
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/freescale/common/cmd_esbc_validate.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <fsl_validate.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 int do_esbc_halt(struct cmd_tbl *cmdtp, int flag, int argc,
 		 char *const argv[])
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index ff6e2bfb34f..f12dcb3cf14 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <u-boot/rsa-mod-exp.h>
 #include <hash.h>
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c
index 5bceb7747d5..6938c2c2ead 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/freescale/common/ngpixis.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 6f4f2e6d241..2d232958c5b 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
index e6481f69516..5e486a98e84 100644
--- a/board/freescale/common/sgmii_riser.c
+++ b/board/freescale/common/sgmii_riser.c
@@ -16,6 +16,7 @@
 #include <common.h>
 #include <log.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <linux/libfdt.h>
 #include <tsec.h>
 #include <fdt_support.h>
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 2f1144dcd74..5f07d28e8ec 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c
index b21fd7a00ae..16c17ac3e25 100644
--- a/board/freescale/common/vid.c
+++ b/board/freescale/common/vid.c
@@ -10,6 +10,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #ifdef CONFIG_FSL_LSCH2
 #include <asm/arch/immap_lsch2.h>
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c
index 0a31c9e3112..f7c337d677a 100644
--- a/board/freescale/corenet_ds/eth_hydra.c
+++ b/board/freescale/corenet_ds/eth_hydra.c
@@ -51,6 +51,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/corenet_ds/eth_p4080.c b/board/freescale/corenet_ds/eth_p4080.c
index 09f9f85f91b..30b7912c270 100644
--- a/board/freescale/corenet_ds/eth_p4080.c
+++ b/board/freescale/corenet_ds/eth_p4080.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c
index 954f55bdbf6..bda97fbd6bd 100644
--- a/board/freescale/corenet_ds/eth_superhydra.c
+++ b/board/freescale/corenet_ds/eth_superhydra.c
@@ -52,6 +52,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c
index d0d012e67f2..35d7bfcb2ff 100644
--- a/board/freescale/ls1012aqds/eth.c
+++ b/board/freescale/ls1012aqds/eth.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index 6d43c8b02e5..232449b1b50 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c
index 96d3adfed72..234403ed12a 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/freescale/ls1043aqds/ddr.c
@@ -11,6 +11,7 @@
 #endif
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c
index 90ff767e12c..a182861ce65 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/freescale/ls1046aqds/ddr.c
@@ -11,6 +11,7 @@
 #endif
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index 93a41cd4a12..1977b08eca2 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fdt_support.h>
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c
index 4128a6962f7..3b4129701b0 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/freescale/ls1046ardb/ddr.c
@@ -7,6 +7,7 @@
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include "ddr.h"
diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c
index 8a8e75c8d0f..bd8c0511e83 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/freescale/ls1088a/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c
index f26bbf3267e..d5a1752c055 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/freescale/ls1088a/eth_ls1088aqds.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls2080a/ddr.c b/board/freescale/ls2080a/ddr.c
index 4b42caa989f..5a28549d190 100644
--- a/board/freescale/ls2080a/ddr.c
+++ b/board/freescale/ls2080a/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c
index 4da5235e052..81003a98857 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/freescale/ls2080aqds/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index 2a25cb9f070..7756620bdfd 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <hwconfig.h>
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c
index 8ebd1ae2378..d1f36840aa1 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/freescale/ls2080ardb/ddr.c
@@ -8,6 +8,7 @@
 #include <fsl_ddr_dimm_params.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/soc.h>
 #include <asm/arch/clock.h>
 #include <asm/global_data.h>
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 5dfe7489ba8..e592ca12927 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -18,6 +18,7 @@
 #include <phy.h>
 #include <fm_eth.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <exports.h>
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c
index 35ca2f1a077..007d9d2283e 100644
--- a/board/freescale/mpc8323erdb/mpc8323erdb.c
+++ b/board/freescale/mpc8323erdb/mpc8323erdb.c
@@ -20,6 +20,7 @@
 #include <miiphy.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/freescale/mpc8349emds/ddr.c b/board/freescale/mpc8349emds/ddr.c
index beeb508771b..f4dfea8315f 100644
--- a/board/freescale/mpc8349emds/ddr.c
+++ b/board/freescale/mpc8349emds/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8572ds/ddr.c b/board/freescale/mpc8572ds/ddr.c
index 64f81261678..0c4b7d7d621 100644
--- a/board/freescale/mpc8572ds/ddr.c
+++ b/board/freescale/mpc8572ds/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/mpc8641hpcn/ddr.c b/board/freescale/mpc8641hpcn/ddr.c
index 5c1232e3534..8ccac70a30b 100644
--- a/board/freescale/mpc8641hpcn/ddr.c
+++ b/board/freescale/mpc8641hpcn/ddr.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 648ff4c3e79..f4bf325e0d3 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -15,6 +15,7 @@
 #include <pci.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index 256cdc68424..4e1254dd134 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index bb54f6d5b0a..1dfb7b062fc 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c
index 0faa288f003..94b05020050 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/freescale/p2041rdb/eth.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c
index 6588804fbba..00c83d66438 100644
--- a/board/freescale/qemu-ppce500/qemu-ppce500.c
+++ b/board/freescale/qemu-ppce500/qemu-ppce500.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 6b5b5181e67..856619af2f0 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 8f2b92bd55d..55493e4bb14 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index 36de0f73558..49a9b75a4fb 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index f60e2047759..c2fcbfeedf6 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index a6f710e64bd..ace941da31b 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 54b9f8fce67..d478a89e216 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index 03a9e43875a..2e446f86753 100644
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -16,6 +16,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/stringify.h>
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index 3f7ce584528..299f92f6826 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c
index efaff179a2c..7d6509be77b 100644
--- a/board/gateworks/gw_ventana/eeprom.c
+++ b/board/gateworks/gw_ventana/eeprom.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c
index 143493c24ab..d98fa4bf2ee 100644
--- a/board/gateworks/gw_ventana/gsc.c
+++ b/board/gateworks/gw_ventana/gsc.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <common.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index a8b012dda73..4932fc2d117 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c
index 7044524a735..d7cc7e3d308 100644
--- a/board/gdsys/a38x/controlcenterdc.c
+++ b/board/gdsys/a38x/controlcenterdc.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <tpm-v1.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index 4d6d0da76fa..feeae37cd70 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -2,6 +2,7 @@
 #include <dm.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm-generic/gpio.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index 72fef03d7b1..881f2cc7bf2 100644
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <console.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c
index e4941a94f31..fb9c7b8a6ec 100644
--- a/board/gdsys/common/osd.c
+++ b/board/gdsys/common/osd.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <i2c.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <linux/stringify.h>
 
 #include "ch7301.h"
@@ -504,5 +505,6 @@ U_BOOT_CMD(
 );
 
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #endif /* CONFIG_GDSYS_LEGACY_DRIVERS */
diff --git a/board/gdsys/common/osd_cmd.c b/board/gdsys/common/osd_cmd.c
index b73e2597299..e306d7e82fe 100644
--- a/board/gdsys/common/osd_cmd.c
+++ b/board/gdsys/common/osd_cmd.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <video_osd.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static int do_osd_write(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c
index 3258cc72179..1399a2726b3 100644
--- a/board/gdsys/mpc8308/gazerbeam.c
+++ b/board/gdsys/mpc8308/gazerbeam.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <tpm-v1.h>
 #include <video_osd.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index 0d88f8ad4a9..36489db79ad 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -8,6 +8,7 @@
 #include <image.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index fbbfbd8fb29..e6bcb08aadf 100644
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 1a47a845737..144193f4455 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <scsi.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index 7ed9b53bc16..1edbf36ea90 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -14,6 +14,7 @@
 #include <pci_msc01.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index 8d1c4ade1c5..42ebb831f57 100644
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -8,6 +8,7 @@
 #include <init.h>
 #include <mmc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <u-boot/md5.h>
 #include <usb.h>
 #include <watchdog.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 098ef3f9664..cb129dca03e 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -14,6 +14,7 @@
 #include <twl4030.h>
 #include <netdev.h>
 #include <spl.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 9a5c5cb64da..387c2271046 100644
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "kp_id_rev.h"
 #include <net.h>
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 5287ec20535..d87c0ac8f15 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index f850c4d7563..5aae1db2ad3 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "common.h"
 
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 0e5de8ad871..daba71cd4cd 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -21,6 +21,7 @@
 #include <miiphy.h>
 #include <spi.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 46316d34542..0a977ca84ae 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -14,6 +14,7 @@
 #include <init.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 93186b9bca3..41751f3d15c 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index e58bf3acc2e..6d9f8c988bf 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -25,6 +25,7 @@
 #include <env.h>
 #include <init.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <twl4030.h>
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c
index 57f30a04ed8..97986b67f1c 100644
--- a/board/phytec/pfla02/pfla02.c
+++ b/board/phytec/pfla02/pfla02.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 9ba3dcb092a..ebb7ddb1fb7 100644
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 647ebde09a7..45586323f3a 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -15,6 +15,7 @@
 #include <memalign.h>
 #include <mmc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/arch/mbox.h>
 #include <asm/arch/msg.h>
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 5c65b0d692a..ceeba7eda68 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmc.h>
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index 014fdf94b75..bcd8060d2b5 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmc.h>
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index 80f29644406..fca730212f0 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmc.h>
diff --git a/board/renesas/stout/cpld.c b/board/renesas/stout/cpld.c
index 366076a3b88..71a3f5dd39c 100644
--- a/board/renesas/stout/cpld.c
+++ b/board/renesas/stout/cpld.c
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
index b443c36b1df..7a52eaa9d39 100644
--- a/board/renesas/ulcb/cpld.c
+++ b/board/renesas/ulcb/cpld.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 8ee9ca43c41..4fcc0bf6f77 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <tmu.h>
 #include <netdev.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 97f4097cbcd..4463f64dbc2 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <fdtdec.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index eef565d1cee..4438bff523e 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -10,6 +10,7 @@
 #include <lcd.h>
 #include <libtizen.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 19e5bccbdb5..37bab0f4933 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <asm/arch/clock.h>
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index b79a8724273..f21cfe40d53 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -11,6 +11,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/cpu.h>
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index 6880dcda1ca..fcbead5c127 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -9,6 +9,7 @@
 #include <lcd.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index f1d93dc0aa1..2e4c72f9781 100644
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -13,6 +13,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/test.h>
 #include <asm/u-boot-sandbox.h>
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 18d9c64f55a..ebd34939cb4 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -20,6 +20,7 @@
 #include <pca953x.h>
 #include <power-domain.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx8-pins.h>
 #include <asm/arch/iomux.h>
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 0a11f25c288..0028f7a1f89 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -18,6 +18,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index 75c34797322..d60ef4e87cd 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -18,6 +18,7 @@
 #include <asm/arch/cpu.h>
 #endif
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/unaligned.h>
 #include <net.h>
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 4fec3d8c95e..18b397c61d4 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -21,6 +21,7 @@
 #include <net.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index 531ed7e1597..2da0560bd2b 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -19,6 +19,7 @@
 #include <spi.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 631812f1508..102e7e82cd9 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -18,6 +18,7 @@
 #include <flash.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
index ad0fcc20470..93bcecd6ac9 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -11,6 +11,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/board/sifive/fu540/spl.c b/board/sifive/fu540/spl.c
index 55325cf99dc..4e2662a46c6 100644
--- a/board/sifive/fu540/spl.c
+++ b/board/sifive/fu540/spl.c
@@ -10,6 +10,7 @@
 #include <spl.h>
 #include <misc.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c
index e9f7eb6cfb9..c89c7994d50 100644
--- a/board/softing/vining_fpga/socfpga.c
+++ b/board/softing/vining_fpga/socfpga.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <status_led.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 6318d7f2393..fccc88639c5 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index e3059808e16..79799e2a5ea 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -12,6 +12,7 @@
 #include <mtd.h>
 #include <mtd_node.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/stm32prog.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index 3e10eb59e0b..7443b089a31 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
index 76dd3a2a0a2..ff9505d2cad 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c
index 0a024ffe1c4..cdc5a0f8ded 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <init.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index cf78db5b44e..1ae544ff3d6 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <syscon.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index cca98e2d542..b2ee68d9c21 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -22,6 +22,7 @@
 #include <generic-phy.h>
 #include <phy-sun4i-usb.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/display.h>
diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c
index dbec12c8a7b..6b1fff98a45 100644
--- a/board/synopsys/hsdk/env-lib.c
+++ b/board/synopsys/hsdk/env-lib.c
@@ -7,6 +7,7 @@
 #include "env-lib.h"
 #include <env.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 
 #define MAX_CMD_LEN	25
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c
index 9c6e8dbc8f2..4fe6219514d 100644
--- a/board/synopsys/hsdk/hsdk.c
+++ b/board/synopsys/hsdk/hsdk.c
@@ -14,6 +14,7 @@
 #include <irq_func.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c
index 090a471a717..2f3df520928 100644
--- a/board/theadorable/theadorable.c
+++ b/board/theadorable/theadorable.c
@@ -15,6 +15,7 @@
 #endif
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index 715dcbdc7bc..7edfd2a2b92 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -11,6 +11,7 @@
 #include <misc.h>
 #include <spl.h>
 #include <syscon.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 #include <usb.h>
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 0fa4d31a2e7..67695ca61f5 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -18,6 +18,7 @@
 #include <spl.h>
 #include <serial.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index e0fb2b39b7d..869131a08f9 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <errno.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index 5721ef9e11d..862398e53a2 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/hardware.h>
 #include <asm/omap_common.h>
 #include <dm/uclass.h>
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index e88aac06683..b283bb41039 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -20,6 +20,7 @@
 #include <sata.h>
 #include <serial.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index e34598d6587..c5e313b14de 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 7b6f04b36be..1b9b79f65ae 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 76cf8e360f9..62ae4dbf922 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index 51e62b6ab20..16bb5799137 100644
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index fa9716cf57d..1f894ce1e48 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "tdx-cfg-block.h"
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 523c1bd8ca2..c04a888f935 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -8,6 +8,7 @@
 #include <g_dnl.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <linux/string.h>
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 5ebbdda38e2..42dd0a8f173 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -9,6 +9,7 @@
 
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c
index 7667bbdc579..80cd3753cbf 100644
--- a/board/varisys/common/sys_eeprom.c
+++ b/board/varisys/common/sys_eeprom.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 98cc1d9db7f..48b5058e7b4 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 045e46aba30..434aadd8763 100644
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <serial.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index d13a10e1a7c..7272dc2bb2e 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 6254df95716..e731070b5e6 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 28eb960aa89..0be26931f22 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <init.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <dm/uclass.h>
diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c
index c0da312b5d8..372a9c0baa9 100644
--- a/board/xilinx/zynq/cmds.c
+++ b/board/xilinx/zynq/cmds.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index 48898f69c93..15a05989613 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <zynqmp_firmware.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 2a1eb645574..5bb8e877f3c 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -17,6 +17,7 @@
 #include <scsi.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <wdt.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
diff --git a/cmd/abootimg.c b/cmd/abootimg.c
index f90468a1ae3..73b6053c65d 100644
--- a/cmd/abootimg.c
+++ b/cmd/abootimg.c
@@ -10,6 +10,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #define abootimg_addr() \
diff --git a/cmd/acpi.c b/cmd/acpi.c
index 2904b146bef..a6df5785f5f 100644
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -8,6 +8,7 @@
 #include <display_options.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi_table.h>
 #include <asm/global_data.h>
diff --git a/cmd/adc.c b/cmd/adc.c
index 9869aad8dce..8737f9c7f74 100644
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 
 static int do_adc_list(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/adtimg.c b/cmd/adtimg.c
index 90a72619720..e31a5b10b56 100644
--- a/cmd/adtimg.c
+++ b/cmd/adtimg.c
@@ -10,6 +10,7 @@
 #include <image-android-dt.h>
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #define OPT_INDEX	"--index"
diff --git a/cmd/aes.c b/cmd/aes.c
index 51bc922b937..db4cd114628 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <uboot_aes.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <mapmem.h>
diff --git a/cmd/armflash.c b/cmd/armflash.c
index 4c4a719ad01..e76838c55c2 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -10,6 +10,7 @@
 #include <console.h>
 #include <flash.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/cmd/avb.c b/cmd/avb.c
index a9de5bed973..6cf9648670a 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <mmc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #define AVB_BOOTARGS	"avb_bootargs"
diff --git a/cmd/axi.c b/cmd/axi.c
index e61cc3e35ca..858fddee131 100644
--- a/cmd/axi.c
+++ b/cmd/axi.c
@@ -17,6 +17,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 /* Currently selected AXI bus device */
 static struct udevice *axi_cur_bus;
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 4cccd8eab3f..46737101f65 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 enum bcb_cmd {
diff --git a/cmd/bind.c b/cmd/bind.c
index 050c4be2d72..b008d4a6e8c 100644
--- a/cmd/bind.c
+++ b/cmd/bind.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <dm.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/cmd/binop.c b/cmd/binop.c
index a643cc906ce..9fde726b5cb 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index aed076acb77..4bf7a582b52 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -12,6 +12,7 @@
 #include <blk.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 int blk_common_cmd(int argc, char *const argv[], enum if_type if_type,
diff --git a/cmd/blkcache.c b/cmd/blkcache.c
index 025c692b485..632f73a58c0 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 static int blkc_show(struct cmd_tbl *cmdtp, int flag,
 		     int argc, char *const argv[])
diff --git a/cmd/blob.c b/cmd/blob.c
index a3b4f7a3286..d4ee6966e97 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/string.h>
diff --git a/cmd/bmp.c b/cmd/bmp.c
index 499e3585f74..a4c8c3f5c06 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <stdio.h>
 #include <video.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/string.h>
 
diff --git a/cmd/boot.c b/cmd/boot.c
index 36aba22b301..8b079b31714 100644
--- a/cmd/boot.c
+++ b/cmd/boot.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <vsprintf.h>
 
 #ifdef CONFIG_CMD_GO
 
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 636b3868aef..05ff48dc5f1 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -18,6 +18,7 @@
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/cmd/booti.c b/cmd/booti.c
index de60d4ea7cb..52ce6bbc031 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index bc914b2fccb..8a976de6d3d 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <nand.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index e307660e516..d76ae7b1363 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <menu.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <linux/delay.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 1592f24c11d..3cf4138e2d4 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -7,6 +7,7 @@
 #include <bootstage.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 3a6c7ce931b..534113695c1 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 432974009a1..8f7a10751f7 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <cbfs.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 8f4d0ab54a0..b34a4dde079 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -17,6 +17,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/list.h>
 #include <linux/ctype.h>
 #include <jffs2/jffs2.h>
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index d381980ec6c..38f89dd05f6 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -13,6 +13,7 @@
 #include <flash.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/demo.c b/cmd/demo.c
index 64e41a7d26f..4285ea0dfeb 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -11,6 +11,7 @@
 #include <dm-demo.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 struct udevice *demo_dev;
diff --git a/cmd/dfu.c b/cmd/dfu.c
index b19b79c57eb..97c422a2843 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <dfu.h>
 #include <console.h>
diff --git a/cmd/disk.c b/cmd/disk.c
index bfebe3520c3..fcb19ee02e4 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc,
 		    char *const argv[])
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index ffd1db893bf..5d6df466c1c 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -26,6 +26,7 @@
 #include <i2c.h>
 #include <eeprom_layout.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 64b3b5fcb89..185300cb0d8 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -16,6 +16,7 @@
 #include <mapmem.h>
 #include <search.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/elf.c b/cmd/elf.c
index c38d8d015a9..37267ccacae 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
 #include <vbe.h>
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 6b76061cd0f..fe93d2a8b17 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -13,6 +13,7 @@
 #include <ethsw.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static const char *ethsw_name;
diff --git a/cmd/exit.c b/cmd/exit.c
index 7bf241ec732..b84b6c0e1c0 100644
--- a/cmd/exit.c
+++ b/cmd/exit.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 
 static int do_exit(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 8340af5df8c..0a6cfe45309 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/cmd/fat.c b/cmd/fat.c
index d56648f2a85..e3bee99ec9b 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -14,6 +14,7 @@
 #include <fs.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 
 int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/fdt.c b/cmd/fdt.c
index e784b0d5d94..ba44460ea39 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -12,6 +12,7 @@
 #include <env.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index ce44d7dc76b..56995822cb7 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <uuid.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #if defined(CONFIG_CMD_MTDPARTS)
diff --git a/cmd/fpga.c b/cmd/fpga.c
index 924ca10749d..b3ec2b25568 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static long do_fpga_get_device(char *arg)
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index 89b34f86425..96901b684a6 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <console.h>
 #include <display_options.h>
+#include <vsprintf.h>
 
 #include <gdsys_fpga.h>
 
diff --git a/cmd/fuse.c b/cmd/fuse.c
index d3680e98440..b75676e641e 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -13,6 +13,7 @@
 #include <console.h>
 #include <fuse.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 
diff --git a/cmd/gpio.c b/cmd/gpio.c
index 92831350b48..3171556bb28 100644
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -13,6 +13,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 639fcae8e31..086a91ab577 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -21,6 +21,7 @@
 #include <exports.h>
 #include <stdio.h>
 #include <uuid.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <div64.h>
 #include <memalign.h>
diff --git a/cmd/host.c b/cmd/host.c
index dec1da41def..b06bbc922c9 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -10,6 +10,7 @@
 #include <part.h>
 #include <sandboxblockdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index c1f7372a151..2f442f0e811 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -76,6 +76,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
diff --git a/cmd/ini.c b/cmd/ini.c
index 787e3ed950e..0c25c7ae5fe 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -15,6 +15,7 @@
 #include <command.h>
 #include <env.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/cmd/io.c b/cmd/io.c
index dd770a20ce1..d16bb4f8c61 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <display_options.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 /* Display values from last command */
diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index e691e91c486..f6db7ad48ea 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <iotrace.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 static void do_print_stats(void)
 {
diff --git a/cmd/itest.c b/cmd/itest.c
index 0ec595c0d70..0d0e1521953 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 5ccd5b09153..b2dba80cf2c 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -77,6 +77,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <jffs2/jffs2.h>
 #include <linux/bug.h>
 #include <linux/list.h>
diff --git a/cmd/led.c b/cmd/led.c
index 33714e26ae9..5ba86806852 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <led.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
 
diff --git a/cmd/legacy-mtd-utils.c b/cmd/legacy-mtd-utils.c
index c763121fe5e..2918ee6d28d 100644
--- a/cmd/legacy-mtd-utils.c
+++ b/cmd/legacy-mtd-utils.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c
index 4176f089dfc..d70f6d11462 100644
--- a/cmd/legacy_led.c
+++ b/cmd/legacy_led.c
@@ -13,6 +13,7 @@
 #include <config.h>
 #include <command.h>
 #include <status_led.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 struct led_tbl_s {
diff --git a/cmd/load.c b/cmd/load.c
index fc50722e065..b2db540e8d1 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -19,6 +19,7 @@
 #include <exports.h>
 #include <serial.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <xyzModem.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
diff --git a/cmd/log.c b/cmd/log.c
index a233d239bb3..88efad8a9f9 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index 409ad6e69c1..1452a7ac558 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -14,6 +14,7 @@
 #include <env.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 #include <lzma/LzmaTools.h>
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index a6e12bba4b5..2fb8d7b2759 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -13,6 +13,7 @@
 #include <image.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <u-boot/md5.h>
 #include <asm/io.h>
diff --git a/cmd/mdio.c b/cmd/mdio.c
index 47a33fa7813..9f2b6e23179 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -13,6 +13,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static char last_op[2];
diff --git a/cmd/mem.c b/cmd/mem.c
index 5ed3fced194..2189318f237 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -24,6 +24,7 @@
 #include <rand.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/cmd/mii.c b/cmd/mii.c
index 26dfad827b3..6afb9971794 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 typedef struct _MII_field_desc_t {
diff --git a/cmd/misc.c b/cmd/misc.c
index c349ade10f1..65bc67f6da0 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -12,6 +12,7 @@
 #include <console.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 6fdee2d4b21..72db2ea1fe6 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -15,6 +15,7 @@
 #include <sparse_format.h>
 #include <image-sparse.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
 
diff --git a/cmd/mp.c b/cmd/mp.c
index d82a8675e66..ed466685319 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static int cpu_status_all(void)
diff --git a/cmd/mtd.c b/cmd/mtd.c
index 25c288f356c..5c749354995 100644
--- a/cmd/mtd.c
+++ b/cmd/mtd.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <mtd.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 875424013fe..f18a6e70f10 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -76,6 +76,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>
diff --git a/cmd/nand.c b/cmd/nand.c
index 787baa78c55..286d5ee1df5 100644
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -23,6 +23,7 @@
 #include <bootstage.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
diff --git a/cmd/net.c b/cmd/net.c
index d7020658710..691cef17368 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -14,6 +14,7 @@
 #include <image.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static int netboot_common(enum proto_t, struct cmd_tbl *, int, char * const []);
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index e859dfc29bb..84af5f05e97 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -36,6 +36,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index aac7fb91a60..91214c93e22 100644
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -18,6 +18,7 @@
 #include <rtc.h>
 #include <stdio.h>
 #include <uuid.h>
+#include <vsprintf.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/cmd/onenand.c b/cmd/onenand.c
index af974b93fc5..c71b8b98b9d 100644
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/cmd/osd.c b/cmd/osd.c
index 2d9ac604cae..9ad0407521a 100644
--- a/cmd/osd.c
+++ b/cmd/osd.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <video_osd.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 /* Container for selected OSD device */
diff --git a/cmd/panic.c b/cmd/panic.c
index f13b3f094fa..ed2bfed03f8 100644
--- a/cmd/panic.c
+++ b/cmd/panic.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 
 static int do_panic(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char * const argv[])
diff --git a/cmd/pcap.c b/cmd/pcap.c
index d0172f3fffc..b5a3b3c0444 100644
--- a/cmd/pcap.c
+++ b/cmd/pcap.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <net/pcap.h>
 
 static int do_pcap_init(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/pci.c b/cmd/pci.c
index b8818b5f3d7..48a945e30f0 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -20,6 +20,7 @@
 #include <dm.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 6712d9238dc..3ac12938c8a 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <power/pmic.h>
 
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 84f7c9f37ef..7673469d39f 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -9,6 +9,7 @@
 #include <fs.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 #include "pxe_utils.h"
 
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 425e6f984fb..748c314fa07 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -14,6 +14,7 @@
 #include <lcd.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <errno.h>
diff --git a/cmd/qfw.c b/cmd/qfw.c
index 4470059975a..0cb6b85504d 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <qfw.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 /*
  * This function prepares kernel for zboot. It loads kernel data
diff --git a/cmd/read.c b/cmd/read.c
index f1d23fb478f..254925c1f78 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 int do_read(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/regulator.c b/cmd/regulator.c
index a9105561b6e..cdf8940fa9e 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 660a1b56357..fbb40095aa6 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <remoteproc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 /**
diff --git a/cmd/rng.c b/cmd/rng.c
index d5a1faf7a77..92d7c0de639 100644
--- a/cmd/rng.c
+++ b/cmd/rng.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <rng.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/cmd/rockusb.c b/cmd/rockusb.c
index 4eda6fa3e94..8a2ac1e3fcc 100644
--- a/cmd/rockusb.c
+++ b/cmd/rockusb.c
@@ -9,6 +9,7 @@
 #include <g_dnl.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/arch-rockchip/f_rockusb.h>
 
 static int do_rockusb(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/rtc.c b/cmd/rtc.c
index f048494c551..66d18b5973f 100644
--- a/cmd/rtc.c
+++ b/cmd/rtc.c
@@ -9,6 +9,7 @@
 #include <mapmem.h>
 #include <rtc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #define MAX_RTC_BYTES 32
diff --git a/cmd/sata.c b/cmd/sata.c
index 2c7be9c5fe8..3ce351323cc 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -17,6 +17,7 @@
 #include <part.h>
 #include <sata.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 29d6e3eac02..9aefaeb1413 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static ulong get_arg(char *s, int w)
diff --git a/cmd/sf.c b/cmd/sf.c
index cf4be777437..c6a69422ebd 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -18,6 +18,7 @@
 #include <spi_flash.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
diff --git a/cmd/smccc.c b/cmd/smccc.c
index 89ef440f1dc..8305d741bb0 100644
--- a/cmd/smccc.c
+++ b/cmd/smccc.c
@@ -4,6 +4,7 @@
  * Michalis Pappas <mpappas@fastmail.fm>
  */
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/psci.h>
 #include <common.h>
 #include <command.h>
diff --git a/cmd/sound.c b/cmd/sound.c
index 95d7b8b6ecc..c01ee4bd4c9 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <sound.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cmd/source.c b/cmd/source.c
index b7dfeb0adf2..d5488a903ef 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -22,6 +22,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
 
diff --git a/cmd/spi.c b/cmd/spi.c
index 7184e44c030..72662f0e0b1 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <spi.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 /*-----------------------------------------------------------------------
diff --git a/cmd/strings.c b/cmd/strings.c
index adc6e814712..0d31b3d47f8 100644
--- a/cmd/strings.c
+++ b/cmd/strings.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static char *start_addr, *last_addr;
diff --git a/cmd/sysboot.c b/cmd/sysboot.c
index 4f6869382f2..9090b8ee441 100644
--- a/cmd/sysboot.c
+++ b/cmd/sysboot.c
@@ -5,6 +5,7 @@
 #include <env.h>
 #include <fs.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "pxe_utils.h"
 
diff --git a/cmd/test.c b/cmd/test.c
index ad69e6dd7a6..e95b8cb4406 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <fs.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #define OP_INVALID	0
diff --git a/cmd/thordown.c b/cmd/thordown.c
index e837064ffdd..f5e73ba963b 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -13,6 +13,7 @@
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 
 int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 6be51f8c335..c036df8a1f8 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/hardware.h>
 #include <asm/cache.h>
 #include <asm/emif.h>
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 5a9abf44058..98104fb7f2d 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
diff --git a/cmd/tpm-common.c b/cmd/tpm-common.c
index 943bd0bfc9a..2df4dc06920 100644
--- a/cmd/tpm-common.c
+++ b/cmd/tpm-common.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
 #include <tpm-common.h>
diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c
index 4e935b28676..00d589fac07 100644
--- a/cmd/tpm-v1.c
+++ b/cmd/tpm-v1.c
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index 33cc85fa6f0..1a6e80a3866 100644
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <tpm-common.h>
 #include <tpm-v2.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "tpm-user-utils.h"
 
diff --git a/cmd/trace.c b/cmd/trace.c
index a09d837c049..0de1ac02ae2 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -9,6 +9,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <trace.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 static int get_args(int argc, char *const argv[], char **buff,
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index 6a9e346f27d..17f7f192f96 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
diff --git a/cmd/ubi.c b/cmd/ubi.c
index 707f1a9b87d..54955f5ef2f 100644
--- a/cmd/ubi.c
+++ b/cmd/ubi.c
@@ -21,6 +21,7 @@
 #include <nand.h>
 #include <onenand_uboot.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 1e2dfab2f49..191199c0762 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <ubifs_uboot.h>
+#include <vsprintf.h>
 
 static int ubifs_initialized;
 static int ubifs_mounted;
diff --git a/cmd/ufs.c b/cmd/ufs.c
index a04d15a2441..8d3ee93ae22 100644
--- a/cmd/ufs.c
+++ b/cmd/ufs.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <ufs.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static int do_ufs(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/universe.c b/cmd/universe.c
index c7edde24d45..b1eeff7a660 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <linux/string.h>
diff --git a/cmd/unlz4.c b/cmd/unlz4.c
index 7221a8bd2c7..a885c93dc4b 100644
--- a/cmd/unlz4.c
+++ b/cmd/unlz4.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <lz4.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/unzip.c b/cmd/unzip.c
index a2d21ffa0a8..3143877dd8c 100644
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -10,6 +10,7 @@
 #include <gzip.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 static int do_unzip(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
diff --git a/cmd/usb.c b/cmd/usb.c
index cc2f4f62e99..6a6d20096ad 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -17,6 +17,7 @@
 #include <console.h>
 #include <dm.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/uclass-internal.h>
 #include <memalign.h>
 #include <asm/byteorder.h>
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 651a3ebcb5d..912ad274aeb 100644
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -11,6 +11,7 @@
 #include <g_dnl.h>
 #include <sdp.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 
 static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index 51d5ad78c63..84d919d4467 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <usb_mass_storage.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/cmd/w1.c b/cmd/w1.c
index ee2eefecdf8..7c13d83553a 100644
--- a/cmd/w1.c
+++ b/cmd/w1.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <w1.h>
 #include <w1-eeprom.h>
 #include <dm/device-internal.h>
diff --git a/cmd/wdt.c b/cmd/wdt.c
index fff95a93b32..422be75a0db 100644
--- a/cmd/wdt.c
+++ b/cmd/wdt.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <dm.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <wdt.h>
 
 static struct udevice *currdev;
diff --git a/cmd/wol.c b/cmd/wol.c
index f0d63432272..61a9d95e0eb 100644
--- a/cmd/wol.c
+++ b/cmd/wol.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <vsprintf.h>
 
 #if defined(CONFIG_CMD_WOL)
 void wol_set_timeout(ulong);
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index 6bc4fb1c9be..2f2e205d710 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/msr.h>
 #include <asm/mp.h>
 #include <asm/mtrr.h>
diff --git a/cmd/ximg.c b/cmd/ximg.c
index c6016719dc9..11acfaab4d9 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -20,6 +20,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #if defined(CONFIG_BZIP2)
 #include <bzlib.h>
diff --git a/cmd/yaffs2.c b/cmd/yaffs2.c
index 3a3dba3cfd3..29b52f7ceda 100644
--- a/cmd/yaffs2.c
+++ b/cmd/yaffs2.c
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #include <config.h>
diff --git a/cmd/zfs.c b/cmd/zfs.c
index 9a03722a030..dde1c097c63 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include <zfs_common.h>
diff --git a/cmd/zip.c b/cmd/zip.c
index 407390a95a4..bb2a9ff969e 100644
--- a/cmd/zip.c
+++ b/cmd/zip.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <gzip.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 static int do_zip(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
diff --git a/common/autoboot.c b/common/autoboot.c
index 1effce6f7e5..4ba7e25588a 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -20,6 +20,7 @@
 #include <post.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/common/board_r.c b/common/board_r.c
index 6f08a07ab19..735fa4128d5 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -22,6 +22,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/common/bootm.c b/common/bootm.c
index 3b8c232922c..ae71ee0e30a 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 1987c574d99..2496a3cc624 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -15,6 +15,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
diff --git a/common/bootretry.c b/common/bootretry.c
index cd04ad9894d..5417389a9a3 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 
 #ifndef CONFIG_BOOT_RETRY_MIN
diff --git a/common/bootstage.c b/common/bootstage.c
index 4656951675c..190379f8ac0 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -17,6 +17,7 @@
 #include <sort.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <linux/libfdt.h>
diff --git a/common/cli_hush.c b/common/cli_hush.c
index f077707f9f7..7a66d337148 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -87,6 +87,7 @@
 #ifndef CONFIG_SYS_PROMPT_HUSH_PS2
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #endif
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #endif
diff --git a/common/console.c b/common/console.c
index c783a41b520..cbede53f04f 100644
--- a/common/console.c
+++ b/common/console.c
@@ -20,6 +20,7 @@
 #include <stdio_dev.h>
 #include <exports.h>
 #include <env_internal.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 9493d1158d4..801d8633bae 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,6 +1,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c
index e68cf5d4810..d67b0f4f0b8 100644
--- a/common/eeprom/eeprom_field.c
+++ b/common/eeprom/eeprom_field.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <eeprom_field.h>
 
diff --git a/common/fdt_support.c b/common/fdt_support.c
index c768e4c8bab..d506d580914 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <stdio_dev.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/common/hash.c b/common/hash.c
index f6d032038f7..e44fdedc2fa 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <hw_sha.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/common/image-cipher.c b/common/image-cipher.c
index 3a4ba40b743..d9a1230f26f 100644
--- a/common/image-cipher.c
+++ b/common/image-cipher.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/image-fdt.c b/common/image-fdt.c
index af93298ffab..e01e88b989a 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index 76318ca6ed3..01353f0157d 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -15,6 +15,7 @@
 #include <u-boot/crc.h>
 #else
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/compiler.h>
 #include <linux/kconfig.h>
 #include <common.h>
diff --git a/common/image.c b/common/image.c
index 61c60885856..565a5ebeed5 100644
--- a/common/image.c
+++ b/common/image.c
@@ -16,6 +16,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/common/kallsyms.c b/common/kallsyms.c
index b8e64c5b633..80bd8c1c76c 100644
--- a/common/kallsyms.c
+++ b/common/kallsyms.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 /* We need the weak marking as this symbol is provided specially */
diff --git a/common/kgdb.c b/common/kgdb.c
index 62997f10005..9bf7434ddb2 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -89,6 +89,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/ptrace.h>
 #include <linux/string.h>
 
diff --git a/common/lcd.c b/common/lcd.c
index 442e61d9fd2..f71477c2963 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -14,6 +14,7 @@
 #include <env_callback.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <init.h>
 #include <asm/global_data.h>
diff --git a/common/lcd_console.c b/common/lcd_console.c
index 0ccb4a46880..6c70b88e10e 100644
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -16,6 +16,7 @@
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
 #endif
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static struct console_t cons;
diff --git a/common/log.c b/common/log.c
index 493ee0ff0d9..c4eaed2c91e 100644
--- a/common/log.c
+++ b/common/log.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdarg.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/uclass.h>
 #include <linux/string.h>
diff --git a/common/log_syslog.c b/common/log_syslog.c
index 6cb4ed18ca1..21c10511df1 100644
--- a/common/log_syslog.c
+++ b/common/log_syslog.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdarg.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/main.c b/common/main.c
index 4b3cd302c3e..9ce703090bc 100644
--- a/common/main.c
+++ b/common/main.c
@@ -16,6 +16,7 @@
 #include <init.h>
 #include <net.h>
 #include <version.h>
+#include <vsprintf.h>
 
 static void run_preboot_environment_command(void)
 {
diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 5680157b720..fd1039c0ee1 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <phy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4c852d34754..5fd0119cb59 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -19,6 +19,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <nand.h>
diff --git a/common/splash.c b/common/splash.c
index e6dce1dbf3a..1f92d791df8 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -26,6 +26,7 @@
 #include <splash.h>
 #include <lcd.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 static struct splash_location default_splash_locations[] = {
diff --git a/common/splash_source.c b/common/splash_source.c
index 8166d0055b9..99dce118a8f 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -21,6 +21,7 @@
 #include <splash.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/stdio.c b/common/stdio.c
index 3f29c91ce48..eea1507754d 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -19,6 +19,7 @@
 #include <stdio_dev.h>
 #include <serial.h>
 #include <splash.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/common/update.c b/common/update.c
index 5fb6a2d5288..5cf02ddec2d 100644
--- a/common/update.c
+++ b/common/update.c
@@ -10,6 +10,7 @@
 #include <cpu_func.h>
 #include <image.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 244bd0a1369..a846fc5dff9 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -31,6 +31,7 @@
 #include <memalign.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 3416bee012f..9fc002bcf67 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -41,6 +41,7 @@
 #include <mapmem.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 #include <asm/processor.h>
diff --git a/common/xyzModem.c b/common/xyzModem.c
index e8eb578f696..46dbf7c7ee6 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -23,6 +23,7 @@
  */
 #include <common.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <xyzModem.h>
 #include <stdarg.h>
 #include <u-boot/crc.h>
diff --git a/disk/part.c b/disk/part.c
index bc5afc2f018..f2aadc47f49 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <ubifs_uboot.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #undef	PART_DEBUG
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index e8c7068081b..40ae1466788 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -9,6 +9,7 @@
 #include <env.h>
 #include <ide.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "part_amiga.h"
 #include <part.h>
diff --git a/disk/part_dos.c b/disk/part_dos.c
index a321ad2d220..4c4e5dfe11c 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -19,6 +19,7 @@
 #include <ide.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "part_dos.h"
 #include <part.h>
diff --git a/disk/part_efi.c b/disk/part_efi.c
index d066d9c920c..65937379199 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <uuid.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/unaligned.h>
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index d05968dada8..d44df799e97 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -12,6 +12,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fsl_serdes.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index f122d154e33..849b6892ba8 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -39,6 +39,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 920a3c9f901..b55b9daab74 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -11,6 +11,7 @@
 #include <pci.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <malloc.h>
 #include <asm/io.h>
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 1e4b6ba0c6b..0ada5b693b1 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -39,6 +39,7 @@
 
 #include <stdarg.h>
 #include <common.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index a13b239cc9c..b31586ab811 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 6ac9323420d..c7b37bfe11b 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 5c4d24c9c02..08c9b6a3b36 100644
--- a/drivers/block/sandbox.c
+++ b/drivers/block/sandbox.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <sandboxblockdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/errno.h>
diff --git a/drivers/board/sandbox.c b/drivers/board/sandbox.c
index 50621e47a4f..22aaad10283 100644
--- a/drivers/board/sandbox.c
+++ b/drivers/board/sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <board.h>
+#include <vsprintf.h>
 
 #include "sandbox.h"
 
diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index fff359a8035..664d8f98615 100644
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -10,6 +10,7 @@
 #include <div64.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c
index b00fe1d13b0..f590ad8dfa9 100644
--- a/drivers/clk/clk_zynq.c
+++ b/drivers/clk/clk_zynq.c
@@ -11,6 +11,7 @@
 #include <clk-uclass.h>
 #include <dm.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <dm/lists.h>
diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c
index 26f240b022c..368cd023578 100644
--- a/drivers/core/of_access.c
+++ b/drivers/core/of_access.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bug.h>
 #include <linux/libfdt.h>
diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
index f6597c27350..e04fc9d2687 100644
--- a/drivers/core/of_extra.c
+++ b/drivers/core/of_extra.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_extra.h>
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 31c1d67fe2c..fe94799b230 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -10,6 +10,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index fd079951d6f..5a2fe894a5d 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <init.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 
diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c
index 7c5ccaa0d00..9092562fb7c 100644
--- a/drivers/cpu/cpu_sandbox.c
+++ b/drivers/cpu/cpu_sandbox.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <cpu.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 int cpu_sandbox_get_desc(const struct udevice *dev, char *buf, int size)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 907358f312e..2ebb2819488 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <thermal.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/system.h>
 #include <asm/arch/sci/sci.h>
diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c
index d19685b0ec4..9138de69e8a 100644
--- a/drivers/crypto/fsl/error.c
+++ b/drivers/crypto/fsl/error.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "desc.h"
 #include "jr.h"
diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c
index afdad43d331..b2a1e822feb 100644
--- a/drivers/crypto/fsl/sec.c
+++ b/drivers/crypto/fsl/sec.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #if CONFIG_SYS_FSL_SEC_COMPAT == 2 || CONFIG_SYS_FSL_SEC_COMPAT >= 4
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index b7986a4f47e..488f950dfcf 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <watchdog.h>
 #include <asm/cache.h>
diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index 645d83c0df8..e3a7670e3d1 100644
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -17,6 +17,7 @@
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/bitops.h>
 #include <linux/ctype.h>
 #include <asm/types.h>
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index cf0731bd842..92a29568342 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/bitops.h>
 #include <linux/string.h>
 
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 22bee2d3632..87d720afcbb 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -10,6 +10,7 @@
 #include <fsl_ddr_sdram.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 
 #include <fsl_ddr.h>
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 043c03a3492..dad6b5a1e36 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -16,6 +16,7 @@
 #include <dfu.h>
 #include <hash.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/list.h>
 #include <linux/compiler.h>
 #include <linux/printk.h>
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index a3444f131ea..d34456c82f2 100644
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -17,6 +17,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index ebf4b8b26e8..679c7713fba 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -11,6 +11,7 @@
 #include <dfu.h>
 #include <mtd.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <jffs2/load_kernel.h>
 #include <linux/err.h>
 #include <linux/string.h>
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index b4abe6005d9..848a9d81d11 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -16,6 +16,7 @@
 #include <div64.h>
 #include <dfu.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/mtd/mtd.h>
 #include <jffs2/load_kernel.h>
 #include <nand.h>
diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c
index b2a5b62d425..969468e7e41 100644
--- a/drivers/dfu/dfu_ram.c
+++ b/drivers/dfu/dfu_ram.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <dfu.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index b64570aa4c7..c6c5328602e 100644
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -12,6 +12,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <jffs2/load_kernel.h>
 #include <linux/mtd/mtd.h>
 #include <linux/string.h>
diff --git a/drivers/dfu/dfu_virt.c b/drivers/dfu/dfu_virt.c
index 62605bcde50..4d9a56bbf5c 100644
--- a/drivers/dfu/dfu_virt.c
+++ b/drivers/dfu/dfu_virt.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 
 int __weak dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset,
 				 void *buf, long *len)
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index f479f2a79e3..6e02e8ff6e3 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <dm/read.h>
 #include <dma-uclass.h>
 #include <dt-structs.h>
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index cab6031ccf2..15be04b0898 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -9,6 +9,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index ab477f5cb91..966c0024579 100644
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c
index 325ce4d283f..dfa383de57d 100644
--- a/drivers/fastboot/fb_common.c
+++ b/drivers/fastboot/fb_common.c
@@ -16,6 +16,7 @@
 #include <fastboot.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index a7881cc7196..448840ae4fe 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -12,6 +12,7 @@
 #include <fs.h>
 #include <part.h>
 #include <version.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 3e38848d4cc..b4f8dba9604 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c
index 180663ca32f..1466452d50d 100644
--- a/drivers/fpga/ivm_core.c
+++ b/drivers/fpga/ivm_core.c
@@ -32,6 +32,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <malloc.h>
 #include <lattice.h>
diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 6d497613cc4..81666c83a59 100644
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -13,6 +13,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 2e371f3ad79..b4501da67d1 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c
index 06151d21fba..49236c97722 100644
--- a/drivers/gpio/hi6220_gpio.c
+++ b/drivers/gpio/hi6220_gpio.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c
index 8ff37f2eccc..60b8e8e25ac 100644
--- a/drivers/gpio/imx_rgpio2p.c
+++ b/drivers/gpio/imx_rgpio2p.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <malloc.h>
diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c
index eac0ff82ae6..d818954ce29 100644
--- a/drivers/gpio/mpc83xx_spisel_boot.c
+++ b/drivers/gpio/mpc83xx_spisel_boot.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
 
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 14ecfb42c58..20ad373d023 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <linux/string.h>
 
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 5b57a7f0af6..1334e156654 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <dm.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 4ff267899cb..310e04dd33e 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c
index fb2f5a30b6d..8d9cee05067 100644
--- a/drivers/gpio/omap_gpio.c
+++ b/drivers/gpio/omap_gpio.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 3e32d70e29d..adb2079e083 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -13,6 +13,7 @@
 #include <i2c.h>
 #include <pca953x.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 /* Default to an address that hopefully won't corrupt other i2c devices */
 #ifndef CONFIG_SYS_I2C_PCA953X_ADDR
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index 4ffb3aa27f4..e5fbd291377 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -24,6 +24,7 @@
 #include <fdtdec.h>
 #include <i2c.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c
index 00f20c0979c..7a98469de46 100644
--- a/drivers/gpio/pic32_gpio.c
+++ b/drivers/gpio/pic32_gpio.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c
index 3cabd11b5c5..29ef2dc2c85 100644
--- a/drivers/gpio/rk_gpio.c
+++ b/drivers/gpio/rk_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <syscon.h>
+#include <vsprintf.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index 599df135acf..df4ca043ac1 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <acpi/acpi_device.h>
 #include <asm/gpio.h>
 #include <dm/acpi.h>
diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c
index eb8b8f65e98..e7dbeea400d 100644
--- a/drivers/gpio/sifive-gpio.c
+++ b/drivers/gpio/sifive-gpio.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <vsprintf.h>
 #include <asm/arch/gpio.h>
 #include <asm/io.h>
 #include <errno.h>
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 973854ca613..20a60fe8b07 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/arch/gpio.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
diff --git a/drivers/gpio/tca642x.c b/drivers/gpio/tca642x.c
index 21e432d7d80..9929eed5d1b 100644
--- a/drivers/gpio/tca642x.c
+++ b/drivers/gpio/tca642x.c
@@ -25,6 +25,7 @@
 #include <i2c.h>
 #include <stdio.h>
 #include <tca642x.h>
+#include <vsprintf.h>
 
 /* tca642x register address definitions */
 struct tca642x_bank_info tca642x_regs[] = {
diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index d0d869c81a1..946506b89b2 100644
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
+#include <vsprintf.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
 #include <asm/lpss.h>
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c
index d73748adc4c..3b7db392b67 100644
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c
index 0e98e08e4a7..57ff9ec2a4a 100644
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@@ -14,6 +14,7 @@
 #include <pci.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/string.h>
 
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index bd2818197c6..4cf609bdad4 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "ds4510.h"
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 4ac0bead51b..ed1e2cf420d 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index 3468f02208e..5aabac79309 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include <k3-avs.h>
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 60cab7c0fca..01a028ddb9f 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -22,6 +22,7 @@
 #include <fdt_support.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e5a712fbf1b..a3fdc5d63cc 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <dm/device-internal.h>
 #include <errno.h>
diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c
index 56755c66fd2..f8943314173 100644
--- a/drivers/mmc/mmc_spi.c
+++ b/drivers/mmc/mmc_spi.c
@@ -13,6 +13,7 @@
 #include <part.h>
 #include <mmc.h>
 #include <stdlib.h>
+#include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 95d3cad4d0c..54a34c72598 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -36,6 +36,7 @@
 #endif
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index d2d6640a747..413fa41e770 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -28,6 +28,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c
index 21ca7bd65d4..02b4277bd23 100644
--- a/drivers/mtd/cfi_mtd.c
+++ b/drivers/mtd/cfi_mtd.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <flash.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #include <linux/errno.h>
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 6b0ea195312..ba19bd8c7fa 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -28,6 +28,7 @@
 #include <linux/gfp.h>
 #include <linux/slab.h>
 #else
+#include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 2f882b7df07..ea31330bf11 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 #include <linux/compat.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 3ac5b444516..cefe65654c5 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -14,6 +14,7 @@
 
 #include <common.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
index 93c75e4d9bb..9223b9260d1 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
@@ -3,6 +3,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdarg.h>
+#include <vsprintf.h>
 #include <dm/devres.h>
 #include "brcmnand_compat.h"
 
diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c
index 026419e4e64..1b7918c54b6 100644
--- a/drivers/mtd/nand/raw/nand.c
+++ b/drivers/mtd/nand/raw/nand.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <nand.h>
 #include <errno.h>
+#include <vsprintf.h>
 #include <linux/mtd/concat.h>
 
 #ifndef CONFIG_SYS_NAND_BASE_LIST
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 87494854fc2..a59dae357f3 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -25,6 +25,7 @@
 #include <spi.h>
 #include <spi-mem.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index bd73642752b..7e5aaac2372 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <log.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 5e96d3dc6c8..354d7b47f0f 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <linux/string.h>
diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index d41811ecdae..5f80e115f4d 100644
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -7,6 +7,7 @@
 #include <flash.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <spi_flash.h>
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index a449b21b5bf..f07051c9f73 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/major.h>
 #else
+#include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/log2.h>
 #include <linux/printk.h>
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index e9c50a4852b..c84e3471266 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <ubi_uboot.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 #include "ubi.h"
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index da68f3519da..079ffbe7563 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -19,6 +19,7 @@
 #else
 #include <div64.h>
 #include <ubi_uboot.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #endif
 #include <linux/math64.h>
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index bae402418fb..b7e5cc17ef4 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -94,6 +94,7 @@
 #include <linux/kthread.h>
 #else
 #include <ubi_uboot.h>
+#include <vsprintf.h>
 #endif
 
 #include "ubi.h"
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 337e09d167e..7714178e478 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -17,6 +17,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 0c5c2e3053d..8e58464cc6c 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -19,6 +19,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 21266d66dd6..a0cbecf60df 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -9,6 +9,7 @@
 #include <net.h>
 #include <config.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index 8849195f248..b759d12867d 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <phy.h>
 #include <reset.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <linux/printk.h>
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 8b020535006..f6b473ae9b0 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -15,6 +15,7 @@
 #include <miiphy.h>
 #include <net.h>
 #include <reset.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index ed17df0392b..a767fa6e6de 100644
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -18,6 +18,7 @@
 
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <clk.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 0fcbcf919a0..5df36fa6726 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -7,6 +7,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 9baef753b60..3b0219eee92 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 2abe901a855..bb36b77169a 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -21,6 +21,7 @@
 #include <reset.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 1233d7814dd..485e6c0cdcc 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 151ae3e038d..5041a1894ee 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -40,6 +40,7 @@ tested on both gig copper and gig fiber boards
 #include <net.h>
 #include <pci.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 6af5b32e413..7e37ade1e9c 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -2,6 +2,7 @@
 #include <command.h>
 #include <console.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include "e1000.h"
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 1272e915f0e..a8a20a08012 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <cpu_func.h>
 #include <malloc.h>
diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c
index 2116f31cf76..802d04a26ba 100644
--- a/drivers/net/ep93xx_eth.c
+++ b/drivers/net/ep93xx_eth.c
@@ -21,6 +21,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/arch/ep93xx.h>
 #include <asm/io.h>
 #include <malloc.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 73228d9e568..a1e051770c7 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <linux/io.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 79eb1497930..669f3af7aee 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -19,6 +19,7 @@
 #include <netdev.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 308b2baf936..7d65ee70be4 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <part.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #ifdef CONFIG_DM_ETH
 #include <dm.h>
diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c
index 608e2add6cc..924632c3991 100644
--- a/drivers/net/fm/fdt.c
+++ b/drivers/net/fm/fdt.c
@@ -3,6 +3,7 @@
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <env.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h
index 59b83487cf8..6180896d3d4 100644
--- a/drivers/net/fsl-mc/dpio/qbman_private.h
+++ b/drivers/net/fsl-mc/dpio/qbman_private.h
@@ -6,6 +6,7 @@
 /* Perform extra checking */
 #include <common.h>
 #include <errno.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index aa0cfee67ae..3a7e8e84b46 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index d983841bafd..ed302eace59 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 474714da958..9bca18e9407 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -10,6 +10,7 @@
 #include <pci.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <miiphy.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 26901136d58..e2b897a7ccc 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ftmac110.c b/drivers/net/ftmac110.c
index 6ce47832a68..2ff318cb9a9 100644
--- a/drivers/net/ftmac110.c
+++ b/drivers/net/ftmac110.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index c1b6d8195b5..65b160f8c40 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -6,6 +6,7 @@
 
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <common.h>
 #include <command.h>
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 0bc2c21e599..7c26c60ff2b 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -50,6 +50,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index 5de15c9684f..ac0487e68d2 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index fcb940037a3..3d6b2fa8eb4 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 9056394eab4..d65378cec72 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cpm_8xx.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/mscc_eswitch/mscc_miim.c b/drivers/net/mscc_eswitch/mscc_miim.c
index 6687787b1a6..de257d4d60f 100644
--- a/drivers/net/mscc_eswitch/mscc_miim.c
+++ b/drivers/net/mscc_eswitch/mscc_miim.c
@@ -4,6 +4,7 @@
  */
 
 #include <miiphy.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <linux/bitops.h>
 #include "mscc_miim.h"
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index b8739562b73..1eea520b876 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -22,6 +22,7 @@
 #include <net.h>
 #include <reset.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 0ad215da92f..ad86820bbb0 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <syscon.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/cache.h>
 #include <asm/gpio.h>
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 227f22f7e05..45f4e004c9c 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 99653479258..ce7cf045f73 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 98a56cb8de1..9baa1004bf3 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <dm.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 1819c24a843..f705a026431 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -55,6 +55,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 432d2b0121c..b4bbd9429fd 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio_dev.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #ifndef CONFIG_NETCONSOLE_BUFFER_SIZE
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index b0aeb470a19..bb07369d32f 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -56,6 +56,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 164b6b4afa2..24947a33d74 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
index 365a74aa094..4a189f7b280 100644
--- a/drivers/net/pfe_eth/pfe_cmd.c
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <net/pfe_eth/pfe_eth.h>
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index 4fb81ab0cd4..4848e2e2aa9 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index 0f682d1cfdd..4cc55b36885 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/platform_data/pfe_dm_eth.h>
 #include <net.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index 34ba893dcdb..2e4796f5d6c 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index a02d620d966..18e9f5ab25c 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index 977102d4d80..c11ddf765f6 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <mv88e6352.h>
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 8f76279c7ee..b3f392cb8bf 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -17,6 +17,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 42169e99683..ba0f477bf23 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -76,6 +76,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 84f3fa473c7..69f895f720b 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -18,6 +18,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 9b279d48002..036642b223b 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -53,6 +53,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index a28ccc8c18a..196020c1b81 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c
index 9288355fb4a..13ec074acac 100644
--- a/drivers/net/sni_ave.c
+++ b/drivers/net/sni_ave.c
@@ -15,6 +15,7 @@
 #include <regmap.h>
 #include <reset.h>
 #include <syscon.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index b0d83de8cbd..0715cf81c74 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index f4cb86d10a7..e47d5a2a5c5 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <wait_bit.h>
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index b4647554bce..19041be320e 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -29,6 +29,7 @@
 #include <miiphy.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
 #include <asm/arch/emac_defs.h>
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 4dd205c1507..96bbb219d5d 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <console.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 17ce68baffe..afcb170be32 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <tsec.h>
 #include <fsl_mdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 0a8369f96e3..530341faa3f 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -14,6 +14,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
index b1bb27fb7f8..4ae225e879f 100644
--- a/drivers/net/vsc9953.c
+++ b/drivers/net/vsc9953.c
@@ -9,6 +9,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <fm_eth.h>
diff --git a/drivers/nvme/nvme-uclass.c b/drivers/nvme/nvme-uclass.c
index 277e31e1f39..9fb2900d55f 100644
--- a/drivers/nvme/nvme-uclass.c
+++ b/drivers/nvme/nvme-uclass.c
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <errno.h>
 #include <dm.h>
+#include <vsprintf.h>
 #include <dm/device.h>
 #include "nvme.h"
 
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 8b3b60570d7..9ce57335bc6 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -15,6 +15,7 @@
 #include <pci.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <linux/compat.h>
 #include <linux/string.h>
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index afb2dfd30e5..4c77a694ada 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/fsl_serdes.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 72b68d61ff1..1174d90b5f1 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -12,6 +12,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b6a147ec1f5..4eac485f278 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 07c34fe74da..57edb22d819 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index a94ab8310c6..8318b9ee796 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -15,6 +15,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <reset.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index db62fd45f8f..16c412b245d 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -14,6 +14,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <dm/device.h>
 #include <generic-phy.h>
 #include <phy-sun4i-usb.h>
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
index 6c8a990f57b..af10ead601f 100644
--- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
+++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c
@@ -4,6 +4,7 @@
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/pinctrl.h>
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index c6cb941d0a9..8246aa6890e 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -5,6 +5,7 @@
  */
 
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
index 159f3406a20..90c5e164896 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
@@ -4,6 +4,7 @@
  */
 
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <common.h>
 #include <dm.h>
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 639eb849db4..8a3c292548e 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 0fe1b348809..1e8c345b847 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -21,6 +21,7 @@
 #include <dm.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c
index b3312294683..28db1116387 100644
--- a/drivers/pinctrl/pinctrl-sandbox.c
+++ b/drivers/pinctrl/pinctrl-sandbox.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <dm/pinctrl.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index 09414f6627f..d446982c4e7 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <regmap.h>
 #include <syscon.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm/pinctrl.h>
diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
index 2c437c25f69..dc063e087e8 100644
--- a/drivers/pinctrl/pinctrl-stmfx.c
+++ b/drivers/pinctrl/pinctrl-stmfx.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2c.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c
index 79a52333053..f821959137e 100644
--- a/drivers/pinctrl/pinctrl-uclass.c
+++ b/drivers/pinctrl/pinctrl-uclass.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
 #include <linux/libfdt.h>
diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 98232fad398..998b90f803f 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -3,6 +3,7 @@
 #include <hwspinlock.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/arch/gpio.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index a7df7965f64..35be5d90732 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/list.h>
diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c
index 48acb6d744e..c6973dad3a8 100644
--- a/drivers/pwm/pwm-mtk.c
+++ b/drivers/pwm/pwm-mtk.c
@@ -11,6 +11,7 @@
 #include <pwm.h>
 #include <div64.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index cd3ef178967..7c14fe35e58 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <command.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/io.h>
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index d765cd1f595..49adc58165d 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -10,6 +10,7 @@
 #include <net.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index dcf3590c6c3..3726a39335e 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 1b8cb594966..3f61addac31 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -10,6 +10,7 @@
 #include <init.h>
 #include <log.h>
 #include <ram.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index 911bc2223db..1f39ce5ea49 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -10,6 +10,7 @@
 #include <reset.h>
 #include <stdio.h>
 #include <timer.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
 #include <linux/bitops.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c
index e758abe9ee9..34c9af7214b 100644
--- a/drivers/ram/stm32mp1/stm32mp1_interactive.c
+++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c
@@ -14,6 +14,7 @@
 #include <reset.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "stm32mp1_ddr.h"
diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c
index 2d73b768b49..02ee683303d 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tests.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tests.c
@@ -8,6 +8,7 @@
 #include <log.h>
 #include <rand.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/ram/stm32mp1/stm32mp1_tuning.c b/drivers/ram/stm32mp1/stm32mp1_tuning.c
index 8707dead754..822c890031a 100644
--- a/drivers/ram/stm32mp1/stm32mp1_tuning.c
+++ b/drivers/ram/stm32mp1/stm32mp1_tuning.c
@@ -10,6 +10,7 @@
 #include <rand.h>
 #include <reset.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 87daf65d7fe..f01b1e53e98 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -17,6 +17,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
 #include <env.h>
diff --git a/drivers/rtc/m41t60.c b/drivers/rtc/m41t60.c
index 21775a5aed6..05ed89bf8d6 100644
--- a/drivers/rtc/m41t60.c
+++ b/drivers/rtc/m41t60.c
@@ -22,6 +22,7 @@
 #include <rtc.h>
 #include <i2c.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 /*
  * Convert between century and "century bits" (CB1 and CB0).  These routines
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 6f940d23e7a..1a5e256d61a 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -14,6 +14,7 @@
 #include <pci.h>
 #include <scsi.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 #include <linux/string.h>
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 86fec934c1e..bb6bdbe4291 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -12,6 +12,7 @@
 #include <serial.h>
 #include <stdio.h>
 #include <stdio_dev.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index ac967b1648d..3f8ab647e55 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <post.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <errno.h>
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 6fc126f404b..a97d03a8876 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <hang.h>
+#include <vsprintf.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/regs-uart.h>
 #include <asm/global_data.h>
diff --git a/drivers/soc/soc_sandbox.c b/drivers/soc/soc_sandbox.c
index 5c82ad84fc2..dbc0f316d64 100644
--- a/drivers/soc/soc_sandbox.c
+++ b/drivers/soc/soc_sandbox.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <soc.h>
+#include <vsprintf.h>
 
 int soc_sandbox_get_family(struct udevice *dev, char *buf, int size)
 {
diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c
index ae23ef74752..77514c225e2 100644
--- a/drivers/soc/soc_ti_k3.c
+++ b/drivers/soc/soc_ti_k3.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <dm.h>
 #include <soc.h>
+#include <vsprintf.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 9320a8be685..7dbbe1f43cf 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -10,6 +10,7 @@
  */
 
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <common.h>
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index d7cef659ea4..7e08bf9dc54 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -18,6 +18,7 @@
 #include <spi_flash.h>
 #include <os.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 #include <linux/errno.h>
 #include <asm/spi.h>
diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 0f86e89b90a..39274d0b69f 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -10,6 +10,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <sysreset.h>
+#include <vsprintf.h>
 #include <wait_bit.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index 94ebd8ad54e..78dd3559173 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <timer.h>
+#include <vsprintf.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
index 8a1c65bbe8c..24b1e244860 100644
--- a/drivers/tpm/cr50_i2c.c
+++ b/drivers/tpm/cr50_i2c.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <tpm-v2.h>
+#include <vsprintf.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomap.h>
diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c
index a7c94c7429b..885b3e2c148 100644
--- a/drivers/tpm/tpm2_ftpm_tee.c
+++ b/drivers/tpm/tpm2_ftpm_tee.c
@@ -18,6 +18,7 @@
 #include <log.h>
 #include <tpm-v2.h>
 #include <tee.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #include "tpm_tis.h"
diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 70e4e258db1..437f65cc395 100644
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <tpm-v2.h>
+#include <vsprintf.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c
index 52fb3a9235f..6303187180f 100644
--- a/drivers/tpm/tpm2_tis_spi.c
+++ b/drivers/tpm/tpm2_tis_spi.c
@@ -20,6 +20,7 @@
 #include <spi.h>
 #include <time.h>
 #include <tpm-v2.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c
index e8391eaa1e6..29062b15641 100644
--- a/drivers/tpm/tpm_tis_infineon.c
+++ b/drivers/tpm/tpm_tis_infineon.c
@@ -26,6 +26,7 @@
 #include <log.h>
 #include <time.h>
 #include <tpm-v1.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/compiler.h>
diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c
index 9ef0f334733..63b86b131bc 100644
--- a/drivers/tpm/tpm_tis_lpc.c
+++ b/drivers/tpm/tpm_tis_lpc.c
@@ -18,6 +18,7 @@
 #include <mapmem.h>
 #include <stdio.h>
 #include <tpm-v1.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c
index bc96c7354d8..4b1cf36d9b9 100644
--- a/drivers/tpm/tpm_tis_sandbox.c
+++ b/drivers/tpm/tpm_tis_sandbox.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <stdio.h>
 #include <tpm-v1.h>
+#include <vsprintf.h>
 #include <asm/state.h>
 #include <asm/unaligned.h>
 #include <linux/string.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c
index f648ea406d7..bd9c08e06cb 100644
--- a/drivers/tpm/tpm_tis_st33zp24_i2c.c
+++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <tpm-v1.h>
 #include <errno.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c
index 5c3ce137244..2b6b3714087 100644
--- a/drivers/tpm/tpm_tis_st33zp24_spi.c
+++ b/drivers/tpm/tpm_tis_st33zp24_spi.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <tpm-v1.h>
 #include <errno.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index a08c6945590..4fbd450fed3 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -11,6 +11,7 @@
  */
 
 #include <cpu_func.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index d4aaa19dad6..535935ac723 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -57,6 +57,7 @@
  */
 
 #include <dm.h>
+#include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index b62b120d96f..5382447eb72 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <hwconfig.h>
 #include <fsl_errata.h>
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 55324118ae7..c33e0894e10 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -17,6 +17,7 @@
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index cbf2b12ffb0..fe98a581d0d 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -13,6 +13,7 @@
 #include <usb.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index fa983257f30..8191b85eb4d 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <usb.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c
index d4fcda1ecd3..b3bca81059c 100644
--- a/drivers/usb/eth/lan7x.c
+++ b/drivers/usb/eth/lan7x.c
@@ -11,6 +11,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/string.h>
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index c9bbc4035c1..bbc03c7ea58 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <log.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index d1b51201a35..1f60fc499b9 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/delay.h>
 #include <linux/mii.h>
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index fb645f22e42..d9085007441 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <asm/unaligned.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index c7b0a965188..caab17473df 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <linux/usb/ch9.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 691b0b49243..d6089258476 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -14,6 +14,7 @@
 #include <part.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index a220d151761..8723c656e0b 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -247,6 +247,7 @@
 #include <console.h>
 #include <g_dnl.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 11d703eb332..142bd99c698 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -24,6 +24,7 @@
 #include <memalign.h>
 #include <stdio.h>
 #include <version.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 45b82da4f4a..35bd319de8a 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -13,6 +13,7 @@
 #include <pci.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 4d3b6527ac9..45c3418e7f8 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <usb/ulpi.h>
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 22e4ffd42eb..a8f4c56b7e7 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -13,6 +13,7 @@
 #include <memalign.h>
 #include <stdio.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c
index a696c5a5b47..0a537fc4552 100644
--- a/drivers/usb/musb-new/musb_core.c
+++ b/drivers/usb/musb-new/musb_core.c
@@ -81,6 +81,7 @@
 #else
 #include <common.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c
index 20987b77ade..f9d30b5b76d 100644
--- a/drivers/usb/musb-new/musb_dsps.c
+++ b/drivers/usb/musb-new/musb_dsps.c
@@ -33,6 +33,7 @@
 #else
 #include <common.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/omap_musb.h>
 #include <linux/printk.h>
 #include "linux-compat.h"
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index c6e346d5d80..ceac6a82b64 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #else
 #include <common.h>
+#include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index 4867c2e792e..bbec8774310 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index d7938ac2cbd..6ac6d0e69ac 100644
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -30,6 +30,7 @@
 #include <malloc.h>
 #include <video_fb.h>
 #include "videomodes.h"
+#include <vsprintf.h>
 
 #include <radeon.h>
 #include "ati_ids.h"
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index af92a83d6a0..5edef8924e8 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -75,6 +75,7 @@
 #include <version.h>
 #include <malloc.h>
 #include <video.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/compiler.h>
diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c
index d0fe6923432..19dc648c7ea 100644
--- a/drivers/video/fsl_diu_fb.c
+++ b/drivers/video/fsl_diu_fb.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <linux/string.h>
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index ff29773170b..c0e0d1e5ea3 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <video_fb.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 82a94507b2e..bb1eb377827 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device_compat.h>
diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c
index 6912177993d..128fa88648f 100644
--- a/drivers/video/vidconsole-uclass.c
+++ b/drivers/video/vidconsole-uclass.c
@@ -15,6 +15,7 @@
 #include <video.h>
 #include <video_console.h>
 #include <video_font.h>		/* Bitmap font for code page 437 */
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index bb8555000a9..398f1a97e04 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -15,6 +15,7 @@
 #include <time.h>
 #include <video.h>
 #include <video_console.h>
+#include <vsprintf.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/lists.h>
diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index f1781dbb666..ba0fa3589f6 100644
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -62,6 +62,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index 5264fc209c9..50e143bb9e5 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -21,6 +21,7 @@
 #include <malloc.h>
 #include <virtio_types.h>
 #include <virtio.h>
+#include <vsprintf.h>
 #include <dm/lists.h>
 #include <linux/bug.h>
 #include <linux/string.h>
diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c
index 992118c6075..95b7360656a 100644
--- a/drivers/virtio/virtio_blk.c
+++ b/drivers/virtio/virtio_blk.c
@@ -11,6 +11,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <vsprintf.h>
 #include "virtio_blk.h"
 
 struct virtio_blk_priv {
diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index a617fffd7aa..59deadeec33 100644
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -13,6 +13,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <vsprintf.h>
 #include <dm/device.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 7a5926ebe64..cc3378d8758 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -13,6 +13,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <vsprintf.h>
 #include <dm/device.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index 2a2abb9d499..1e5589f004c 100644
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -10,6 +10,7 @@
 #include <virtio_types.h>
 #include <virtio.h>
 #include <virtio_ring.h>
+#include <vsprintf.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
 #include <linux/err.h>
diff --git a/env/attr.c b/env/attr.c
index a958c714828..a9cabafacdc 100644
--- a/env/attr.c
+++ b/env/attr.c
@@ -6,15 +6,16 @@
 
 #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
 #include <stdint.h>
-#include <stdio.h>
 #include <linux/linux_string.h>
 #else
 #include <common.h>
 #include <slre.h>
+#include <vsprintf.h>
 #endif
 
 #include <env_attr.h>
 #include <errno.h>
+#include <stdio.h>
 #include <linux/string.h>
 #include <malloc.h>
 
diff --git a/env/mmc.c b/env/mmc.c
index 13966f3395c..6b1a795f434 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index 1d32aa90342..9e4e883d9d2 100644
--- a/examples/standalone/atmel_df_pow2.c
+++ b/examples/standalone/atmel_df_pow2.c
@@ -10,6 +10,7 @@
 #include <exports.h>
 #include <spi.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 975e29d00b1..12fab86e470 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <flash.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/stat.h>
 #include <jffs2/jffs2.h>
diff --git a/fs/fs.c b/fs/fs.c
index 5b8e2d6557e..207420b0ab4 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -21,6 +21,7 @@
 #include <time.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 2bd0073cc59..77178e0e28a 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -18,6 +18,7 @@
 #include <hexdump.h>
 #include <log.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
 #include <linux/string.h>
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index ebb0d1c1571..62b03731f8d 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -33,6 +33,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/log2.h>
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index deb2d21b0a2..ab48f10310c 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include "ubifs.h"
diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 91ed09888e7..a3ff0044788 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -23,6 +23,7 @@
 #include <div64.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/printk.h>
 #include <linux/string.h>
 
diff --git a/include/common.h b/include/common.h
index 31c3d462132..2b7a422fbe1 100644
--- a/include/common.h
+++ b/include/common.h
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
 
 /* Pull in stuff for the build system */
diff --git a/include/efi.h b/include/efi.h
index 818295642dd..0c99e1707d0 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -17,6 +17,7 @@
 #define _EFI_H
 
 #include <stdarg.h>
+#include <vsprintf.h>
 #include <linux/linkage.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/include/exports.h b/include/exports.h
index 935cf594c3b..28a6713ed71 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/string.h>
diff --git a/include/vsprintf.h b/include/vsprintf.h
index d9fb68add0c..0da188b9b50 100644
--- a/include/vsprintf.h
+++ b/include/vsprintf.h
@@ -8,6 +8,7 @@
 #define __VSPRINTF_H
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <linux/types.h>
 
 ulong simple_strtoul(const char *cp, char **endp, unsigned int base);
diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index cefbb5f69c5..f891f3ade90 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -11,6 +11,7 @@
 #include <irq.h>
 #include <log.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
 #include <acpi/acpigen.h>
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c
index ce5709449e7..839f867050a 100644
--- a/lib/crypto/public_key.c
+++ b/lib/crypto/public_key.c
@@ -9,6 +9,7 @@
 
 #define pr_fmt(fmt) "PKEY: "fmt
 #ifdef __UBOOT__
+#include <vsprintf.h>
 #include <dm/devres.h>
 #include <linux/bug.h>
 #include <linux/compat.h>
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c
index ec4b511d492..46f7fe89daa 100644
--- a/lib/dhry/cmd_dhry.c
+++ b/lib/dhry/cmd_dhry.c
@@ -8,6 +8,7 @@
 #include <div64.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include "dhry.h"
 
 static int do_dhry(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/lib/display_options.c b/lib/display_options.c
index 14cb3cff055..826668505ca 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -11,6 +11,7 @@
 #include <div64.h>
 #include <stdio.h>
 #include <version.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index e7d8745ad85..5efd63ec93d 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -32,6 +32,7 @@
 #include <blk.h>
 #include <efi_driver.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
 
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 7bdd8a0a913..66421a9c999 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -13,6 +13,7 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/libfdt_env.h>
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index d3b1e273b9b..d4820fa5f0b 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -16,6 +16,7 @@
 #include <efi_loader.h>
 #include <part.h>
 #include <sandboxblockdev.h>
+#include <vsprintf.h>
 #include <asm-generic/unaligned.h>
 #include <linux/compat.h> /* U16_MAX */
 #include <linux/string.h>
diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index ece99eb9424..b0f213d72b9 100644
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <efi_loader.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #define MAC_OUTPUT_LEN 22
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 6a66b5cf292..ecbd14817ad 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -15,6 +15,7 @@
 #include <log.h>
 #include <part.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 struct efi_system_partition efi_system_partition;
diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c
index eda9ced626b..67bfef93e1a 100644
--- a/lib/efi_loader/efi_var_file.c
+++ b/lib/efi_loader/efi_var_file.c
@@ -15,6 +15,7 @@
 #include <mapmem.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <u-boot/crc.h>
 
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 8370ecd11ea..faf7be634f3 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/u-boot.h>
 #include <dm/of_extra.h>
 #include <env.h>
diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 897b2d26299..50e773260ef 100644
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <fdtdec.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <os.h>
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 3a0861c7d38..28561056228 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <hexdump.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/compat.h>
 #include <linux/log2.h>
diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c
index a563d397bf5..030d21fc2b9 100644
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@@ -8,6 +8,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #include "avb_sysdeps.h"
diff --git a/lib/net_utils.c b/lib/net_utils.c
index 0a8a557319c..eb2d52e849b 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <net.h>
+#include <vsprintf.h>
 
 struct in_addr string_to_ip(const char *s)
 {
diff --git a/lib/oid_registry.c b/lib/oid_registry.c
index 209edc73b99..5846030ac13 100644
--- a/lib/oid_registry.c
+++ b/lib/oid_registry.c
@@ -6,6 +6,7 @@
  */
 
 #ifdef __UBOOT__
+#include <vsprintf.h>
 #include <linux/compat.h>
 #else
 #include <linux/module.h>
diff --git a/lib/panic.c b/lib/panic.c
index 2267a8d4fb9..a01868d8520 100644
--- a/lib/panic.c
+++ b/lib/panic.c
@@ -16,6 +16,7 @@
 #endif
 #include <stdarg.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 
 static void panic_finish(void) __attribute__ ((noreturn));
diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index a8f4f089f13..c894e7a6b9b 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
 #include <linux/errno.h>
diff --git a/lib/strto.c b/lib/strto.c
index 009e67d417a..e6f69b31e47 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 4d65bd9eeb5..60a0619aafc 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -12,6 +12,7 @@
 #include <stdarg.h>
 #include <serial.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 
 struct printf_info {
diff --git a/lib/tpm-common.c b/lib/tpm-common.c
index 21fc4c7c865..93bcab46112 100644
--- a/lib/tpm-common.c
+++ b/lib/tpm-common.c
@@ -10,6 +10,7 @@
 #include <dm.h>
 #include <log.h>
 #include <stdarg.h>
+#include <vsprintf.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <linux/string.h>
diff --git a/lib/trace.c b/lib/trace.c
index e6f34287295..37f53dad235 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <trace.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
diff --git a/lib/uuid.c b/lib/uuid.c
index 63efc114f84..91f99bcb5ff 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <uuid.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <errno.h>
 #include <common.h>
diff --git a/net/arp.c b/net/arp.c
index bea265b3674..2a4449489ff 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -15,6 +15,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 
diff --git a/net/bootp.c b/net/bootp.c
index f5d4f85fe24..6e9f2fc57d1 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <uuid.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <net/tftp.h>
diff --git a/net/cdp.c b/net/cdp.c
index fe19914659b..ffb91a64900 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -15,6 +15,7 @@
 #include <timestamp.h>
 #endif
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 
 #include "cdp.h"
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 6eae0746d4d..9af7971fc49 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -12,6 +12,7 @@
 #include <log.h>
 #include <net.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index 44047abe7c9..5e8276b9bce 100644
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <miiphy.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "eth_internal.h"
 
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index f130f260952..d42e7e705b6 100644
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -13,6 +13,7 @@
 #include <net.h>
 #include <phy.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/u-boot.h>
 #include <linux/bug.h>
diff --git a/net/net.c b/net/net.c
index 612d8bc78b1..3ead48c768f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -99,6 +99,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
diff --git a/net/nfs.c b/net/nfs.c
index c675d8076a5..76ff7d32e0b 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -36,6 +36,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include "nfs.h"
 #include "bootp.h"
diff --git a/net/tftp.c b/net/tftp.c
index e3bac0c95d8..1f35649c5c8 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -18,6 +18,7 @@
 #include <net.h>
 #include <stdio.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include <net/tftp.h>
diff --git a/post/post.c b/post/post.c
index ad700975846..dee7ff1ce14 100644
--- a/post/post.c
+++ b/post/post.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdio_dev.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 #include <div64.h>
 #include <post.h>
diff --git a/test/dm/blk.c b/test/dm/blk.c
index 84ee0b6df26..ffc0fcd1491 100644
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <part.h>
 #include <usb.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <asm/state.h>
 #include <dm/test.h>
diff --git a/test/env/hashtable.c b/test/env/hashtable.c
index 339cc19ba14..4331eac02fe 100644
--- a/test/env/hashtable.c
+++ b/test/env/hashtable.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <search.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <test/env.h>
 #include <test/ut.h>
 
diff --git a/test/log/log_test.c b/test/log/log_test.c
index 6b263557945..ffade6d14b1 100644
--- a/test/log/log_test.c
+++ b/test/log/log_test.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <log.h>
 #include <stdio.h>
+#include <vsprintf.h>
 
 /* emit some sample log records in different ways, for testing */
 static int log_run(enum uclass_id cat, const char *file)
diff --git a/test/print_ut.c b/test/print_ut.c
index 206a72c789c..d317cbf5562 100644
--- a/test/print_ut.c
+++ b/test/print_ut.c
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <stdio.h>
 #include <version.h>
+#include <vsprintf.h>
 
 #define FAKE_BUILD_TAG	"jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \
 			"and a lot more text to come"
diff --git a/test/unicode_ut.c b/test/unicode_ut.c
index 26d96336f36..ace35c18a42 100644
--- a/test/unicode_ut.c
+++ b/test/unicode_ut.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <test/test.h>
 #include <test/suites.h>
 #include <test/ut.h>
diff --git a/test/ut.c b/test/ut.c
index ef5152bfdf0..001c89e9a4f 100644
--- a/test/ut.c
+++ b/test/ut.c
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <asm/global_data.h>
 #include <test/test.h>
 #include <test/ut.h>
-- 
2.28.0.163.g6104cc2f0b6-goog

  parent reply	other threads:[~2020-08-02 22:59 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-02 22:59 [PATCH 00/16] common: Drop remaining includes in common.h Simon Glass
2020-08-02 22:59 ` [PATCH 01/16] common: Drop asm/global_data.h from common header Simon Glass
2020-08-02 22:59 ` [PATCH 02/16] common: Drop display_options.h " Simon Glass
2020-08-02 22:59 ` [PATCH 03/16] common: Drop linux/printk.h " Simon Glass
2020-08-02 22:59 ` [PATCH 04/16] Fix code style for time functions Simon Glass
2020-08-02 22:59 ` [PATCH 05/16] common: Drop time.h from common header Simon Glass
2020-08-02 22:59 ` [PATCH 06/16] common: Drop linux/string.h " Simon Glass
2020-08-02 22:59 ` [PATCH 07/16] common: Drop asm/u-boot.h " Simon Glass
2020-08-02 22:59 ` [PATCH 08/16] common: Drop stdio.h " Simon Glass
2020-08-02 22:59 ` [PATCH 09/16] common: Drop stdarg.h " Simon Glass
2020-08-02 22:59 ` Simon Glass [this message]
2020-08-02 22:59 ` [PATCH 11/16] common: Drop errno.h " Simon Glass
2020-08-02 22:59 ` [PATCH 12/16] common: Drop linux/kernel.h " Simon Glass
2020-08-02 22:59 ` [PATCH 13/16] common: Drop linux/types.h " Simon Glass
2020-08-02 22:59 ` [PATCH 14/16] common: Move the build-system includes to a separate file Simon Glass
2020-08-02 22:59 ` [PATCH 15/16] common: Add a comment about the current state of common.h Simon Glass
2020-08-02 22:59 ` [PATCH 16/16] Makefile: Drop linux/kconfig.h from config.h Simon Glass
2020-08-19 13:08 ` [RFCv2] common: Drop remaining includes in common.h Tom Rini
2020-08-19 13:08   ` [RFCv2 01/16] common: Drop asm/global_data.h from common header Tom Rini
2020-08-19 13:08   ` [RFCv2 02/16] common: Drop display_options.h " Tom Rini
2020-08-19 13:08   ` [RFCv2 03/16] common: Drop linux/printk.h " Tom Rini
2020-08-19 13:08   ` [RFCv2 04/16] Fix code style for time functions Tom Rini
2020-08-19 13:08   ` [RFCv2 05/16] common: Drop time.h from common header Tom Rini
2020-08-19 13:08   ` [RFCv2 06/16] common: Drop linux/string.h " Tom Rini
2020-08-19 13:08   ` [RFCv2 07/16] common: Drop asm/u-boot.h " Tom Rini
2020-08-19 13:09   ` [RFCv2 08/16] common: Drop stdio.h " Tom Rini
2020-08-19 13:09   ` [RFCv2 09/16] common: Drop stdarg.h " Tom Rini
2020-08-19 13:09   ` [RFCv2 10/16] common: Drop vsprintf.h " Tom Rini
2020-08-19 13:09   ` [RFCv2 11/16] common: Drop errno.h " Tom Rini
2020-08-19 13:09   ` [RFCv2 12/16] common: Drop linux/kernel.h " Tom Rini
2020-08-19 13:09   ` [RFCv2 13/16] common: Drop linux/types.h " Tom Rini
2020-08-19 13:09   ` [RFCv2 14/16] common: Move the build-system includes to a separate file Tom Rini
2020-08-19 13:09   ` [RFCv2 15/16] common: Add a comment about the current state of common.h Tom Rini
2020-08-19 13:09   ` [RFCv2 16/16] Makefile: Drop linux/kconfig.h from config.h Tom Rini
2020-09-09  2:58   ` [RFCv2] common: Drop remaining includes in common.h Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200802225940.51457-11-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.